]> arthur.barton.de Git - netatalk.git/blobdiff - etc/afpd/spotlight.c
Fix dalloc_value_for_key usage
[netatalk.git] / etc / afpd / spotlight.c
index 2b6fb6edbd0a6656e73139b97067fa330defe1cb..fff5a36ba244def42fed80134ae2664b603cfbd9 100644 (file)
@@ -12,6 +12,8 @@
   GNU General Public License for more details.
 */
 
+#define USE_LIST
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 #include <errno.h>
 #include <stdbool.h>
 #include <inttypes.h>
+#include <time.h>
+#include <utime.h>
 
+#include <atalk/list.h>
 #include <atalk/errchk.h>
 #include <atalk/util.h>
 #include <atalk/logger.h>
 #include <atalk/byteorder.h>
 #include <atalk/netatalk_conf.h>
 #include <atalk/volume.h>
+#include <atalk/spotlight.h>
+
+#include "directory.h"
+
+static TALLOC_CTX *sl_ctx;
+static void *sl_module;
+static struct sl_module_export *sl_module_export;
+
+/* Helper functions and stuff */
+static const char *neststrings[] = {
+    "",
+    "\t",
+    "\t\t",
+    "\t\t\t",
+    "\t\t\t\t",
+    "\t\t\t\t\t",
+    "\t\t\t\t\t\t",
+};
+
+static int dd_dump(DALLOC_CTX *dd, int nestinglevel)
+{
+    const char *type;
 
-#include "spotlight.h"
+    LOG(log_debug, logtype_sl, "%s%s(#%d): {",
+        neststrings[nestinglevel], talloc_get_name(dd), talloc_array_length(dd->dd_talloc_array));
 
+    for (int n = 0; n < talloc_array_length(dd->dd_talloc_array); n++) {
+
+        type = talloc_get_name(dd->dd_talloc_array[n]);
+
+        if (STRCMP(type, ==, "DALLOC_CTX")
+                   || STRCMP(type, ==, "sl_array_t")
+                   || STRCMP(type, ==, "sl_filemeta_t")
+                   || STRCMP(type, ==, "sl_dict_t")) {
+            dd_dump(dd->dd_talloc_array[n], nestinglevel + 1);
+        } else if (STRCMP(type, ==, "uint64_t")) {
+            uint64_t i;
+            memcpy(&i, dd->dd_talloc_array[n], sizeof(uint64_t));
+            LOG(log_debug, logtype_sl, "%suint64_t: 0x%04x", neststrings[nestinglevel + 1], i);
+        } else if (STRCMP(type, ==, "char *")) {
+            LOG(log_debug, logtype_sl, "%sstring: %s", neststrings[nestinglevel + 1], (char *)dd->dd_talloc_array[n]);
+        } else if (STRCMP(type, ==, "sl_bool_t")) {
+            sl_bool_t bl;
+            memcpy(&bl, dd->dd_talloc_array[n], sizeof(sl_bool_t));
+            LOG(log_debug, logtype_sl, "%sbool: %s", neststrings[nestinglevel + 1], bl ? "true" : "false");
+        } else if (STRCMP(type, ==, "sl_nil_t")) {
+            LOG(log_debug, logtype_sl, "%snil", neststrings[nestinglevel + 1]);
+        } else if (STRCMP(type, ==, "sl_time_t")) {
+            sl_time_t t;
+            struct tm *tm;
+            char datestring[256];
+            memcpy(&t, dd->dd_talloc_array[n], sizeof(sl_time_t));
+            tm = localtime(&t.tv_sec);
+            strftime(datestring, sizeof(datestring), "%Y-%m-%d %H:%M:%S", tm);
+            LOG(log_debug, logtype_sl, "%ssl_time_t: %s.%06d", neststrings[nestinglevel + 1], datestring, t.tv_usec);
+        } else if (STRCMP(type, ==, "sl_cnids_t")) {
+            sl_cnids_t cnids;
+            memcpy(&cnids, dd->dd_talloc_array[n], sizeof(sl_cnids_t));
+            LOG(log_debug, logtype_sl, "%sCNIDs: unkn1: 0x%" PRIx16 ", unkn2: 0x%" PRIx32,
+                   neststrings[nestinglevel + 1], cnids.ca_unkn1, cnids.ca_context);
+            if (cnids.ca_cnids)
+                dd_dump(cnids.ca_cnids, nestinglevel + 2);
+        } else {
+            LOG(log_debug, logtype_sl, "%stype: %s", neststrings[nestinglevel + 1], type);
+        }
+    }
+    LOG(log_debug, logtype_sl, "%s}", neststrings[nestinglevel]);
+}
+
+#ifndef SPOT_TEST_MAIN
 /**************************************************************************************************
- * RPC data marshalling and unmarshalling
+ * Spotlight queries
  **************************************************************************************************/
 
-/* FPSpotlightRPC subcommand codes */
-#define SPOTLIGHT_CMD_FLAGS   2
-#define SPOTLIGHT_CMD_RPC     3
-#define SPOTLIGHT_CMD_VOLPATH 4
-
-/* Spotlight epoch is UNIX epoch minus SPOTLIGHT_TIME_DELTA */
-#define SPOTLIGHT_TIME_DELTA INT64_C(280878921600U)
-
-#define SQ_TYPE_NULL    0x0000
-#define SQ_TYPE_COMPLEX 0x0200
-#define SQ_TYPE_INT64   0x8400
-#define SQ_TYPE_BOOL    0x0100
-#define SQ_TYPE_FLOAT   0x8500
-#define SQ_TYPE_DATA    0x0700
-#define SQ_TYPE_CNIDS   0x8700
-#define SQ_TYPE_UUID    0x0e00
-#define SQ_TYPE_DATE    0x8600
-
-#define SQ_CPX_TYPE_ARRAY              0x0a00
-#define SQ_CPX_TYPE_STRING             0x0c00
-#define SQ_CPX_TYPE_UTF16_STRING       0x1c00
-#define SQ_CPX_TYPE_DICT               0x0d00
-#define SQ_CPX_TYPE_CNIDS              0x1a00
-#define SQ_CPX_TYPE_FILEMETA           0x1b00
-
-#define SUBQ_SAFETY_LIM 20
-
-/* Can be ored and used as flags */
-#define SL_ENC_LITTLE_ENDIAN 1
-#define SL_ENC_BIG_ENDIAN    2
-#define SL_ENC_UTF_16        4
-
-static uint64_t spotlight_ntoh64(const char *buf, int encoding)
+static ATALK_LIST_HEAD(sl_queries);
+
+/*!
+ * Add a query to the list of active queries
+ */
+static int slq_add(slq_t *slq)
 {
-       if (encoding == SL_ENC_LITTLE_ENDIAN)
-               return LVAL(buf, 0);
-       else
-        return ntoh64(LVAL(buf, 0));
+    list_add(&(slq->slq_list), &sl_queries);
+    return 0;
 }
 
-#if 0
-static gdouble
-spotlight_ntohieee_double(tvbuff_t *tvb, gint offset, guint encoding)
+static int slq_remove(slq_t *slq)
 {
-       if (encoding == ENC_LITTLE_ENDIAN)
-               return tvb_get_letohieee_double(tvb, offset);
-       else
-               return tvb_get_ntohieee_double(tvb, offset);
-}
+    EC_INIT;
+    struct list_head *p;
+    slq_t *q = NULL;
+
+    list_for_each(p, &sl_queries) {
+        q = list_entry(p, slq_t, slq_list);
+        if ((q->slq_ctx1 == slq->slq_ctx1) && (q->slq_ctx2 == slq->slq_ctx2)) {            
+            list_del(p);
+            break;
+        }
+        q = NULL;
+    }
 
