X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fspotlight.c;h=fff5a36ba244def42fed80134ae2664b603cfbd9;hb=b85e88cc0e408268df912f6c10607ad72991c21e;hp=21934c0ca0fe57cf94786708b40b5553aaede6a4;hpb=3c6efabd6dc1997b57f4e85f23a66752798ffa8b;p=netatalk.git diff --git a/etc/afpd/spotlight.c b/etc/afpd/spotlight.c index 21934c0c..fff5a36b 100644 --- a/etc/afpd/spotlight.c +++ b/etc/afpd/spotlight.c @@ -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 */ @@ -23,7 +25,10 @@ #include #include #include +#include +#include +#include #include #include #include @@ -32,66 +37,31 @@ #include #include #include +#include -#include "spotlight.h" - -/************************************************************************************************** - * RPC data marshalling and unmarshalling - **************************************************************************************************/ +#include "directory.h" -/* FPSpotlightRPC subcommand codes */ -#define SPOTLIGHT_CMD_VOLPATH 1 -#define SPOTLIGHT_CMD_FLAGS 2 -#define SPOTLIGHT_CMD_RPC 3 - -/* 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_TYPE_TOC 0x8800 - -#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 - -/* Forward declarations */ -static int dissect_spotlight(DALLOC_CTX *query, const char *buf); -static int sl_pack_loop(DALLOC_CTX *query, char *buf, int offset, char *toc_buf, int *toc_idx); +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; - LOG(log_debug, logtype_sl, "%s1: %s(#%d): {", neststrings[nestinglevel], talloc_get_name(dd), talloc_array_length(dd->dd_talloc_array)); + 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++) { @@ -99,551 +69,545 @@ static int dd_dump(DALLOC_CTX *dd, int nestinglevel) 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, "%s%u:\t0x%04x", neststrings[nestinglevel + 1], n + 1, i); - } else if (STRCMP(type, ==, "int64_t")) { - int64_t i; - memcpy(&i, dd->dd_talloc_array[n], sizeof(int64_t)); - LOG(log_debug, logtype_sl, "%s%d:\t%" PRId64, neststrings[nestinglevel + 1], n + 1, i); - } else if (STRCMP(type, ==, "uint32_t")) { - uint32_t i; - memcpy(&i, dd->dd_talloc_array[n], sizeof(uint32_t)); - LOG(log_debug, logtype_sl, "%s%d:\t%" PRIu32, neststrings[nestinglevel + 1], n + 1, i); + LOG(log_debug, logtype_sl, "%suint64_t: 0x%04x", neststrings[nestinglevel + 1], i); } else if (STRCMP(type, ==, "char *")) { - char *s; - memcpy(&s, dd->dd_talloc_array[n], sizeof(char *)); - LOG(log_debug, logtype_sl, "%s%d:\t%s", neststrings[nestinglevel + 1], n + +1, s); + 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, "%s%d:\t%s", neststrings[nestinglevel + 1], n + +1, bl ? "true" : "false"); + 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, "%s%d:\tunkn1: %" PRIu16 ", unkn2: %" PRIu32, - neststrings[nestinglevel + 1], n + 1, cnids.ca_unkn1, cnids.ca_unkn2); + 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 + 1); + 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]); } -/* -* 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 uint spotlight_get_utf16_string_encoding(const char *buf, int offset, int query_length, uint encoding) { - uint utf16_encoding; - - /* check for byte order mark */ - utf16_encoding = SL_ENC_BIG_ENDIAN; - if (query_length >= 2) { - uint16_t byte_order_mark; - if (encoding == SL_ENC_LITTLE_ENDIAN) - byte_order_mark = SVAL(buf, offset); - else - byte_order_mark = RSVAL(buf, offset); - - if (byte_order_mark == 0xFFFE) { - utf16_encoding = SL_ENC_BIG_ENDIAN | SL_ENC_UTF_16; - } - else if (byte_order_mark == 0xFEFF) { - utf16_encoding = SL_ENC_LITTLE_ENDIAN | SL_ENC_UTF_16; - } - } - - return utf16_encoding; -} - +#ifndef SPOT_TEST_MAIN /************************************************************************************************** - * marshalling functions + * Spotlight queries **************************************************************************************************/ -#define SL_OFFSET_DELTA 16 +static ATALK_LIST_HEAD(sl_queries); -static uint64_t sl_pack_tag(uint16_t type, uint16_t size_or_count, uint32_t val) +/*! + * Add a query to the list of active queries + */ +static int slq_add(slq_t *slq) { - uint64_t tag = ((uint64_t)val << 32) | ((uint64_t)type << 16) | size_or_count; - return tag; + list_add(&(slq->slq_list), &sl_queries); + return 0; } -static int sl_pack_float(double d, char *buf, int offset) +static int slq_remove(slq_t *slq) { - union { - double d; - uint64_t w; - } ieee_fp_union; - - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_FLOAT, 2, 1)); - SLVAL(buf, offset + 8, ieee_fp_union.w); + EC_INIT; + struct list_head *p; + slq_t *q = NULL; - return offset + 2 * sizeof(uint64_t); -} + 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; + } -static int sl_pack_uint64(uint64_t u, char *buf, int offset) -{ - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_INT64, 2, 1)); - SLVAL(buf, offset + 8, u); + 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"); + } - return offset + 2 * sizeof(uint64_t); +EC_CLEANUP: + EC_EXIT; } -static int sl_pack_date(sl_time_t t, char *buf, int offset) +static slq_t *slq_for_ctx(uint64_t ctx1, uint64_t ctx2) { - uint64_t data = 0; + EC_INIT; + slq_t *q = NULL; + struct list_head *p; - data = (t.tv_sec + SPOTLIGHT_TIME_DELTA) << 24; + list_for_each(p, &sl_queries) { + q = list_entry(p, slq_t, slq_list); - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_DATE, 2, 1)); - SLVAL(buf, offset + 8, data); + 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); - return offset + 2 * sizeof(uint64_t); + if ((q->slq_ctx1 == ctx1) && (q->slq_ctx2 == ctx2)) { + break; + } + q = NULL; + } + +EC_CLEANUP: + if (ret != 0) + q = NULL; + return q; } -static int sl_pack_uuid(sl_uuid_t uuid, char *buf, int offset) +/* Error handling for queries */ +static void slq_error(slq_t *slq) { - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_UUID, 3, 1)); - memcpy(buf + offset + 8, &uuid, 16); - - return offset + sizeof(uint64_t) + 16; + if (!slq) + return; + sl_module_export->sl_mod_error(slq); + slq_remove(slq); + talloc_free(slq); } -static int sl_pack_CNID(sl_cnids_t *cnids, uint32_t context, char *buf, int offset, char *toc_buf, int *toc_idx) +/************************************************************************************************** + * Spotlight RPC functions + **************************************************************************************************/ + +static int sl_rpc_fetchPropertiesForContext(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *v) { - int len = 0, off = 0; - int cnid_count = talloc_array_length(cnids->ca_cnids); + EC_INIT; + + char *s; + sl_dict_t *dict; + sl_array_t *array; + sl_uuid_t uuid; - SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_CNIDS, (offset + SL_OFFSET_DELTA) / 8, cnid_count)); - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx)); - *toc_idx++; - offset += 8; + if (!v->v_uuid) + EC_FAIL_LOG("sl_rpc_fetchPropertiesForContext: missing UUID for volume: %s", v->v_localname); - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_CNIDS, 2 + cnid_count, 8 /* unknown meaning, but always 8 */)); - offset += 8; + dict = talloc_zero(reply, sl_dict_t); - SLVAL(buf, offset, sl_pack_tag(0x0add, cnid_count, context)); - offset += 8; + /* key/val 1 */ + s = dalloc_strdup(dict, "kMDSStoreMetaScopes"); + dalloc_add(dict, s, char *); - for (int i = 0; i < cnid_count; i++) { - SLVAL(buf, offset, cnids->ca_cnids->dd_talloc_array[i]); - offset += 8; - } - - return offset; -} + array = talloc_zero(dict, sl_array_t); + s = dalloc_strdup(array, "kMDQueryScopeComputer"); + dalloc_add(array, s, char *); + dalloc_add(dict, array, sl_array_t); -static int sl_pack_array(sl_array_t *array, char *buf, int offset, char *toc_buf, int *toc_idx) -{ - SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_ARRAY, (offset + SL_OFFSET_DELTA) / 8, talloc_array_length(array->dd_talloc_array))); - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx)); - *toc_idx++; - offset += 8; + /* key/val 2 */ + s = dalloc_strdup(dict, "kMDSStorePathScopes"); + dalloc_add(dict, s, char *); - offset = sl_pack_loop(array, buf, offset, toc_buf, toc_idx); + 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); - return offset; -} + /* key/val 3 */ + s = dalloc_strdup(dict, "kMDSStoreUUID"); + dalloc_add(dict, s, char *); -static int sl_pack_dict(sl_array_t *dict, char *buf, int offset, char *toc_buf, int *toc_idx) -{ - SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_DICT, (offset + SL_OFFSET_DELTA) / 8, talloc_array_length(dict->dd_talloc_array))); - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx)); - *toc_idx++; - offset += 8; + memcpy(uuid.sl_uuid, v->v_uuid, 16); + dalloc_add_copy(dict, &uuid, sl_uuid_t); - offset = sl_pack_loop(dict, buf, offset, toc_buf, toc_idx); + /* 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); - return offset; + dalloc_add(reply, dict, sl_dict_t); + +EC_CLEANUP: + EC_EXIT; } -static int sl_pack_string(char *s, char *buf, int offset, char *toc_buf, int *toc_idx) +static int cnid_comp_fn(const void *p1, const void *p2) { - int len, octets, used_in_last_octet; - len = strlen(s); - octets = (len / 8) + (len & 7 ? 1 : 0); - used_in_last_octet = 8 - (octets * 8 - len); + const uint64_t *cnid1 = p1, *cnid2 = p2; + if (*cnid1 == *cnid2) + return 0; + if (*cnid1 < *cnid2) + return -1; + else + return 1; +} - SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_DICT, (offset + SL_OFFSET_DELTA) / 8, used_in_last_octet)); - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx)); - *toc_idx++; - offset += 8; +static int sl_createCNIDArray(slq_t *slq, const DALLOC_CTX *p) +{ + EC_INIT; + uint64_t *cnids = NULL; - SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_DATA, octets + 1, used_in_last_octet)); - offset += 8; + 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); - memset(buf + offset, 0, octets * 8); - strncpy(buf + offset, s, len); - offset += octets * 8; + slq->slq_cnids = cnids; + slq->slq_cnids_num = talloc_array_length(p); - return offset; +EC_CLEANUP: + if (ret != 0) { + if (cnids) + talloc_free(cnids); + } + EC_EXIT; } -static int sl_pack_loop(DALLOC_CTX *query, char *buf, int offset, char *toc_buf, int *toc_idx) +static int sl_rpc_openQuery(AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, struct vol *v) { - return offset; -} + 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); -/************************************************************************************************** - * unmarshalling functions - **************************************************************************************************/ + (void)slq_add(slq); + + /* Run the query */ + EC_ZERO( sl_module_export->sl_mod_start_search(slq) ); -static uint64_t sl_unpack_uint64(const char *buf, int offset, uint encoding) -{ - if (encoding == SL_ENC_LITTLE_ENDIAN) - return LVAL(buf, offset); - else - return RLVAL(buf, offset); + 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 int sl_unpack_ints(DALLOC_CTX *query, const char *buf, int offset, uint encoding) +static int sl_rpc_fetchQueryResultsForContext(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *v) { - int count, i; - uint64_t query_data64; + 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"); + } - query_data64 = sl_unpack_uint64(buf, offset, encoding); - count = query_data64 >> 32; - offset += 8; + /* Create and pass reply handle */ + EC_NULL( slq->slq_reply = talloc_zero(reply, sl_array_t) ); - i = 0; - while (i++ < count) { - query_data64 = sl_unpack_uint64(buf, offset, encoding); - dalloc_add(query, &query_data64, uint64_t); - offset += 8; - } + /* Fetch Tracker results*/ + EC_ZERO_LOG( sl_module_export->sl_mod_fetch_result(slq) ); - return count; -} + dalloc_add(reply, slq->slq_reply, sl_array_t); -static int sl_unpack_date(DALLOC_CTX *query, const char *buf, int offset, uint encoding) -{ - int count, i; - uint64_t query_data64; - sl_time_t t; - - query_data64 = sl_unpack_uint64(buf, offset, encoding); - count = query_data64 >> 32; - offset += 8; - - i = 0; - while (i++ < count) { - query_data64 = sl_unpack_uint64(buf, offset, encoding) >> 24; - t.tv_sec = query_data64 - SPOTLIGHT_TIME_DELTA; - t.tv_usec = 0; - dalloc_add(query, &t, sl_time_t); - offset += 8; - } - - return count; +EC_CLEANUP: + if (ret != 0) { + slq_error(slq); + } + EC_EXIT; } -static int sl_unpack_uuid(DALLOC_CTX *query, const char *buf, int offset, uint encoding) +static int sl_rpc_storeAttributesForOIDArray(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *vol) { - int count, i; - uint64_t query_data64; - sl_uuid_t uuid; - query_data64 = sl_unpack_uint64(buf, offset, encoding); - count = query_data64 >> 32; - offset += 8; - - i = 0; - while (i++ < count) { - memcpy(uuid.sl_uuid, buf + offset, 16); - dalloc_add(query, &uuid, sl_uuid_t); - offset += 16; - } - - return count; -} + 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) ); + } -static int sl_unpack_floats(DALLOC_CTX *query, const char *buf, int offset, uint encoding) -{ - int count, i; - uint64_t query_data64; - double fval; - union { - double d; - uint32_t w[2]; - } ieee_fp_union; - - query_data64 = sl_unpack_uint64(buf, offset, encoding); - count = query_data64 >> 32; - offset += 8; - - i = 0; - while (i++ < count) { - if (encoding == SL_ENC_LITTLE_ENDIAN) { -#ifdef WORDS_BIGENDIAN - ieee_fp_union.w[0] = IVAL(buf, offset + 4); - ieee_fp_union.w[1] = IVAL(buf, offset); -#else - ieee_fp_union.w[0] = IVAL(buf, offset); - ieee_fp_union.w[1] = IVAL(buf, offset + 4); -#endif - } else { -#ifdef WORDS_BIGENDIAN - ieee_fp_union.w[0] = RIVAL(buf, offset); - ieee_fp_union.w[1] = RIVAL(buf, offset + 4); -#else - ieee_fp_union.w[0] = RIVAL(buf, offset + 4); - ieee_fp_union.w[1] = RIVAL(buf, offset); -#endif - } - dalloc_add(query, &ieee_fp_union.d, double); - offset += 8; - } + 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); - return count; +EC_CLEANUP: + EC_EXIT; } -static int sl_unpack_CNID(DALLOC_CTX *query, const char *buf, int offset, int length, uint encoding) +static int sl_rpc_fetchAttributeNamesForOIDArray(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *vol) { EC_INIT; - int count; - uint64_t query_data64; - sl_cnids_t cnids; + 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) ); + } - EC_NULL( cnids.ca_cnids = talloc_zero(query, DALLOC_CTX) ); + /* 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); - if (length <= 16) - /* that's permitted, it's an empty array */ - goto EC_CLEANUP; +EC_CLEANUP: + EC_EXIT; +} + +static int sl_rpc_fetchAttributesForOIDArray(AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *vol) +{ + EC_INIT; + 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); - query_data64 = sl_unpack_uint64(buf, offset, encoding); - count = query_data64 & 0xffff; + 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) ); + } - cnids.ca_unkn1 = (query_data64 & 0xffff0000) >> 16; - cnids.ca_unkn2 = query_data64 >> 32; + /* Return result value 0 */ + uint64_t sl_res = 0; + dalloc_add_copy(slq->slq_reply, &sl_res, uint64_t); - offset += 8; + /* 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); - while (count --) { - query_data64 = sl_unpack_uint64(buf, offset, encoding); - dalloc_add(cnids.ca_cnids, &query_data64, uint64_t); - offset += 8; - } + /* Fetch attributes from module */ + EC_ZERO_LOG( sl_module_export->sl_mod_fetch_attrs(slq) ); - dalloc_add(query, &cnids, sl_cnids_t); + dalloc_add(reply, slq->slq_reply, sl_array_t); EC_CLEANUP: EC_EXIT; } -static const char *spotlight_get_qtype_string(uint64_t query_type) -{ - 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"; - } -} - -static const char *spotlight_get_cpx_qtype_string(uint64_t cpx_query_type) -{ - 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"; - } -} - -static int spotlight_dissect_loop(DALLOC_CTX *query, - const char *buf, - uint offset, - uint count, - const uint toc_offset, - const uint encoding) +static int sl_rpc_closeQueryForContext(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *v) { EC_INIT; - int i, toc_index, query_length; - uint subcount, cpx_query_type, cpx_query_count; - uint64_t query_data64, query_type; - uint unicode_encoding; - uint8_t mark_exists; - char *p; - int padding, slen; - - while (count > 0 && (offset < toc_offset)) { - query_data64 = sl_unpack_uint64(buf, offset, encoding); - query_length = (query_data64 & 0xffff) * 8; - query_type = (query_data64 & 0xffff0000) >> 16; - if (query_length == 0) - EC_FAIL; - - switch (query_type) { - case SQ_TYPE_COMPLEX: - toc_index = (query_data64 >> 32) - 1; - query_data64 = sl_unpack_uint64(buf, toc_offset + toc_index * 8, encoding); - cpx_query_type = (query_data64 & 0xffff0000) >> 16; - cpx_query_count = query_data64 >> 32; - - switch (cpx_query_type) { - case SQ_CPX_TYPE_ARRAY: { - sl_array_t *sl_arrary = talloc_zero(query, sl_array_t); - EC_NEG1_LOG( offset = spotlight_dissect_loop(sl_arrary, buf, offset + 8, cpx_query_count, toc_offset, encoding) ); - dalloc_add(query, sl_arrary, sl_array_t); - break; - } - - case SQ_CPX_TYPE_DICT: { - sl_dict_t *sl_dict = talloc_zero(query, sl_dict_t); - EC_NEG1_LOG( offset = spotlight_dissect_loop(sl_dict, buf, offset + 8, cpx_query_count, toc_offset, encoding) ); - dalloc_add(query, sl_dict, sl_dict_t); - break; - } - case SQ_CPX_TYPE_STRING: - query_data64 = sl_unpack_uint64(buf, offset + 8, encoding); - query_length += (query_data64 & 0xffff) * 8; - if ((padding = 8 - (query_data64 >> 32)) < 0) - EC_FAIL; - if ((slen = query_length - 16 - padding) < 1) - EC_FAIL; - p = talloc_strndup(query, buf + offset + 16, slen); - dalloc_add(query, &p, char *); - break; - - case SQ_CPX_TYPE_UTF16_STRING: - query_data64 = sl_unpack_uint64(buf, offset + 8, encoding); - query_length += (query_data64 & 0xffff) * 8; - if ((padding = 8 - (query_data64 >> 32)) < 0) - EC_FAIL; - if ((slen = query_length - 16 - padding) < 1) - EC_FAIL; - - unicode_encoding = spotlight_get_utf16_string_encoding(buf, offset + 16, slen, encoding); - mark_exists = (unicode_encoding & SL_ENC_UTF_16); - unicode_encoding &= ~SL_ENC_UTF_16; - - EC_NEG1( convert_string_allocate(CH_UCS2, CH_UTF8, buf + offset + (mark_exists ? 18 : 16), slen, &p) ); - dalloc_add(query, &p, char *); - break; - - case SQ_CPX_TYPE_FILEMETA: - query_data64 = sl_unpack_uint64(buf, offset + 8, encoding); - query_length += (query_data64 & 0xffff) * 8; - - if (query_length <= 8) { - EC_FAIL_LOG("SQ_CPX_TYPE_FILEMETA: query_length <= 8%s", ""); - } else { - EC_NEG1_LOG( dissect_spotlight(query, buf + offset + 16) ); - } - break; - - case SQ_CPX_TYPE_CNIDS: - query_data64 = sl_unpack_uint64(buf, offset + 8, encoding); - query_length += (query_data64 & 0xffff) * 8; - EC_NEG1_LOG( sl_unpack_CNID(query, buf, offset + 16, query_length, encoding) ); - break; - } /* switch (cpx_query_type) */ - - count--; - break; - - case SQ_TYPE_NULL: { - subcount = query_data64 >> 32; - if (subcount > 64) - EC_FAIL; - sl_nil_t nil = 0; - for (i = 0; i < subcount; i++) - dalloc_add(query, &nil, sl_nil_t); - count -= subcount; - break; - } - case SQ_TYPE_BOOL: { - sl_bool_t b = query_data64 >> 32; - dalloc_add(query, &b, sl_bool_t); - count--; - break; - } - case SQ_TYPE_INT64: - EC_NEG1_LOG( subcount = sl_unpack_ints(query, buf, offset, encoding) ); - count -= subcount; - break; - case SQ_TYPE_UUID: - EC_NEG1_LOG( subcount = sl_unpack_uuid(query, buf, offset, encoding) ); - count -= subcount; - break; - case SQ_TYPE_FLOAT: - EC_NEG1_LOG( subcount = sl_unpack_floats(query, buf, offset, encoding) ); - count -= subcount; - break; - case SQ_TYPE_DATE: - EC_NEG1_LOG( subcount = sl_unpack_date(query, buf, offset, encoding) ); - count -= subcount; - break; - default: - EC_FAIL; - } - - offset += query_length; - } + 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) { - offset = -1; + slq_error(slq); } - return offset; + EC_EXIT; } -static int dissect_spotlight(DALLOC_CTX *query, const char *buf) +/************************************************************************************************** + * Spotlight module functions + **************************************************************************************************/ + +int sl_mod_load(const char *path) { EC_INIT; - int encoding, i, toc_entries; - uint64_t toc_offset, tquerylen, toc_entry; - if (strncmp(buf, "md031234", 8) == 0) - encoding = SL_ENC_BIG_ENDIAN; - else - encoding = SL_ENC_LITTLE_ENDIAN; + sl_ctx = talloc_new(NULL); - buf += 8; - - toc_offset = ((sl_unpack_uint64(buf, 0, encoding) >> 32) - 1 ) * 8; - if (toc_offset < 0 || (toc_offset > 65000)) { + if ((sl_module = mod_open(path)) == NULL) { + LOG(log_error, logtype_sl, "Failed to load module \'%s\': %s", path, mod_error()); EC_FAIL; - } - - buf += 8; - - toc_entries = (int)(sl_unpack_uint64(buf, toc_offset, encoding) & 0xffff); + } - EC_NEG1( spotlight_dissect_loop(query, buf, 0, 1, toc_offset + 8, encoding) ); + 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; @@ -653,9 +617,15 @@ int afp_spotlight_rpc(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_ 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; @@ -675,37 +645,70 @@ int afp_spotlight_rpc(AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf, size_ /* 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: - RSIVAL(rbuf, 0, 0x0100006b); /* Whatever this value means... flags? */ + break; + + case SPOTLIGHT_CMD_FLAGS: + RSIVAL(rbuf, 0, 0x0100006b); /* Whatever this value means... flags? Helios uses 0x1eefface */ *rbuflen += 4; - break; + break; - case SPOTLIGHT_CMD_RPC: { - DALLOC_CTX *query; + case SPOTLIGHT_CMD_RPC: EC_NULL( query = talloc_zero(tmp_ctx, DALLOC_CTX) ); - (void)dissect_spotlight(query, ibuf + 22); + 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); - break; + + 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); + + 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 @@ -718,77 +721,78 @@ 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,spotlight:debug", "/dev/tty"); LOG(log_info, logtype_sl, "Start"); -#if 0 - i = 2; - dalloc_add(dd, &i, int64_t); - i = 1; - dalloc_add(dd, &i, int64_t); - - - char *str = talloc_strdup(dd, "hello world"); - dalloc_add(dd, &str, char *); - + 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(dd, &b, sl_bool_t); - - b = false; - dalloc_add(dd, &b, sl_bool_t); - + dalloc_add_copy(dd, &b, sl_bool_t); /* add a nested array */ DALLOC_CTX *nested = talloc_zero(dd, DALLOC_CTX); i = 3; - dalloc_add(nested, &i, int64_t); + dalloc_add_copy(nested, &i, uint64_t); dalloc_add(dd, nested, DALLOC_CTX); /* test an allocated CNID array */ - uint32_t id = 16; + 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; - cnids->ca_unkn2 = 2; - - dalloc_add(cnids->ca_cnids, &id, uint32_t); + dalloc_add_copy(cnids->ca_cnids, &id, uint64_t); dalloc_add(dd, cnids, sl_cnids_t); /* Now the Spotlight types */ - sl_array_t *sl_arrary = talloc_zero(dd, sl_array_t); - i = 1234; - dalloc_add(sl_arrary, &i, int64_t); + sl_array_t *sl_array = talloc_zero(dd, sl_array_t); + i = 0x1234; + dalloc_add_copy(sl_array, &i, uint64_t); sl_dict_t *sl_dict = talloc_zero(dd, sl_dict_t); - i = 5678; - dalloc_add(sl_dict, &i, int64_t); - dalloc_add(sl_arrary, sl_dict, 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_arrary, sl_array_t); -#endif + dalloc_add(dd, sl_array, sl_array_t); + + dd_dump(dd, 0); /* now parse a real spotlight packet */ - char ibuf[8192]; - char rbuf[8192]; - int fd; - size_t len; - DALLOC_CTX *query; + if (argc > 1) { + char ibuf[8192]; + char rbuf[8192]; + int fd; + size_t len; + DALLOC_CTX *query; - EC_NULL( query = talloc_zero(mem_ctx, DALLOC_CTX) ); + EC_NULL( query = talloc_zero(mem_ctx, DALLOC_CTX) ); - EC_NEG1_LOG( fd = open("spotlight-packet2.bin", O_RDONLY) ); - EC_NEG1_LOG( len = read(fd, ibuf, 8192) ); - EC_NEG1_LOG( dissect_spotlight(query, ibuf + 24) ); + 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) ); - /* Now dump the whole thing */ - dd_dump(query, 0); + /* Now dump the whole thing */ + dd_dump(query, 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 EC_CLEANUP: if (mem_ctx) {