From 515eef4db0fd0f62f5398d663761d92d81ae3f52 Mon Sep 17 00:00:00 2001 From: Yang Gu Date: Wed, 21 Apr 2010 12:55:48 +0800 Subject: [PATCH] Add parser for device filter objects --- src/stkutil.c | 29 +++++++++++++++++++++++++++++ src/stkutil.h | 7 +++++++ 2 files changed, 36 insertions(+) diff --git a/src/stkutil.c b/src/stkutil.c index 0e0135f1..d6c7235a 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -1299,6 +1299,33 @@ static gboolean parse_dataobj_service_record( return TRUE; } +/* Defined in TS 102.223 Section 8.64 */ +static gboolean parse_dataobj_device_filter(struct comprehension_tlv_iter *iter, + void *user) +{ + struct stk_device_filter *df = 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); + df->tech_id = data[0]; + df->len = len - 1; + + df->dev_filter = g_try_malloc(df->len); + if (df->dev_filter == NULL) + return FALSE; + + memcpy(df->dev_filter, data + 1, df->len); + + return TRUE; +} + /* Defined in TS 102.223 Section 8.72 */ static gboolean parse_dataobj_text_attr(struct comprehension_tlv_iter *iter, void *user) @@ -1455,6 +1482,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type) return parse_dataobj_display_parameters; case STK_DATA_OBJECT_TYPE_SERVICE_RECORD: return parse_dataobj_service_record; + case STK_DATA_OBJECT_TYPE_DEVICE_FILTER: + return parse_dataobj_device_filter; 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 581d9476..cc2915dd 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -622,6 +622,13 @@ struct stk_service_record { unsigned int len; }; +/* Defined in TS 102.223 Section 8.64 */ +struct stk_device_filter { + unsigned char tech_id; + unsigned char *dev_filter; + 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