-/*
-* Returns the UTF-16 string encoding, by checking the 2-byte byte order mark.
-* If there is no byte order mark, -1 is returned.
-*/
-static guint
-spotlight_get_utf16_string_encoding(tvbuff_t *tvb, gint offset, gint query_length, guint encoding) {
-       guint utf16_encoding;
-
-       /* check for byte order mark */
-       utf16_encoding = ENC_BIG_ENDIAN;
-       if (query_length >= 2) {
-               guint16 byte_order_mark;
-               if (encoding == ENC_LITTLE_ENDIAN)
-                       byte_order_mark = tvb_get_letohs(tvb, offset);
-               else
-                       byte_order_mark = tvb_get_ntohs(tvb, offset);
-
-               if (byte_order_mark == 0xFFFE) {
-                       utf16_encoding = ENC_BIG_ENDIAN | ENC_UTF_16;
-               }
-               else if (byte_order_mark == 0xFEFF) {
-                       utf16_encoding = ENC_LITTLE_ENDIAN | ENC_UTF_16;
-               }
-       }
-
-       return utf16_encoding;
+    if (q == NULL) {
+        /* The SL query 'slq' was not found in the list, this is not supposed to happen! */
+        LOG(log_warning, logtype_sl, "slq_remove: slq not in active query list");
+    }
+
+EC_CLEANUP:
+    EC_EXIT;
 }
 
-static gint
-spotlight_int64(tvbuff_t *tvb, proto_tree *tree, gint offset, guint encoding)
+static slq_t *slq_for_ctx(uint64_t ctx1, uint64_t ctx2)
 {
-       gint count, i;
-       guint64 query_data64;
+    EC_INIT;
+    slq_t *q = NULL;
+    struct list_head *p;
+
+    list_for_each(p, &sl_queries) {
+        q = list_entry(p, slq_t, slq_list);
 
-       query_data64 = spotlight_ntoh64(tvb, offset, encoding);
-       count = query_data64 >> 32;
-       offset += 8;
+        LOG(log_debug, logtype_sl, "slq_for_ctx(ctx1: 0x%" PRIx64 ", ctx2: 0x%" PRIx64
+            "): active: ctx1: 0x%" PRIx64 ", ctx2: 0x%" PRIx64,
+            ctx1, ctx2, q->slq_ctx1, q->slq_ctx2);
 
-       i = 0;
-       while (i++ < count) {
-               query_data64 = spotlight_ntoh64(tvb, offset, encoding);
-               proto_tree_add_text(tree, tvb, offset, 8, "int64: 0x%016" G_GINT64_MODIFIER "x", query_data64);
-               offset += 8;
-       }
+        if ((q->slq_ctx1 == ctx1) && (q->slq_ctx2 == ctx2)) {            
+            break;
+        }
+        q = NULL;
+    }
 
-       return count;
+EC_CLEANUP:
+    if (ret != 0)
+        q = NULL;
+    return q;
 }
 
-static gint
-spotlight_date(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset, guint encoding)
+/* Error handling for queries */
+static void slq_error(slq_t *slq)
 {
-       gint count, i;
-       guint64 query_data64;
-       nstime_t t;
-
-       query_data64 = spotlight_ntoh64(tvb, offset, encoding);
-       count = query_data64 >> 32;
-       offset += 8;
-
-       if (count > SUBQ_SAFETY_LIM) {
-               expert_add_info_format(pinfo, tree, PI_MALFORMED, PI_ERROR,
-                                                          "Subquery count (%d) > safety limit (%d)", count, SUBQ_SAFETY_LIM);
-               return -1;
-       }
-
-       i = 0;
-       while (i++ < count) {
-               query_data64 = spotlight_ntoh64(tvb, offset, encoding) >> 24;
-               t.secs = query_data64 - SPOTLIGHT_TIME_DELTA;
-               t.nsecs = 0;
-               proto_tree_add_time(tree, hf_afp_spotlight_date, tvb, offset, 8, &t);
-               offset += 8;
-       }
-
-       return count;
+    if (!slq)
+        return;
+    sl_module_export->sl_mod_error(slq);
+    slq_remove(slq);
+    talloc_free(slq);
 }
 
-static gint
-spotlight_uuid(tvbuff_t *tvb, proto_tree *tree, gint offset, guint encoding)
+/**************************************************************************************************
+ * Spotlight RPC functions
+ **************************************************************************************************/
+
+static int sl_rpc_fetchPropertiesForContext(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *v)
 {
-       gint count, i;
-       guint64 query_data64;
+    EC_INIT;
+
+    char *s;
+    sl_dict_t *dict;
+    sl_array_t *array;
+    sl_uuid_t uuid;
+
+    if (!v->v_uuid)
+        EC_FAIL_LOG("sl_rpc_fetchPropertiesForContext: missing UUID for volume: %s", v->v_localname);
 
-       query_data64 = spotlight_ntoh64(tvb, offset, encoding);
-       count = query_data64 >> 32;
-       offset += 8;
+    dict = talloc_zero(reply, sl_dict_t);
 
-       i = 0;
-       while (i++ < count) {
-               proto_tree_add_item(tree, hf_afp_spotlight_uuid, tvb, offset, 16, ENC_BIG_ENDIAN);
-               offset += 16;
-       }
+    /* key/val 1 */
+    s = dalloc_strdup(dict, "kMDSStoreMetaScopes");
+    dalloc_add(dict, s, char *);
 
-       return count;
+    array = talloc_zero(dict, sl_array_t);
+    s = dalloc_strdup(array, "kMDQueryScopeComputer");
+    dalloc_add(array, s, char *);
+    dalloc_add(dict, array, sl_array_t);
+
+    /* key/val 2 */
+    s = dalloc_strdup(dict, "kMDSStorePathScopes");
+    dalloc_add(dict, s, char *);
+
+    array = talloc_zero(dict, sl_array_t);
+    s = dalloc_strdup(array, v->v_path);
+    dalloc_add(array, s, char *);
+    dalloc_add(dict, array, sl_array_t);
+
+    /* key/val 3 */
+    s = dalloc_strdup(dict, "kMDSStoreUUID");
+    dalloc_add(dict, s, char *);
+
+    memcpy(uuid.sl_uuid, v->v_uuid, 16);
+    dalloc_add_copy(dict, &uuid, sl_uuid_t);
+
+    /* key/val 4 */
+    s = dalloc_strdup(dict, "kMDSStoreHasPersistentUUID");
+    dalloc_add(dict, s, char *);
+    sl_bool_t b = true;
+    dalloc_add_copy(dict, &b, sl_bool_t);
+
+    dalloc_add(reply, dict, sl_dict_t);
+
+EC_CLEANUP:
+    EC_EXIT;
 }
 
-static gint
-spotlight_float(tvbuff_t *tvb, proto_tree *tree, gint offset, guint encoding)
+static int cnid_comp_fn(const void *p1, const void *p2)
 {
-       gint count, i;
-       guint64 query_data64;
-       gdouble fval;
-
-       query_data64 = spotlight_ntoh64(tvb, offset, encoding);
-       count = query_data64 >> 32;
-       offset += 8;
-
-       i = 0;
-       while (i++ < count) {
-               fval = spotlight_ntohieee_double(tvb, offset, encoding);
-               proto_tree_add_text(tree, tvb, offset, 8, "float: %f", fval);
-               offset += 8;
-       }
-
-       return count;
+    const uint64_t *cnid1 = p1, *cnid2 = p2;
+    if (*cnid1 == *cnid2)
+        return 0;
+    if (*cnid1 < *cnid2)
+        return -1;
+    else
+        return 1;            
 }
 
