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 *")) {
- char *s;
- memcpy(&s, dd->dd_talloc_array[n], sizeof(char *));
- LOG(log_debug, logtype_sl, "%sstring: %s", neststrings[nestinglevel + 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));
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]);
{
EC_INIT;
- LOG(log_debug, logtype_sl, "slq_add(q: \"%s\"ctx1: 0x%" PRIx64 ", ctx2: 0x%" PRIx64 ")",
- slq->slq_qstring, slq->slq_ctx1, slq->slq_ctx2);
-
if (slq_active)
talloc_free(slq_active);
slq_active = slq;
EC_EXIT;
}
+static int slq_remove(slq_t *slq)
+{
+ EC_INIT;
+
+ if ((slq_active->slq_ctx1 == slq->slq_ctx1) && (slq_active->slq_ctx2 == slq->slq_ctx2)) {
+ slq_active = NULL;
+ }
+
+EC_CLEANUP:
+ EC_EXIT;
+}
+
static slq_t *slq_for_ctx(uint64_t ctx1, uint64_t ctx2)
{
EC_INIT;
return q;
}
+/* Error handling for queries */
+static void slq_error(slq_t *slq)
+{
+ if (!slq)
+ return;
+ sl_module_export->sl_mod_error(slq);
+ slq_remove(slq);
+ talloc_free(slq);
+}
+
/**************************************************************************************************
* Spotlight RPC functions
**************************************************************************************************/
dict = talloc_zero(reply, sl_dict_t);
/* key/val 1 */
- s = talloc_strdup(dict, "kMDSStoreMetaScopes");
- dalloc_add(dict, &s, char *);
+ s = dalloc_strdup(dict, "kMDSStoreMetaScopes");
+ dalloc_add(dict, s, char *);
array = talloc_zero(dict, sl_array_t);
- s = talloc_strdup(array, "kMDQueryScopeComputer");
- dalloc_add(array, &s, char *);
+ s = dalloc_strdup(array, "kMDQueryScopeComputer");
+ dalloc_add(array, s, char *);
dalloc_add(dict, array, sl_array_t);
/* key/val 2 */
- s = talloc_strdup(dict, "kMDSStorePathScopes");
- dalloc_add(dict, &s, char *);
+ s = dalloc_strdup(dict, "kMDSStorePathScopes");
+ dalloc_add(dict, s, char *);
array = talloc_zero(dict, sl_array_t);
- s = talloc_strdup(array, v->v_path);
- dalloc_add(array, &s, char *);
+ s = dalloc_strdup(array, v->v_path);
+ dalloc_add(array, s, char *);
dalloc_add(dict, array, sl_array_t);
/* key/val 3 */
- s = talloc_strdup(dict, "kMDSStoreUUID");
- dalloc_add(dict, &s, char *);
+ s = dalloc_strdup(dict, "kMDSStoreUUID");
+ dalloc_add(dict, s, char *);
memcpy(uuid.sl_uuid, v->v_uuid, 16);
- dalloc_add(dict, &uuid, sl_uuid_t);
+ dalloc_add_copy(dict, &uuid, sl_uuid_t);
/* key/val 4 */
- s = talloc_strdup(dict, "kMDSStoreHasPersistentUUID");
- dalloc_add(dict, &s, char *);
+ s = dalloc_strdup(dict, "kMDSStoreHasPersistentUUID");
+ dalloc_add(dict, s, char *);
sl_bool_t b = true;
- dalloc_add(dict, &b, sl_bool_t);
+ dalloc_add_copy(dict, &b, sl_bool_t);
dalloc_add(reply, dict, sl_dict_t);
static int sl_rpc_openQuery(AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, struct vol *v)
{
EC_INIT;
- char **sl_query;
+ char *sl_query;
uint64_t *uint64;
DALLOC_CTX *reqinfo;
sl_array_t *array;
-
- slq_t *slq = talloc_zero(sl_ctx, slq_t);
+ 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;
EC_NULL_LOG( sl_query = dalloc_value_for_key(query, "DALLOC_CTX", 0, "DALLOC_CTX", 1, "kMDQueryString") );
- LOG(log_debug, logtype_sl, "sl_rpc_openQuery: %s", *sl_query);
- slq->slq_qstring = talloc_steal(slq, *sl_query);
- slq->slq_state = SLQ_STATE_NEW;
+ LOG(log_debug, logtype_sl, "sl_rpc_openQuery: %s", sl_query);
+ slq->slq_qstring = talloc_steal(slq, sl_query);
+
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;
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);
- slq->slq_metacount = dalloc_size(slq->slq_reqinfo);
LOG(log_maxdebug, logtype_sl, "sl_rpc_openQuery: requested attributes:");
dd_dump(slq->slq_reqinfo, 0);
(void)slq_add(slq);
/* Run the query */
- sl_module_export->sl_mod_start_search(slq);
+ EC_ZERO( sl_module_export->sl_mod_start_search(slq) );
-EC_CLEANUP:
array = talloc_zero(reply, sl_array_t);
uint64_t sl_res = ret == 0 ? 0 : UINT64_MAX;
- dalloc_add(array, &sl_res, uint64_t);
+ 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_rpc_fetchQueryResultsForContext(const AFPObj *obj, const DALLOC_CTX *query, DALLOC_CTX *reply, const struct vol *v)
{
EC_INIT;
- slq_t *slq;
+ slq_t *slq = NULL;
uint64_t *uint64, ctx1, ctx2;
sl_array_t *array;
- array = talloc_zero(reply, sl_array_t);
- uint64_t sl_res = 0;
- dalloc_add(array, &sl_res, uint64_t);
-
/* Context */
EC_NULL_LOG (uint64 = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "uint64_t", 1) );
ctx1 = *uint64;
/* Get query for context */
EC_NULL_LOG( slq = slq_for_ctx(ctx1, ctx2) );
+ if (slq->slq_state != SLQ_STATE_RUNNING) {
+ EC_FAIL_LOG("Spotlight: attempt to fetch results for query that isn't runnnig");
+ }
- /* Pass reply handle */
+ /* Create and pass reply handle */
+ array = talloc_zero(reply, sl_array_t);
+ uint64_t sl_res = 0;
+ dalloc_add_copy(array, &sl_res, uint64_t);
slq->slq_reply = array;
/* Fetch Tracker results*/
- sl_module_export->sl_mod_fetch_result(slq);
+ EC_ZERO( sl_module_export->sl_mod_fetch_result(slq) );
+
+ dalloc_add(reply, array, sl_array_t);
EC_CLEANUP:
+ if (ret != 0) {
+ slq_error(slq);
+ }
+ 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) );
+ 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) {
+ slq_error(slq);
+ }
EC_EXIT;
}
int endianess = SL_ENC_LITTLE_ENDIAN;
struct vol *vol;
DALLOC_CTX *query;
+ DALLOC_CTX *reply;
+ char *rpccmd;
+ int len;
*rbuflen = 0;
switch (cmd) {
case SPOTLIGHT_CMD_OPEN:
- case SPOTLIGHT_CMD_OPEN2: {
+ 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? Helios uses 0x1eefface */
*rbuflen += 4;
break;
- case SPOTLIGHT_CMD_RPC: {
- DALLOC_CTX *query;
+ case SPOTLIGHT_CMD_RPC:
EC_NULL( query = talloc_zero(tmp_ctx, DALLOC_CTX) );
- DALLOC_CTX *reply;
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);
- char **cmd;
- EC_NULL_LOG( cmd = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "char *", 0) );
+ EC_NULL_LOG( rpccmd = dalloc_get(query, "DALLOC_CTX", 0, "DALLOC_CTX", 0, "char *", 0) );
- if (STRCMP(*cmd, ==, "fetchPropertiesForContext:")) {
+ if (STRCMP(rpccmd, ==, "fetchPropertiesForContext:")) {
EC_ZERO_LOG( sl_rpc_fetchPropertiesForContext(obj, query, reply, vol) );
- } else if (STRCMP(*cmd, ==, "openQueryWithParams:forContext:")) {
+ } else if (STRCMP(rpccmd, ==, "openQueryWithParams:forContext:")) {
EC_ZERO_LOG( sl_rpc_openQuery(obj, query, reply, vol) );
- } else if (STRCMP(*cmd, ==, "fetchQueryResultsForContext:")) {
+ } else if (STRCMP(rpccmd, ==, "fetchQueryResultsForContext:")) {
EC_ZERO_LOG( sl_rpc_fetchQueryResultsForContext(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:");
memset(rbuf, 0, 4);
*rbuflen += 4;
- int len;
EC_NEG1_LOG( len = sl_pack(reply, rbuf + 4) );
*rbuflen += len;
-
break;
}
- }
EC_CLEANUP:
talloc_free(tmp_ctx);
LOG(log_info, logtype_sl, "Start");
- i = 2;
- dalloc_add(dd, &i, uint64_t);
-
i = 1;
- dalloc_add(dd, &i, uint64_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, uint64_t);
+ dalloc_add_copy(nested, &i, uint64_t);
dalloc_add(dd, nested, DALLOC_CTX);
-#if 0
/* 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(cnids->ca_cnids, &id, uint64_t);
+ dalloc_add_copy(cnids->ca_cnids, &id, uint64_t);
dalloc_add(dd, cnids, sl_cnids_t);
-#endif
/* Now the Spotlight types */
- sl_array_t *sl_arrary = talloc_zero(dd, sl_array_t);
+ sl_array_t *sl_array = talloc_zero(dd, sl_array_t);
i = 0x1234;
- dalloc_add(sl_arrary, &i, uint64_t);
- i = 0x5678;
- dalloc_add(sl_arrary, &i, uint64_t);
+ dalloc_add_copy(sl_array, &i, uint64_t);
-#if 0
sl_dict_t *sl_dict = talloc_zero(dd, sl_dict_t);
i = 0xffff;
- dalloc_add(sl_dict, &i, uint64_t);
- dalloc_add(sl_arrary, sl_dict, sl_dict_t);
-#endif
+ 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);
- dd_dump(dd, 0);
+ dalloc_add(dd, sl_array, sl_array_t);
- uint64_t *int1, *int2;
- EC_NULL_LOG (int1 = dalloc_get(dd, "DALLOC_CTX", 6, "uint64_t", 0) );
- EC_NULL_LOG (int2 = dalloc_get(dd, "DALLOC_CTX", 6, "uint64_t", 1) );
- LOG(log_debug, logtype_sl, "ctx1: 0x%" PRIx64 ", ctx2: 0x%" PRIx64, *int1, *int2);
+ dd_dump(dd, 0);
/* now parse a real spotlight packet */
if (argc > 1) {
projects / netatalk.git / blobdiff