From 2c2bcced5e5968d5819a3e8cf9d8225a572a714d Mon Sep 17 00:00:00 2001 From: Yang Gu Date: Wed, 21 Apr 2010 12:55:49 +0800 Subject: Add parser for service search objects --- src/stkutil.c | 29 +++++++++++++++++++++++++++++ src/stkutil.h | 7 +++++++ 2 files changed, 36 insertions(+) (limited to 'src') diff --git a/src/stkutil.c b/src/stkutil.c index 6f302637..acb4737b 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -1329,6 +1329,33 @@ static gboolean parse_dataobj_device_filter(struct comprehension_tlv_iter *iter, return TRUE; } +/* Defined in TS 102.223 Section 8.65 */ +static gboolean parse_dataobj_service_search( + struct comprehension_tlv_iter *iter, void *user) +{ + struct stk_service_search *ss = user; + const unsigned char *data; + unsigned int len = comprehension_tlv_iter_get_length(iter); + + if (len < 1) + return FALSE; + + if (len == 1) + return TRUE; + + data = comprehension_tlv_iter_get_data(iter); + ss->tech_id = data[0]; + ss->len = len - 1; + + ss->ser_search = g_try_malloc(ss->len); + if (ss->ser_search == NULL) + return FALSE; + + memcpy(ss->ser_search, data + 1, ss->len); + + return TRUE; +} + /* Defined in TS 102.223 Section 8.72 */ static gboolean parse_dataobj_text_attr(struct comprehension_tlv_iter *iter, void *user) @@ -1487,6 +1514,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type) return parse_dataobj_service_record; case STK_DATA_OBJECT_TYPE_DEVICE_FILTER: return parse_dataobj_device_filter; + case STK_DATA_OBJECT_TYPE_SERVICE_SEARCH: + return parse_dataobj_service_search; case STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE: return parse_dataobj_text_attr; case STK_DATA_OBJECT_TYPE_FRAME_ID: diff --git a/src/stkutil.h b/src/stkutil.h index cc2915dd..57952ba5 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -629,6 +629,13 @@ struct stk_device_filter { unsigned int len; }; +/* Defined in TS 102.223 Section 8.65 */ +struct stk_service_search { + unsigned char tech_id; + unsigned char *ser_search; + unsigned int len; +}; + /* * According to 102.223 Section 8.72 the length of text attribute CTLV is 1 * byte. This means that the maximum size is 127 according to the rules -- cgit v1.2.3