-static gint
-spotlight_CNID_array(tvbuff_t *tvb, proto_tree *tree, gint offset, guint encoding)
+static int sl_createCNIDArray(slq_t *slq, const DALLOC_CTX *p)
 {
-       gint count;
-       guint64 query_data64;
-       guint16 unknown1;
-       guint32 unknown2;
-
-       query_data64 = spotlight_ntoh64(tvb, offset, encoding);
-       count = query_data64 & 0xffff;
-       unknown1 = (query_data64 & 0xffff0000) >> 16;
-       unknown2 = query_data64 >> 32;
-
-       proto_tree_add_text(tree, tvb, offset + 2, 2, "unknown1: 0x%04" G_GINT16_MODIFIER "x",
-               unknown1);
-       proto_tree_add_text(tree, tvb, offset + 4, 4, "unknown2: 0x%08" G_GINT32_MODIFIER "x",
-               unknown2);
-       offset += 8;
-
-
-       while (count --) {
-               query_data64 = spotlight_ntoh64(tvb, offset, encoding);
-               proto_tree_add_text(tree, tvb, offset, 8, "CNID: %" G_GINT64_MODIFIER "u",
-                       query_data64);
-               offset += 8;
-       }
-
-       return 0;
+    EC_INIT;
+    uint64_t *cnids = NULL;
+
+    EC_NULL( cnids = talloc_array(slq, uint64_t, talloc_array_length(p)) );
+    for (int i = 0; i < talloc_array_length(p); i++)
+        memcpy(&cnids[i], p->dd_talloc_array[i], sizeof(uint64_t));
+    qsort(cnids, talloc_array_length(p), sizeof(uint64_t), cnid_comp_fn);
+
+    slq->slq_cnids = cnids;
+    slq->slq_cnids_num = talloc_array_length(p);
+
+EC_CLEANUP:
+    if (ret != 0) {
+        if (cnids)
+            talloc_free(cnids);
+    }
+    EC_EXIT;
 }
 
-static const char *spotlight_get_qtype_string(guint64 query_type)
+static int sl_rpc_openQuery(AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, struct vol *v)
 {
-       switch (query_type) {
-       case SQ_TYPE_NULL:
-               return "null";
-       case SQ_TYPE_COMPLEX:
-               return "complex";
-       case SQ_TYPE_INT64:
-               return "int64";
-       case SQ_TYPE_BOOL:
-               return "bool";
-       case SQ_TYPE_FLOAT:
-               return "float";
-       case SQ_TYPE_DATA:
-               return "data";
-       case SQ_TYPE_CNIDS:
-               return "CNIDs";
-       default:
-               return "unknown";
-       }
+    EC_INIT;
+    char *sl_query;
+    uint64_t *uint64;
+    DALLOC_CTX *reqinfo;
+    sl_array_t *array;
+    sl_cnids_t *cnids;
+    slq_t *slq = NULL;
+
+    /* Allocate and initialize query object */
+    slq = talloc_zero(sl_ctx, slq_t);
+    slq->slq_state = SLQ_STATE_NEW;
+    slq->slq_obj = obj;
+    slq->slq_vol = v;
+
+    /* convert spotlight query charset to host charset */
+    EC_NULL_LOG( sl_query = dalloc_value_for_key(query, "DALLOC_CTX", 0, "DALLOC_CTX", 1, "kMDQueryString") );
+    char slq_host[MAXPATHLEN + 1];
+    uint16_t convflags = v->v_mtou_flags;
+    size_t slq_maclen;
+    if (convert_charset(CH_UTF8_MAC, v->v_volcharset, v->v_maccharset, sl_query, strlen(sl_query), slq_host, MAXPATHLEN, &convflags) == -1) {
+        LOG(log_error, logtype_afpd, "sl_rpc_openQuery(\"%s\"): charset conversion failed", sl_query);
+        EC_FAIL;
+    }
+    slq->slq_qstring = talloc_strdup(slq, slq_host);
+    LOG(log_debug, logtype_sl, "sl_rpc_openQuery: %s", slq->slq_qstring);
+
+    slq->slq_time = time(NULL);
+    EC_NULL_LOG( uint64 = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "uint64_t", 1) );
+    slq->slq_ctx1 = *uint64;
+    EC_NULL_LOG( uint64 = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "uint64_t", 2) );
+    slq->slq_ctx2 = *uint64;
+    EC_NULL_LOG( reqinfo = dalloc_value_for_key(query, "DALLOC_CTX", 0, "DALLOC_CTX", 1, "kMDAttributeArray") );
+    slq->slq_reqinfo = talloc_steal(slq, reqinfo);
+    if ((cnids = dalloc_value_for_key(query, "DALLOC_CTX", 0, "DALLOC_CTX", 1, "kMDQueryItemArray"))) {
+        EC_ZERO_LOG( sl_createCNIDArray(slq, cnids->ca_cnids) );
+    }
+        
+    LOG(log_maxdebug, logtype_sl, "sl_rpc_openQuery: requested attributes:");
+    dd_dump(slq->slq_reqinfo, 0);
+
+    (void)slq_add(slq);
+    
+    /* Run the query */
+    EC_ZERO( sl_module_export->sl_mod_start_search(slq) );
+
+    array = talloc_zero(reply, sl_array_t);
+    uint64_t sl_res = ret == 0 ? 0 : UINT64_MAX;
+    dalloc_add_copy(array, &sl_res, uint64_t);
+    dalloc_add(reply, array, sl_array_t);
+
+EC_CLEANUP:
+    if (ret != 0) {
+        slq_error(slq);
+    }
+    EC_EXIT;
 }
 
-static const char *spotlight_get_cpx_qtype_string(guint64 cpx_query_type)
+static int sl_rpc_fetchQueryResultsForContext(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *v)
 {
-       switch (cpx_query_type) {
-       case SQ_CPX_TYPE_ARRAY:
-               return "array";
-       case SQ_CPX_TYPE_STRING:
-               return "string";
-       case SQ_CPX_TYPE_UTF16_STRING:
-               return "utf-16 string";
-       case SQ_CPX_TYPE_DICT:
-               return "dictionary";
-       case SQ_CPX_TYPE_CNIDS:
-               return "CNIDs";
-       case SQ_CPX_TYPE_FILEMETA:
-               return "FileMeta";
-       default:
-               return "unknown";
-       }
+    EC_INIT;
+    slq_t *slq = NULL;
+    uint64_t *uint64, ctx1, ctx2;
+
+    /* Context */
+    EC_NULL_LOG (uint64 = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "uint64_t", 1) );
+    ctx1 = *uint64;
+    EC_NULL_LOG (uint64 = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "uint64_t", 2) );
+    ctx2 = *uint64;
+
+    /* Get query for context */
+    EC_NULL_LOG( slq = slq_for_ctx(ctx1, ctx2) );
+    if (slq->slq_state != SLQ_STATE_RUNNING && slq->slq_state != SLQ_STATE_DONE) {
+        EC_FAIL_LOG("Spotlight: attempt to fetch results for query that isn't active");
+    }
+
+    /* Create and pass reply handle */
+    EC_NULL( slq->slq_reply = talloc_zero(reply, sl_array_t) );
+
+    /* Fetch Tracker results*/
+    EC_ZERO_LOG( sl_module_export->sl_mod_fetch_result(slq) );
+
+    dalloc_add(reply, slq->slq_reply, sl_array_t);
+
+EC_CLEANUP:
+    if (ret != 0) {
+        slq_error(slq);
+    }
+    EC_EXIT;
 }
 
