#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 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
/* 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);
/* Helper functions and stuff */
static const char *neststrings[] = {
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);
+ neststrings[nestinglevel + 1], n + 1, cnids.ca_unkn1, cnids.ca_context);
if (cnids.ca_cnids)
dd_dump(cnids.ca_cnids, nestinglevel + 1);
}
* 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;
+ 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;
}
/**************************************************************************************************
* marshalling functions
**************************************************************************************************/
-static uint64_t sl_pack_tag(uint16_t type, uint16_t size, uint32_t val)
+#define SL_OFFSET_DELTA 16
+
+static uint64_t sl_pack_tag(uint16_t type, uint16_t size_or_count, uint32_t val)
{
- uint64_t tag = ((uint64_t)val << 32) | ((uint64_t)type << 16) | size;
+ uint64_t tag = ((uint64_t)val << 32) | ((uint64_t)type << 16) | size_or_count;
return tag;
}
-static int sl_pack_float(double d, char **buf, int *buf_len, char **toc_buf, int *toc_len, int *toc_idx)
+static int sl_pack_float(double d, char *buf, int offset)
{
union {
double d;
uint64_t w;
} ieee_fp_union;
- SLVAL(*buf, 0, sl_pack_tag(SQ_TYPE_FLOAT, 2, 1));
- SLVAL(*buf, 8, ieee_fp_union.w);
- *buf += 2 * sizeof(uint64_t);
- buf_len += 2 * sizeof(uint64_t);
+ SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_FLOAT, 2, 1));
+ SLVAL(buf, offset + 8, ieee_fp_union.w);
+
+ return offset + 2 * sizeof(uint64_t);
+}
+
+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);
+
+ return offset + 2 * sizeof(uint64_t);
+}
+
+static int sl_pack_bool(sl_bool_t bl, char *buf, int offset)
+{
+ SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_BOOL, 1, bl ? 1 : 0));
+
+ return offset + sizeof(uint64_t);
+}
+
+static int sl_pack_nil(char *buf, int offset)
+{
+ SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_NULL, 1, 1));
+
+ return offset + sizeof(uint64_t);
+}
+
+static int sl_pack_date(sl_time_t t, char *buf, int offset)
+{
+ uint64_t data = 0;
+
+ data = (t.tv_sec + SPOTLIGHT_TIME_DELTA) << 24;
+
+ SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_DATE, 2, 1));
+ SLVAL(buf, offset + 8, data);
+
+ return offset + 2 * sizeof(uint64_t);
+}
+
+static int sl_pack_uuid(sl_uuid_t *uuid, char *buf, int offset)
+{
+ SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_UUID, 3, 1));
+ memcpy(buf + offset + 8, uuid, 16);
+
+ return offset + sizeof(uint64_t) + 16;
+}
+
+static int sl_pack_CNID(sl_cnids_t *cnids, char *buf, int offset, char *toc_buf, int *toc_idx)
+{
+ int len = 0, off = 0;
+ int cnid_count = talloc_array_length(cnids->ca_cnids);
+
+ 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 + 1));
+ *toc_idx += 1;
+ offset += 8;
+
+ SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_CNIDS, 2 + cnid_count, 8 /* unknown meaning, but always 8 */));
+ offset += 8;
+
+ if (cnid_count > 0) {
+ SLVAL(buf, offset, sl_pack_tag(0x0add, cnid_count, cnids->ca_context));
+ offset += 8;
+
+ for (int i = 0; i < cnid_count; i++) {
+ SLVAL(buf, offset, cnids->ca_cnids->dd_talloc_array[i]);
+ offset += 8;
+ }
+ }
+
+ return offset;
+}
+
+static int sl_pack_array(sl_array_t *array, char *buf, int offset, char *toc_buf, int *toc_idx)
+{
+ int count = talloc_array_length(array->dd_talloc_array);
+ int octets = (offset + SL_OFFSET_DELTA) / 8;
+
+ LOG(log_maxdebug, logtype_sl, "sl_pack_array: count: %d, offset:%d, octets: %d", count, offset, octets);
+
+ SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_ARRAY, octets, count));
+ SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1));
+ *toc_idx += 1;
+ offset += 8;
+
+ offset = sl_pack_loop(array, buf, offset, toc_buf, toc_idx);
- return 0;
+ return offset;
}
-static int sl_pack_uint64(uint64_t u, char **buf, int *buf_len, char **toc_buf, int *toc_len, int *toc_idx)
+static int sl_pack_dict(sl_array_t *dict, char *buf, int offset, char *toc_buf, int *toc_idx)
{
- SLVAL(*buf, 0, sl_pack_tag(SQ_TYPE_INT64, 2, 1));
- SLVAL(*buf, 8, u);
- *buf += 2 * sizeof(uint64_t);
- *buf_len += 2 * sizeof(uint64_t);
+ 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 + 1));
+ *toc_idx += 1;
+ offset += 8;
+
+ offset = sl_pack_loop(dict, buf, offset, toc_buf, toc_idx);
+
+ return offset;
+}
+
+static int sl_pack_string(char **string, char *buf, int offset, char *toc_buf, int *toc_idx)
+{
+ int len, octets, used_in_last_octet;
+ char *s = *string;
+ len = strlen(s);
+ octets = (len / 8) + (len & 7 ? 1 : 0);
+ used_in_last_octet = 8 - (octets * 8 - len);
+
+ LOG(log_maxdebug, logtype_sl, "sl_pack_string(\"%s\"): len: %d, octets: %d, used_in_last_octet: %d",
+ s, len, octets, used_in_last_octet);
+
+ SLVAL(toc_buf, *toc_idx * 8, sl_pack_tag(SQ_CPX_TYPE_STRING, (offset + SL_OFFSET_DELTA) / 8, used_in_last_octet));
+ SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_COMPLEX, 1, *toc_idx + 1));
+ *toc_idx += 1;
+ offset += 8;
+
+ SLVAL(buf, offset, sl_pack_tag(SQ_TYPE_DATA, octets + 1, used_in_last_octet));
+ offset += 8;
+
+ memset(buf + offset, 0, octets * 8);
+ strncpy(buf + offset, s, len);
+ offset += octets * 8;
+
+ return offset;
+}
+
+static int sl_pack_loop(DALLOC_CTX *query, char *buf, int offset, char *toc_buf, int *toc_idx)
+{
+ const char *type;
+
+ for (int n = 0; n < talloc_array_length(query->dd_talloc_array); n++) {
+
+ type = talloc_get_name(query->dd_talloc_array[n]);
+
+ if (STRCMP(type, ==, "sl_array_t")) {
+ offset = sl_pack_array(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx);
+ } else if (STRCMP(type, ==, "sl_dict_t")) {
+ offset = sl_pack_dict(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx);
+ } else if (STRCMP(type, ==, "uint64_t")) {
+ uint64_t i;
+ memcpy(&i, query->dd_talloc_array[n], sizeof(uint64_t));
+ offset = sl_pack_uint64(i, buf, offset);
+ } else if (STRCMP(type, ==, "char *")) {
+ offset = sl_pack_string(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx);
+ } else if (STRCMP(type, ==, "sl_bool_t")) {
+ sl_bool_t bl;
+ memcpy(&bl, query->dd_talloc_array[n], sizeof(sl_bool_t));
+ offset = sl_pack_bool(bl, buf, offset);
+ } else if (STRCMP(type, ==, "double")) {
+ double d;
+ memcpy(&d, query->dd_talloc_array[n], sizeof(double));
+ offset = sl_pack_float(d, buf, offset);
+ } else if (STRCMP(type, ==, "sl_nil_t")) {
+ offset = sl_pack_nil(buf, offset);
+ } else if (STRCMP(type, ==, "sl_time_t")) {
+ sl_time_t t;
+ memcpy(&t, query->dd_talloc_array[n], sizeof(sl_time_t));
+ offset = sl_pack_date(t, buf, offset);
+ } else if (STRCMP(type, ==, "sl_uuid_t")) {
+ offset = sl_pack_uuid(query->dd_talloc_array[n], buf, offset);
+ } else if (STRCMP(type, ==, "sl_cnids_t")) {
+ offset = sl_pack_CNID(query->dd_talloc_array[n], buf, offset, toc_buf, toc_idx);
+ }
+ }
+
+ return offset;
+}
+
+#define MAX_SLQ_DAT 65000
+#define MAX_SLQ_TOC 2048
+
+static int sl_pack(DALLOC_CTX *query, char *buf)
+{
+ EC_INIT;
+ char toc_buf[MAX_SLQ_TOC];
+ int toc_index = 0;
+ int len = 0;
+
+ memcpy(buf, "432130dm", 8);
+ EC_NEG1_LOG( len = sl_pack_loop(query, buf + 16, 0, toc_buf + 8, &toc_index) );
+ SIVAL(buf, 8, len / 8 + 1 + toc_index + 1);
+ SIVAL(buf, 12, len / 8 + 1);
+
+ SLVAL(toc_buf, 0, sl_pack_tag(SQ_TYPE_TOC, toc_index + 1, 0));
+ memcpy(buf + 16 + len, toc_buf, (toc_index + 1 ) * 8);
+
+ len += 16 + (toc_index + 1 ) * 8;
+
+EC_CLEANUP:
+ if (ret != 0)
+ len = -1;
+ return len;
}
/**************************************************************************************************
static int sl_unpack_ints(DALLOC_CTX *query, const char *buf, int offset, uint encoding)
{
- int count, i;
- uint64_t query_data64;
+ int count, i;
+ uint64_t query_data64;
- query_data64 = sl_unpack_uint64(buf, offset, encoding);
- count = query_data64 >> 32;
- offset += 8;
+ query_data64 = sl_unpack_uint64(buf, offset, encoding);
+ count = query_data64 >> 32;
+ offset += 8;
- i = 0;
- while (i++ < count) {
+ i = 0;
+ while (i++ < count) {
query_data64 = sl_unpack_uint64(buf, offset, encoding);
dalloc_add(query, &query_data64, uint64_t);
- offset += 8;
- }
+ offset += 8;
+ }
- return count;
+ return count;
}
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;
+ 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;
- }
+ offset += 8;
+ }
- return count;
+ return count;
}
static int sl_unpack_uuid(DALLOC_CTX *query, const char *buf, int offset, uint encoding)
{
- int count, i;
+ 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;
+ query_data64 = sl_unpack_uint64(buf, offset, encoding);
+ count = query_data64 >> 32;
+ offset += 8;
- i = 0;
- while (i++ < count) {
+ i = 0;
+ while (i++ < count) {
memcpy(uuid.sl_uuid, buf + offset, 16);
dalloc_add(query, &uuid, sl_uuid_t);
- offset += 16;
- }
+ offset += 16;
+ }
- return count;
+ return count;
}
static int sl_unpack_floats(DALLOC_CTX *query, const char *buf, int offset, uint encoding)
{
- int count, i;
- uint64_t query_data64;
- double fval;
+ 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;
+ query_data64 = sl_unpack_uint64(buf, offset, encoding);
+ count = query_data64 >> 32;
+ offset += 8;
- i = 0;
- while (i++ < count) {
+ i = 0;
+ while (i++ < count) {
if (encoding == SL_ENC_LITTLE_ENDIAN) {
#ifdef WORDS_BIGENDIAN
ieee_fp_union.w[0] = IVAL(buf, offset + 4);
#endif
}
dalloc_add(query, &ieee_fp_union.d, double);
- offset += 8;
- }
+ offset += 8;
+ }
- return count;
+ return count;
}
static int sl_unpack_CNID(DALLOC_CTX *query, const char *buf, int offset, int length, uint encoding)
{
EC_INIT;
- int count;
- uint64_t query_data64;
+ int count;
+ uint64_t query_data64;
sl_cnids_t cnids;
EC_NULL( cnids.ca_cnids = talloc_zero(query, DALLOC_CTX) );
/* that's permitted, it's an empty array */
goto EC_CLEANUP;
- query_data64 = sl_unpack_uint64(buf, offset, encoding);
- count = query_data64 & 0xffff;
+ query_data64 = sl_unpack_uint64(buf, offset, encoding);
+ count = query_data64 & 0xffff;
- cnids.ca_unkn1 = (query_data64 & 0xffff0000) >> 16;
- cnids.ca_unkn2 = query_data64 >> 32;
+ cnids.ca_unkn1 = (query_data64 & 0xffff0000) >> 16;
+ cnids.ca_context = query_data64 >> 32;
- offset += 8;
+ offset += 8;
- while (count --) {
- query_data64 = sl_unpack_uint64(buf, offset, encoding);
+ while (count --) {
+ query_data64 = sl_unpack_uint64(buf, offset, encoding);
dalloc_add(cnids.ca_cnids, &query_data64, uint64_t);
- offset += 8;
- }
+ offset += 8;
+ }
dalloc_add(query, &cnids, sl_cnids_t);
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";
- }
+ 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";
- }
+ 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 uint encoding)
{
EC_INIT;
- int i, toc_index, query_length;
+ 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;
+ 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)
+ 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;
+ 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: {
+ 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: {
+ 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;
} /* switch (cpx_query_type) */
- count--;
- break;
+ count--;
+ break;
case SQ_TYPE_NULL: {
subcount = query_data64 >> 32;
if (ret != 0) {
offset = -1;
}
- return offset;
+ return offset;
}
static int dissect_spotlight(DALLOC_CTX *query, const char *buf)
{
EC_INIT;
- int encoding, i, toc_entries;
- uint64_t toc_offset, tquerylen, toc_entry;
+ 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;
+ if (strncmp(buf, "md031234", 8) == 0)
+ encoding = SL_ENC_BIG_ENDIAN;
+ else
+ encoding = SL_ENC_LITTLE_ENDIAN;
- buf += 8;
+ buf += 8;
- toc_offset = ((sl_unpack_uint64(buf, 0, encoding) >> 32) - 1 ) * 8;
- if (toc_offset < 0 || (toc_offset > 65000)) {
+ toc_offset = ((sl_unpack_uint64(buf, 0, encoding) >> 32) - 1 ) * 8;
+ if (toc_offset < 0 || (toc_offset > 65000)) {
EC_FAIL;
- }
+ }
- buf += 8;
+ buf += 8;
- toc_entries = (int)(sl_unpack_uint64(buf, toc_offset, encoding) & 0xffff);
+ toc_entries = (int)(sl_unpack_uint64(buf, toc_offset, encoding) & 0xffff);
- EC_NEG1( spotlight_dissect_loop(query, buf, 0, 1, toc_offset + 8, encoding) );
+ EC_NEG1( spotlight_dissect_loop(query, buf, 0, 1, toc_offset + 8, encoding) );
EC_CLEANUP:
EC_EXIT;
/* IVAL(ibuf, 10: unknown, always 0x00000000 */
- switch (cmd) {
+ switch (cmd) {
- case SPOTLIGHT_CMD_VOLPATH: {
+ case SPOTLIGHT_CMD_VOLPATH: {
RSIVAL(rbuf, 0, ntohs(vid));
RSIVAL(rbuf, 4, 0);
int len = strlen(vol->v_path) + 1;
strncpy(rbuf + 8, vol->v_path, len);
*rbuflen += 8 + len;
- break;
+ break;
}
- case SPOTLIGHT_CMD_FLAGS:
+ case SPOTLIGHT_CMD_FLAGS:
RSIVAL(rbuf, 0, 0x0100006b); /* Whatever this value means... flags? */
*rbuflen += 4;
- break;
+ break;
- case SPOTLIGHT_CMD_RPC: {
+ case SPOTLIGHT_CMD_RPC: {
DALLOC_CTX *query;
EC_NULL( query = talloc_zero(tmp_ctx, DALLOC_CTX) );
(void)dissect_spotlight(query, ibuf + 22);
dd_dump(query, 0);
- break;
+ break;
+ }
}
- }
EC_CLEANUP:
talloc_free(tmp_ctx);
EC_NULL( query = talloc_zero(mem_ctx, DALLOC_CTX) );
- EC_NEG1_LOG( fd = open("/home/ralph/netatalk/spot/etc/afpd/spotlight-packet2.bin", O_RDONLY) );
+ EC_NEG1_LOG( fd = open("test.bin", O_RDONLY) );
EC_NEG1_LOG( len = read(fd, ibuf, 8192) );
+ close(fd);
EC_NEG1_LOG( dissect_spotlight(query, ibuf + 24) );
/* Now dump the whole thing */
dd_dump(query, 0);
+ 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);
+
EC_CLEANUP:
if (mem_ctx) {
talloc_free(mem_ctx);