-static gint
-spotlight_dissect_query_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset,
-                             guint64 cpx_query_type, gint count, gint toc_offset, guint encoding)
+static int sl_rpc_storeAttributesForOIDArray(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *vol)
 {
-       gint i, j;
-       gint subquery_count;
-       gint toc_index;
-       guint64 query_data64;
-       gint query_length;
-       guint64 query_type;
-       guint64 complex_query_type;
-       guint unicode_encoding;
-       guint8 mark_exists;
-
-       proto_item *item_query;
-       proto_tree *sub_tree;
-
-       /*
-        * This loops through a possibly nested query data structure.
-        * The outermost one is always without count and called from
-        * dissect_spotlight() with count = INT_MAX thus the while (...)
-        * loop terminates if (offset >= toc_offset).
-        * If nested structures are found, these will have an encoded element
-        * count which is used in a recursive call to
-        * spotlight_dissect_query_loop as count parameter, thus in this case
-        * the while (...) loop will terminate when count reaches 0.
-        */
-       while ((offset < (toc_offset - 8)) && (count > 0)) {
-               query_data64 = spotlight_ntoh64(tvb, offset, encoding);
-               query_length = (query_data64 & 0xffff) * 8;
-               if (query_length == 0) {
-                       /* XXX - report this as an error */
-                       break;
-               }
-               query_type = (query_data64 & 0xffff0000) >> 16;
-
-               switch (query_type) {
-               case SQ_TYPE_COMPLEX:
-                       toc_index = (gint)((query_data64 >> 32) - 1);
-                       query_data64 = spotlight_ntoh64(tvb, toc_offset + toc_index * 8, encoding);
-                       complex_query_type = (query_data64 & 0xffff0000) >> 16;
-
-                       switch (complex_query_type) {
-                       case SQ_CPX_TYPE_ARRAY:
-                       case SQ_CPX_TYPE_DICT:
-                               subquery_count = (gint)(query_data64 >> 32);
-                               item_query = proto_tree_add_text(tree, tvb, offset, query_length,
-                                                                "%s, toc index: %u, children: %u",
-                                                                spotlight_get_cpx_qtype_string(complex_query_type),
-                                                                toc_index + 1,
-                                                                subquery_count);
-                               break;
-                       case SQ_CPX_TYPE_STRING:
-                               subquery_count = 1;
-                               query_data64 = spotlight_ntoh64(tvb, offset + 8, encoding);
-                               query_length = (query_data64 & 0xffff) * 8;
-                               item_query = proto_tree_add_text(tree, tvb, offset, query_length + 8,
-                                                                "%s, toc index: %u, string: '%s'",
-                                                                spotlight_get_cpx_qtype_string(complex_query_type),
-                                                                toc_index + 1,
-                                                                tvb_get_ephemeral_string(tvb, offset + 16, query_length - 8));
-                               break;
-                       case SQ_CPX_TYPE_UTF16_STRING:
-                               /*
-                               * This is an UTF-16 string.
-                               * Dissections show the typical byte order mark 0xFFFE or 0xFEFF, respectively.
-                               * However the existence of such a mark can not be assumed.
-                               * If the mark is missing, big endian encoding is assumed.
-                               */
-
-                               subquery_count = 1;
-                               query_data64 = spotlight_ntoh64(tvb, offset + 8, encoding);
-                               query_length = (query_data64 & 0xffff) * 8;
-
-                               unicode_encoding = spotlight_get_utf16_string_encoding(tvb, offset + 16, query_length - 8, encoding);
-                               mark_exists = (unicode_encoding & ENC_UTF_16);
-                               unicode_encoding &= ~ENC_UTF_16;
-
-                               item_query = proto_tree_add_text(tree, tvb, offset, query_length + 8,
-                                                                "%s, toc index: %u, utf-16 string: '%s'",
-                                                                spotlight_get_cpx_qtype_string(complex_query_type),
-                                                                toc_index + 1,
-                                                                tvb_get_ephemeral_unicode_string(tvb, offset + (mark_exists ? 18 : 16),
-                                                                query_length - (mark_exists? 10 : 8), unicode_encoding));
-                               break;
-                       default:
-                               subquery_count = 1;
-                               item_query = proto_tree_add_text(tree, tvb, offset, query_length,
-                                                                "type: %s (%s), toc index: %u, children: %u",
-                                                                spotlight_get_qtype_string(query_type),
-                                                                spotlight_get_cpx_qtype_string(complex_query_type),
-                                                                toc_index + 1,
-                                                                subquery_count);
-                               break;
-                       }
-
-                       sub_tree = proto_item_add_subtree(item_query, ett_afp_spotlight_query_line);
-                       offset += 8;
-                       offset = spotlight_dissect_query_loop(tvb, pinfo, sub_tree, offset, complex_query_type, subquery_count, toc_offset, encoding);
-                       count--;
-                       break;
-               case SQ_TYPE_NULL:
-                       subquery_count = (gint)(query_data64 >> 32);
-                       if (subquery_count > count) {
-                               item_query = proto_tree_add_text(tree, tvb, offset, query_length, "null");
-                               expert_add_info_format(pinfo, item_query, PI_MALFORMED, PI_ERROR,
-                                       "Subquery count (%d) > query count (%d)", subquery_count, count);
-                               count = 0;
-                       } else if (subquery_count > 20) {
-                               item_query = proto_tree_add_text(tree, tvb, offset, query_length, "null");
-                               expert_add_info_format(pinfo, item_query, PI_PROTOCOL, PI_WARN,
-                                       "Abnormal number of subqueries (%d)", subquery_count);
-                               count -= subquery_count;
-                       } else {
-                               for (i = 0; i < subquery_count; i++, count--)
-                                       proto_tree_add_text(tree, tvb, offset, query_length, "null");
-                       }
-                       offset += query_length;
-                       break;
-               case SQ_TYPE_BOOL:
-                       proto_tree_add_text(tree, tvb, offset, query_length, "bool: %s",
-                                                        (query_data64 >> 32) ? "true" : "false");
-                       count--;
-                       offset += query_length;
-                       break;
-               case SQ_TYPE_INT64:
-                       item_query = proto_tree_add_text(tree, tvb, offset, 8, "int64");
-                       sub_tree = proto_item_add_subtree(item_query, ett_afp_spotlight_query_line);
-                       j = spotlight_int64(tvb, sub_tree, offset, encoding);
-                       count -= j;
-                       offset += query_length;
-                       break;
-               case SQ_TYPE_UUID:
-                       item_query = proto_tree_add_text(tree, tvb, offset, 8, "UUID");
-                       sub_tree = proto_item_add_subtree(item_query, ett_afp_spotlight_query_line);
-                       j = spotlight_uuid(tvb, sub_tree, offset, encoding);
-                       count -= j;
-                       offset += query_length;
-                       break;
-               case SQ_TYPE_FLOAT:
-                       item_query = proto_tree_add_text(tree, tvb, offset, 8, "float");
-                       sub_tree = proto_item_add_subtree(item_query, ett_afp_spotlight_query_line);
-                       j = spotlight_float(tvb, sub_tree, offset, encoding);
-                       count -= j;
-                       offset += query_length;
-                       break;
-               case SQ_TYPE_DATA:
-                       switch (cpx_query_type) {
-                       case SQ_CPX_TYPE_STRING:
-                               proto_tree_add_text(tree, tvb, offset, query_length, "string: '%s'",
-                                                   tvb_get_ephemeral_string(tvb, offset + 8, query_length - 8));
-                               break;
-                       case SQ_CPX_TYPE_UTF16_STRING: {
-                               /* description see above */
-                               unicode_encoding = spotlight_get_utf16_string_encoding(tvb, offset + 8, query_length, encoding);
-                               mark_exists = (unicode_encoding & ENC_UTF_16);
-                               unicode_encoding &= ~ENC_UTF_16;
-
-                               proto_tree_add_text(tree, tvb, offset, query_length, "utf-16 string: '%s'",
-                                                   tvb_get_ephemeral_unicode_string(tvb, offset + (mark_exists ? 10 : 8),
-                                                               query_length - (mark_exists? 10 : 8), unicode_encoding));
-                               break;
-                       }
-                       case SQ_CPX_TYPE_FILEMETA:
-                               if (query_length <= 8) {
-                                       /* item_query = */ proto_tree_add_text(tree, tvb, offset, query_length, "filemeta (empty)");
-                               } else {
-                                       item_query = proto_tree_add_text(tree, tvb, offset, query_length, "filemeta");
-                                       sub_tree = proto_item_add_subtree(item_query, ett_afp_spotlight_query_line);
-                                       (void)dissect_spotlight(tvb, pinfo, sub_tree, offset + 8);
-                               }
-                               break;
-                       }
-                       count--;
-                       offset += query_length;
-                       break;
-               case SQ_TYPE_CNIDS:
-                       if (query_length <= 8) {
-                               /* item_query = */ proto_tree_add_text(tree, tvb, offset, query_length, "CNID Array (empty)");
-                       } else {
-                               item_query = proto_tree_add_text(tree, tvb, offset, query_length, "CNID Array");
-                               sub_tree = proto_item_add_subtree(item_query, ett_afp_spotlight_query_line);
-                               spotlight_CNID_array(tvb, sub_tree, offset + 8, encoding);
-                       }
-                       count--;
-                       offset += query_length;
-                       break;
-               case SQ_TYPE_DATE:
-                       if ((j = spotlight_date(tvb, pinfo, tree, offset, encoding)) == -1)
-                               return offset;
-                       count -= j;
-                       offset += query_length;
-                       break;
-               default:
-                       proto_tree_add_text(tree, tvb, offset, query_length, "type: %s",
-                                                        spotlight_get_qtype_string(query_type));
-                       count--;
-                       offset += query_length;
-                       break;
-               }
-       }
-
-       return offset;
+    EC_INIT;
+    uint64_t uint64;
+    sl_array_t *array;
+    sl_cnids_t *cnids;
+    sl_time_t *sl_time;
+    cnid_t id;
+    char *path;
+    struct dir *dir;
+    
+    EC_NULL_LOG( cnids = dalloc_get(query, "DALLOC_CTX", 0, "sl_cnids_t", 2) );
+    memcpy(&uint64, cnids->ca_cnids->dd_talloc_array[0], sizeof(uint64_t));
+    id = (cnid_t)uint64;
+    LOG(log_debug, logtype_sl, "sl_rpc_storeAttributesForOIDArray: CNID: %" PRIu32, id);
+
+    if (htonl(id) == DIRDID_ROOT) {
+        path = vol->v_path;
+    } else if (id < CNID_START) {
+        EC_FAIL;
+    } else {
+        cnid_t did;
+        char buffer[12 + MAXPATHLEN + 1];
+
+        did = htonl(id);
+        EC_NULL_LOG( path = cnid_resolve(vol->v_cdb, &did, buffer, sizeof(buffer)) );
+        EC_NULL_LOG( dir = dirlookup(vol, did) );
+        EC_NEG1_LOG( movecwd(vol, dir) );
+    }
+
+    if ((sl_time = dalloc_value_for_key(query, "DALLOC_CTX", 0, "DALLOC_CTX", 1, "DALLOC_CTX", 1, "kMDItemLastUsedDate"))) {
+        struct utimbuf utimes;
+        utimes.actime = utimes.modtime = sl_time->tv_sec;
+        utime(path, &utimes);
+    }
+
+    array = talloc_zero(reply, sl_array_t);
+    uint64_t sl_res = 0;
+    dalloc_add_copy(array, &sl_res, uint64_t);
+    dalloc_add(reply, array, sl_array_t);
+
+EC_CLEANUP:
+    EC_EXIT;
 }
 
-static gint
-dissect_spotlight(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
+static int sl_rpc_fetchAttributeNamesForOIDArray(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *vol)
 {
-       guint encoding;
-       gint i;
-       guint64 toc_offset;
-       guint64 querylen;
-       gint toc_entries;
-       guint64 toc_entry;
-
-       proto_item *item_queries_data;
-       proto_tree *sub_tree_queries;
-       proto_item *item_toc;
-       proto_tree *sub_tree_toc;
-
-       if (strncmp(tvb_get_ephemeral_string(tvb, offset, 8), "md031234", 8) == 0)
-               encoding = ENC_BIG_ENDIAN;
-       else
-               encoding = ENC_LITTLE_ENDIAN;
-       proto_tree_add_text(tree,
-                           tvb,
-                           offset,
-                           8,
-                           "Endianess: %s",
-                           encoding == ENC_BIG_ENDIAN ?
-                           "Big Endian" : "Litte Endian");
-       offset += 8;
-
-       toc_offset = (spotlight_ntoh64(tvb, offset, encoding) >> 32) * 8;
-       if (toc_offset < 8) {
-               proto_tree_add_text(tree,
-                                   tvb,
-                                   offset,
-                                   8,
-                                   "ToC Offset: %" G_GINT64_MODIFIER "u < 8 (bogus)",
-                                   toc_offset);
-               return -1;
-       }
-       toc_offset -= 8;
-       if (offset + toc_offset + 8 > G_MAXINT) {
-               proto_tree_add_text(tree,
-                                   tvb,
-                                   offset,
-                                   8,
-                                   "ToC Offset: %" G_GINT64_MODIFIER "u > %u (bogus)",
-                                   toc_offset,
-                                   G_MAXINT - 8 - offset);
-               return -1;
-       }
-       querylen = (spotlight_ntoh64(tvb, offset, encoding) & 0xffffffff) * 8;
-       if (querylen < 8) {
-               proto_tree_add_text(tree,
-                                   tvb,
-                                   offset,
-                                   8,
-                                   "ToC Offset: %" G_GINT64_MODIFIER "u Bytes, Query length: %" G_GINT64_MODIFIER "u < 8 (bogus)",
-                                   toc_offset,
-                                   querylen);
-               return -1;
-       }
-       querylen -= 8;
-       if (querylen > G_MAXINT) {
-               proto_tree_add_text(tree,
-                                   tvb,
-                                   offset,
-                                   8,
-                                   "ToC Offset: %" G_GINT64_MODIFIER "u Bytes, Query length: %" G_GINT64_MODIFIER "u > %u (bogus)",
-                                   toc_offset,
-                                   querylen,
-                                   G_MAXINT);
-               return -1;
-       }
-       proto_tree_add_text(tree,
-                           tvb,
-                           offset,
-                           8,
-                           "ToC Offset: %" G_GINT64_MODIFIER "u Bytes, Query length: %" G_GINT64_MODIFIER "u Bytes",
-                           toc_offset,
-                           querylen);
-       offset += 8;
-
-       toc_entries = (gint)(spotlight_ntoh64(tvb, offset + (gint)toc_offset, encoding) & 0xffff);
-
-       item_queries_data = proto_tree_add_text(tree,
-                                               tvb,
-                                               offset,
-                                               (gint)toc_offset,
-                                               "Spotlight RPC data");
-       sub_tree_queries = proto_item_add_subtree(item_queries_data, ett_afp_spotlight_queries);
-
-       /* Queries */
-       offset = spotlight_dissect_query_loop(tvb, pinfo, sub_tree_queries, offset, SQ_CPX_TYPE_ARRAY, INT_MAX, offset + (gint)toc_offset + 8, encoding);
-
-       /* ToC */
-       if (toc_entries < 1) {
-               proto_tree_add_text(tree,
-                                   tvb,
-                                   offset,
-                                   (gint)querylen - (gint)toc_offset,
-                                   "Complex types ToC (%u < 1 - bogus)",
-                                   toc_entries);
-               return -1;
-       }
-       toc_entries -= 1;
-       item_toc = proto_tree_add_text(tree,
-                                      tvb,
-                                      offset,
-                                      (gint)querylen - (gint)toc_offset,
-                                      "Complex types ToC (%u entries)",
-                                      toc_entries);
-       sub_tree_toc = proto_item_add_subtree(item_toc, ett_afp_spotlight_toc);
-       proto_tree_add_text(sub_tree_toc, tvb, offset, 2, "Number of entries (%u)", toc_entries);
-       proto_tree_add_text(sub_tree_toc, tvb, offset + 2, 2, "unknown");
-       proto_tree_add_text(sub_tree_toc, tvb, offset + 4, 4, "unknown");
-
-       offset += 8;
-       for (i = 0; i < toc_entries; i++, offset += 8) {
-               toc_entry = spotlight_ntoh64(tvb, offset, encoding);
-               if ((((toc_entry & 0xffff0000) >> 16) == SQ_CPX_TYPE_ARRAY)
-                   || (((toc_entry & 0xffff0000) >> 16) == SQ_CPX_TYPE_DICT)) {
-                       proto_tree_add_text(sub_tree_toc,
-                                           tvb,
-                                           offset,
-                                           8,
-                                           "%u: count: %" G_GINT64_MODIFIER "u, type: %s, offset: %" G_GINT64_MODIFIER "u",
-                                           i+1,
-                                           toc_entry >> 32,
-                                           spotlight_get_cpx_qtype_string((toc_entry & 0xffff0000) >> 16),
-                                           (toc_entry & 0xffff) * 8);
-               } else if ((((toc_entry & 0xffff0000) >> 16) == SQ_CPX_TYPE_STRING)
-                       || (((toc_entry & 0xffff0000) >> 16) == SQ_CPX_TYPE_UTF16_STRING)) {
-                       proto_tree_add_text(sub_tree_toc,
-                                           tvb,
-                                           offset,
-                                           8,
-                                           "%u: pad byte count: %" G_GINT64_MODIFIER "x, type: %s, offset: %" G_GINT64_MODIFIER "u",
-                                           i+1,
-                                           8 - (toc_entry >> 32),
-                                           spotlight_get_cpx_qtype_string((toc_entry & 0xffff0000) >> 16),
-                                           (toc_entry & 0xffff) * 8);
-               }
-               else {
-                       proto_tree_add_text(sub_tree_toc,
-                                           tvb,
-                                           offset,
-                                           8,
-                                           "%u: unknown: 0x%08" G_GINT64_MODIFIER "x, type: %s, offset: %" G_GINT64_MODIFIER "u",
-                                           i+1,
-                                           toc_entry >> 32,
-                                           spotlight_get_cpx_qtype_string((toc_entry & 0xffff0000) >> 16),
-                                           (toc_entry & 0xffff) * 8);
-               }
-
-
-       }
-
-       return offset;
+    EC_INIT;
+    uint64_t uint64;
+    sl_cnids_t *cnids;
+    sl_time_t *sl_time;
+    cnid_t id;
+    char *path;
+    struct dir *dir;
+    
+    EC_NULL_LOG( cnids = dalloc_get(query, "DALLOC_CTX", 0, "sl_cnids_t", 1) );
+    memcpy(&uint64, cnids->ca_cnids->dd_talloc_array[0], sizeof(uint64_t));
+    id = (cnid_t)uint64;
+    LOG(log_debug, logtype_sl, "sl_rpc_fetchAttributeNamesForOIDArray: CNID: %" PRIu32, id);
+
+    if (htonl(id) == DIRDID_ROOT) {
+        path = vol->v_path;
+    } else if (id < CNID_START) {
+        EC_FAIL;
+    } else {
+        cnid_t did;
+        char buffer[12 + MAXPATHLEN + 1];
+
+        did = htonl(id);
+        EC_NULL_LOG( path = cnid_resolve(vol->v_cdb, &did, buffer, sizeof(buffer)) );
+        EC_NULL_LOG( dir = dirlookup(vol, did) );
+        EC_NEG1_LOG( movecwd(vol, dir) );
+    }
+
+    /* Result array */
+    sl_array_t *array = talloc_zero(reply, sl_array_t);
+    dalloc_add(reply, array, sl_array_t);
+
+    /* Return result value 0 */
+    uint64_t sl_res = 0;
+    dalloc_add_copy(array, &sl_res, uint64_t);
+
+    /* Return CNID array */
+    sl_cnids_t *replycnids = talloc_zero(reply, sl_cnids_t);
+    replycnids->ca_cnids = talloc_zero(cnids, DALLOC_CTX);
+    replycnids->ca_unkn1 = 0xfec;
+    replycnids->ca_context = cnids->ca_context;
+    uint64 = (uint64_t)id;
+    dalloc_add_copy(replycnids->ca_cnids, &uint64, uint64_t);
+    dalloc_add(array, replycnids, sl_cnids_t);
+
+    /* Return filemeta array */
+
+    /*
+     * FIXME: this should return the real attributes from all known metadata sources
+     * (Tracker and filesystem)
+     */
+    sl_array_t *mdattrs = talloc_zero(reply, sl_array_t);
+    dalloc_add(mdattrs, dalloc_strdup(mdattrs, "kMDItemFSName"), "char *");
+    dalloc_add(mdattrs, dalloc_strdup(mdattrs, "kMDItemDisplayName"), "char *");
+    dalloc_add(mdattrs, dalloc_strdup(mdattrs, "kMDItemFSSize"), "char *");
+    dalloc_add(mdattrs, dalloc_strdup(mdattrs, "kMDItemFSOwnerUserID"), "char *");
+    dalloc_add(mdattrs, dalloc_strdup(mdattrs, "kMDItemFSOwnerGroupID"), "char *");
+    dalloc_add(mdattrs, dalloc_strdup(mdattrs, "kMDItemFSContentChangeDate"), "char *");
+
+    sl_filemeta_t *fmeta = talloc_zero(reply, sl_filemeta_t);
+    dalloc_add(fmeta, mdattrs, sl_array_t);
+    dalloc_add(array, fmeta, sl_filemeta_t);
+
+EC_CLEANUP:
+    EC_EXIT;
 }
-#endif
 
-static DALLOC_CTX *unpack_spotlight(TALLOC_CTX *mem_ctx, char *ibuf, size_t ibuflen)
+static int sl_rpc_fetchAttributesForOIDArray(AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *vol)
 {
     EC_INIT;
-       int len;
-    DALLOC_CTX *query;
+    slq_t *slq = NULL;
+    uint64_t uint64;
+    sl_cnids_t *cnids;
+    sl_time_t *sl_time;
+    cnid_t id;
+    struct dir *dir;
+    sl_array_t *reqinfo;
+
+
+
+    /* Allocate and initialize query object */
+    slq = talloc_zero(reply, slq_t);
+    slq->slq_state = SLQ_STATE_ATTRS;
+    slq->slq_obj = obj;
+    slq->slq_vol = vol;
+    EC_NULL( slq->slq_reply = talloc_zero(reply, sl_array_t) );
+    EC_NULL( reqinfo = dalloc_get(query, "DALLOC_CTX", 0, "sl_array_t", 1) );
+    slq->slq_reqinfo = talloc_steal(slq, reqinfo);
+    
+    EC_NULL_LOG( cnids = dalloc_get(query, "DALLOC_CTX", 0, "sl_cnids_t", 2) );
+    memcpy(&uint64, cnids->ca_cnids->dd_talloc_array[0], sizeof(uint64_t));
+    id = (cnid_t)uint64;
+
+    if (htonl(id) == DIRDID_ROOT) {
+        slq->slq_path = talloc_strdup(slq, vol->v_path);
+    } else if (id < CNID_START) {
+        EC_FAIL;
+    } else {
+        cnid_t did;
+        char buffer[12 + MAXPATHLEN + 1];
+        char *name;
+        did = htonl(id);
+        EC_NULL( name = cnid_resolve(vol->v_cdb, &did, buffer, sizeof(buffer)) );
+        EC_NULL( dir = dirlookup(vol, did) );
+        EC_NULL( slq->slq_path = talloc_asprintf(slq, "%s/%s", bdata(dir->d_fullpath), name) );
+    }
 
-    EC_NULL_LOG( query = talloc_zero(mem_ctx, DALLOC_CTX) );
+    /* Return result value 0 */
+    uint64_t sl_res = 0;
+    dalloc_add_copy(slq->slq_reply, &sl_res, uint64_t);
 
-    ibuf++;
-    ibuflen--;
+    /* Return CNID array */
+    sl_cnids_t *replycnids = talloc_zero(reply, sl_cnids_t);
+    replycnids->ca_cnids = talloc_zero(cnids, DALLOC_CTX);
+    replycnids->ca_unkn1 = 0xfec;
+    replycnids->ca_context = cnids->ca_context;
+    uint64 = (uint64_t)id;
+    dalloc_add_copy(replycnids->ca_cnids, &uint64, uint64_t);
+    dalloc_add(slq->slq_reply, replycnids, sl_cnids_t);
 
+    /* Fetch attributes from module */
+    EC_ZERO_LOG( sl_module_export->sl_mod_fetch_attrs(slq) );
+
+    dalloc_add(reply, slq->slq_reply, sl_array_t);
+
+EC_CLEANUP:
+    EC_EXIT;
+}
+
+static int sl_rpc_closeQueryForContext(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *v)
+{
+    EC_INIT;
+    slq_t *slq = NULL;
+    uint64_t *uint64, ctx1, ctx2;
+    sl_array_t *array;
+    
+    /* Context */
+    EC_NULL_LOG (uint64 = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "uint64_t", 1) );
+    ctx1 = *uint64;
+    EC_NULL_LOG (uint64 = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "uint64_t", 2) );
+    ctx2 = *uint64;
+
+    /* Get query for context and free it */
+    EC_NULL_LOG( slq = slq_for_ctx(ctx1, ctx2) );
+    if (slq->slq_state != SLQ_STATE_DONE)
+        LOG(log_warning, logtype_sl, "Closing active query");
+    sl_module_export->sl_mod_end_search(slq);
+    slq_remove(slq);
+    talloc_free(slq);
+    slq = NULL;
+
+    array = talloc_zero(reply, sl_array_t);
+    uint64_t sl_res = 0;
+    dalloc_add_copy(array, &sl_res, uint64_t);
+    dalloc_add(reply, array, sl_array_t);
 
 EC_CLEANUP:
     if (ret != 0) {
-        talloc_free(query);
-        query = NULL;
+        slq_error(slq);
+    }
+    EC_EXIT;
+}
+
+/**************************************************************************************************
+ * Spotlight module functions
+ **************************************************************************************************/
+
+int sl_mod_load(const char *path)
+{
+    EC_INIT;
+
+    sl_ctx = talloc_new(NULL);
+
+    if ((sl_module = mod_open(path)) == NULL) {
+        LOG(log_error, logtype_sl, "Failed to load module \'%s\': %s", path, mod_error());
+        EC_FAIL;
     }
-       return query;
+
+    if ((sl_module_export = mod_symbol(sl_module, "sl_mod")) == NULL) {
+        LOG(log_error, logtype_sl, "sl_mod_load(%s): mod_symbol error for symbol %s", path, "sl_mod");
+        EC_FAIL;
+    }
+
+    sl_module_export->sl_mod_init("test");
+   
+EC_CLEANUP:
+    EC_EXIT;
+}
+
+/**
+ * Index a file
+ **/
+void sl_index_file(const char *path)
+{
+    if (sl_module_export && sl_module_export->sl_mod_index_file)
+        sl_module_export->sl_mod_index_file(path);
 }
 
 /**************************************************************************************************
  * AFP functions
  **************************************************************************************************/
+
 int afp_spotlight_rpc(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen)
 {
     EC_INIT;
@@ -674,17 +616,24 @@ int afp_spotlight_rpc(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_
     int cmd;
     int endianess = SL_ENC_LITTLE_ENDIAN;
     struct vol      *vol;
+    DALLOC_CTX *query;
+    DALLOC_CTX *reply;
+    char *rpccmd;
+    int len;
 
     *rbuflen = 0;
 
+    if (sl_module == NULL)
+        return AFPERR_NOOP;
+
     ibuf += 2;
     ibuflen -= 2;
 
     vid = SVAL(ibuf, 0);
-    LOG(logtype_default, log_note, "afp_spotlight_rpc(vid: %" PRIu16 ")", vid);
+    LOG(log_debug, logtype_sl, "afp_spotlight_rpc(vid: %" PRIu16 ")", vid);
 
     if ((vol = getvolbyvid(vid)) == NULL) {
-        LOG(logtype_default, log_error, "afp_spotlight_rpc: bad volume id: %" PRIu16 ")", vid);
+        LOG(log_error, logtype_sl, "afp_spotlight_rpc: bad volume id: %" PRIu16 ")", vid);
         ret = AFPERR_ACCESS;
         goto EC_CLEANUP;
     }
@@ -692,37 +641,74 @@ int afp_spotlight_rpc(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_
     /*    IVAL(ibuf, 2): unknown, always 0x00008004, some flags ? */
 
     cmd = RIVAL(ibuf, 6);
-    LOG(logtype_default, log_note, "afp_spotlight_rpc(cmd: %d)", cmd);
+    LOG(log_debug, logtype_sl, "afp_spotlight_rpc(cmd: %d)", cmd);
 
     /*    IVAL(ibuf, 10: unknown, always 0x00000000 */
 
-       switch (cmd) {
+    switch (cmd) {
 
-       case SPOTLIGHT_CMD_VOLPATH: {
+    case SPOTLIGHT_CMD_OPEN:
+    case SPOTLIGHT_CMD_OPEN2:
         RSIVAL(rbuf, 0, ntohs(vid));
         RSIVAL(rbuf, 4, 0);
-        int len = strlen(vol->v_path) + 1;
+        len = strlen(vol->v_path) + 1;
         strncpy(rbuf + 8, vol->v_path, len);
         *rbuflen += 8 + len;
-               break;
-    }
-       case SPOTLIGHT_CMD_FLAGS:
-               break;
+        break;
+
+    case SPOTLIGHT_CMD_FLAGS:
+        RSIVAL(rbuf, 0, 0x0100006b); /* Whatever this value means... flags? Helios uses 0x1eefface */
+        *rbuflen += 4;
+        break;
+
+    case SPOTLIGHT_CMD_RPC:
+        EC_NULL( query = talloc_zero(tmp_ctx, DALLOC_CTX) );
+        EC_NULL( reply = talloc_zero(tmp_ctx, DALLOC_CTX) );
+        EC_NEG1_LOG( sl_unpack(query, ibuf + 22) );
+
+        LOG(log_debug, logtype_sl, "afp_spotlight_rpc: Request dump:");
+        dd_dump(query, 0);
+
+        EC_NULL_LOG( rpccmd = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "char *", 0) );
+
+        if (STRCMP(rpccmd, ==, "fetchPropertiesForContext:")) {
+            EC_ZERO_LOG( sl_rpc_fetchPropertiesForContext(obj, query, reply, vol) );
+        } else if (STRCMP(rpccmd, ==, "openQueryWithParams:forContext:")) {
+            EC_ZERO_LOG( sl_rpc_openQuery(obj, query, reply, vol) );
+        } else if (STRCMP(rpccmd, ==, "fetchQueryResultsForContext:")) {
+            EC_ZERO_LOG( sl_rpc_fetchQueryResultsForContext(obj, query, reply, vol) );
+        } else if (STRCMP(rpccmd, ==, "storeAttributes:forOIDArray:context:")) {
+            EC_ZERO_LOG( sl_rpc_storeAttributesForOIDArray(obj, query, reply, vol) );
+        } else if (STRCMP(rpccmd, ==, "fetchAttributeNamesForOIDArray:context:")) {
+            EC_ZERO_LOG( sl_rpc_fetchAttributeNamesForOIDArray(obj, query, reply, vol) );
+        } else if (STRCMP(rpccmd, ==, "fetchAttributes:forOIDArray:context:")) {
+            EC_ZERO_LOG( sl_rpc_fetchAttributesForOIDArray(obj, query, reply, vol) );
+        } else if (STRCMP(rpccmd, ==, "closeQueryForContext:")) {
+            EC_ZERO_LOG( sl_rpc_closeQueryForContext(obj, query, reply, vol) );
+        } else {
+            LOG(log_error, logtype_sl, "afp_spotlight_rpc: unknown Spotlight RPC: %s", rpccmd);
+        }
+
+        LOG(log_debug, logtype_sl, "afp_spotlight_rpc: Reply dump:");
+        dd_dump(reply, 0);
 
-       case SPOTLIGHT_CMD_RPC:
-        /* IVAL(buf, 14): our reply in SPOTLIGHT_CMD_FLAGS */
-        /* IVAL(buf, 18): length */
-        /* IVAL(buf, 22): endianess, ignored, we assume little endian */
-               break;
-       }
+        memset(rbuf, 0, 4);
+        *rbuflen += 4;
+
+        EC_NEG1_LOG( len = sl_pack(reply, rbuf + 4) );
+        *rbuflen += len;
+        break;
+    }
 
 EC_CLEANUP:
     talloc_free(tmp_ctx);
     if (ret != AFP_OK) {
-        
+        *rbuflen = 0;
+        return AFPERR_MISC;
     }
     EC_EXIT;
 }
+#endif
 
 /**************************************************************************************************
  * Testing
@@ -730,109 +716,89 @@ EC_CLEANUP:
 
 #ifdef SPOT_TEST_MAIN
 
-static const char *neststrings[] = {
-    "",
-    "    ",
-    "        ",
-    "            ",
-    "                ",
-    "                    ",
-    "                        "
-};
-
-static int dd_dump(DALLOC_CTX *dd, int nestinglevel)
-{
-    const char *type;
-
-    printf("%sArray(#%d): {\n", neststrings[nestinglevel], talloc_array_length(dd->dd_talloc_array));
-
-    for (int n = 0; n < talloc_array_length(dd->dd_talloc_array); n++) {
-
-        type = talloc_get_name(dd->dd_talloc_array[n]);
-
-        if (STRCMP(type, ==, "int64_t")) {
-            int64_t i;
-            memcpy(&i, dd->dd_talloc_array[n], sizeof(int64_t));
-            printf("%s%d:\t%" PRId64 "\n", neststrings[nestinglevel + 1], n, i);
-        } else if (STRCMP(type, ==, "uint32_t")) {
-            uint32_t i;
-            memcpy(&i, dd->dd_talloc_array[n], sizeof(uint32_t));
-            printf("%s%d:\t%" PRIu32 "\n", neststrings[nestinglevel + 1], n, i);
-        } else if (STRCMP(type, ==, "char *")) {
-            char *s;
-            memcpy(&s, dd->dd_talloc_array[n], sizeof(char *));
-            printf("%s%d:\t%s\n", neststrings[nestinglevel + 1], n, s);
-        } else if (STRCMP(type, ==, "_Bool")) {
-            bool bl;
-            memcpy(&bl, dd->dd_talloc_array[n], sizeof(bool));
-            printf("%s%d:\t%s\n", neststrings[nestinglevel + 1], n, bl ? "true" : "false");
-        } else if (STRCMP(type, ==, "dd_t")) {
-            DALLOC_CTX *nested;
-            memcpy(&nested, dd->dd_talloc_array[n], sizeof(DALLOC_CTX *));
-            dd_dump(nested, nestinglevel + 1);
-        } else if (STRCMP(type, ==, "cnid_array_t")) {
-            cnid_array_t *cnids;
-            memcpy(&cnids, dd->dd_talloc_array[n], sizeof(cnid_array_t *));
-            printf("%s%d:\tunkn1: %" PRIu16 ", unkn2: %" PRIu32,
-                   neststrings[nestinglevel + 1], n, cnids->ca_unkn1, cnids->ca_unkn2);
-            if (cnids->ca_cnids)
-                dd_dump(cnids->ca_cnids, nestinglevel + 1);
-        }
-    }
-    printf("%s}\n", neststrings[nestinglevel]);
-}
-
-#include <stdarg.h>
-
 int main(int argc, char **argv)
 {
+    EC_INIT;
     TALLOC_CTX *mem_ctx = talloc_new(NULL);
     DALLOC_CTX *dd = talloc_zero(mem_ctx, DALLOC_CTX);
-    int64_t i;
+    uint64_t i;
 
     set_processname("spot");
-    setuplog("default:info", "/dev/tty");
-
-    LOG(logtype_default, log_info, "Start");
+    setuplog("default:info,spotlight:debug", "/dev/tty");
 
-    i = 2;
-    dalloc_add(dd, &i, int64_t);
+    LOG(log_info, logtype_sl, "Start");
 
     i = 1;
-    dalloc_add(dd, &i, int64_t);
+    dalloc_add_copy(dd, &i, uint64_t);
+    char *str = dalloc_strdup(dd, "hello world");
+    dalloc_add(dd, str, char *);
+    sl_bool_t b = true;
+    dalloc_add_copy(dd, &b, sl_bool_t);
 
+    /* add a nested array */
+    DALLOC_CTX *nested = talloc_zero(dd, DALLOC_CTX);
+    i = 3;
+    dalloc_add_copy(nested, &i, uint64_t);
+    dalloc_add(dd, nested, DALLOC_CTX);
 
-    char *str = talloc_strdup(dd, "hello world");
-    dalloc_add(dd, &str, char *);
+    /* test an allocated CNID array */
+    uint64_t id = 16;
+    sl_cnids_t *cnids = talloc_zero(dd, sl_cnids_t);
+    cnids->ca_cnids = talloc_zero(cnids, DALLOC_CTX);
+    cnids->ca_unkn1 = 1;
+    dalloc_add_copy(cnids->ca_cnids, &id, uint64_t);
+    dalloc_add(dd, cnids, sl_cnids_t);
 
-    bool b = true;
-    dalloc_add(dd, &b, bool);
+    /* Now the Spotlight types */
+    sl_array_t *sl_array = talloc_zero(dd, sl_array_t);
+    i = 0x1234;
+    dalloc_add_copy(sl_array, &i, uint64_t);
 
-    b = false;
-    dalloc_add(dd, &b, bool);
+    sl_dict_t *sl_dict = talloc_zero(dd, sl_dict_t);
+    i = 0xffff;
+    dalloc_add_copy(sl_dict, &i, uint64_t);
+    dalloc_add(sl_array, sl_dict, sl_dict_t);
 
+    dalloc_add(dd, sl_array, sl_array_t);
 
-    /* add a nested array */
-    DALLOC_CTX *nested = talloc_zero(dd, DALLOC_CTX);
-    i = 3;
-    dalloc_add(nested, &i, int64_t);
-    dalloc_add(dd, &nested, DALLOC_CTX);
+    dd_dump(dd, 0);
 
-    /* test a CNID array */
-    uint32_t id = 16;
-    cnid_array_t *cnids = talloc_zero(dd, cnid_array_t);
+    /* now parse a real spotlight packet */
+    if (argc > 1) {
+        char ibuf[8192];
+        char rbuf[8192];
+        int fd;
+        size_t len;
+        DALLOC_CTX *query;
 
-    cnids->ca_cnids = talloc_zero(cnids, DALLOC_CTX);
+        EC_NULL( query = talloc_zero(mem_ctx, DALLOC_CTX) );
 
-    cnids->ca_unkn1 = 1;
-    cnids->ca_unkn2 = 2;
+        EC_NEG1_LOG( fd = open(argv[1], O_RDONLY) );
+        EC_NEG1_LOG( len = read(fd, ibuf, 8192) );
+        close(fd);
+        EC_NEG1_LOG( sl_unpack(query, ibuf + 24) );
 
-    dalloc_add(cnids->ca_cnids, &id, uint32_t);
-    dalloc_add(dd, &cnids, cnid_array_t);
+        /* Now dump the whole thing */
+        dd_dump(query, 0);
+    }
 
-    dd_dump(dd, 0);
+#if 0
+    /* packing  */
+    int qlen;
+    char buf[MAX_SLQ_DAT];
+    EC_NEG1_LOG( qlen = sl_pack(query, buf) );
+
+    EC_NEG1_LOG( fd = open("test.bin", O_RDWR) );
+    lseek(fd, 24, SEEK_SET);
+    write(fd, buf, qlen);
+    close(fd);
+#endif
 
-    talloc_free(mem_ctx);
-    return 0;
+EC_CLEANUP:
+    if (mem_ctx) {
+        talloc_free(mem_ctx);
+        mem_ctx = NULL;
+    }
+    EC_EXIT;
 }
 #endif