From f4f6284f2663e72bc68c603f85842b621cfb2307 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Mon, 1 Mar 2010 17:10:56 -0600 Subject: [PATCH] Add parser for Frame Identifier object --- src/stkutil.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/stkutil.c b/src/stkutil.c index 5322f083..cdb1f3c8 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -202,6 +202,30 @@ static gboolean parse_dataobj_text_attr(struct comprehension_tlv_iter *iter, return TRUE; } +/* Defined in TS 102.223 Section 8.80 */ +static gboolean parse_dataobj_frame_id(struct comprehension_tlv_iter *iter, + void *user) +{ + unsigned char *frame_id = user; + const unsigned char *data; + + if (comprehension_tlv_iter_get_tag(iter) != + STK_DATA_OBJECT_TYPE_FRAME_ID) + return FALSE; + + if (comprehension_tlv_iter_get_length(iter) != 1) + return FALSE; + + data = comprehension_tlv_iter_get_data(iter); + + if (data[0] >= 0x10) + return FALSE; + + *frame_id = data[0]; + + return TRUE; +} + static dataobj_handler handler_for_type(enum stk_data_object_type type) { switch (type) { @@ -215,6 +239,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type) return parse_dataobj_duration; case STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE: return parse_dataobj_text_attr; + case STK_DATA_OBJECT_TYPE_FRAME_ID: + return parse_dataobj_frame_id; default: return NULL; }; @@ -287,6 +313,8 @@ static gboolean parse_display_text(struct stk_command *command, { gboolean ret; + command->display_text.frame_id = 0xFF; + ret = parse_dataobj(iter, STK_DATA_OBJECT_TYPE_TEXT, DATAOBJ_FLAG_MANDATORY | DATAOBJ_FLAG_MINIMUM, &command->display_text.text, @@ -298,6 +326,8 @@ static gboolean parse_display_text(struct stk_command *command, &command->display_text.duration, STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0, &command->display_text.text_attribute, + STK_DATA_OBJECT_TYPE_FRAME_ID, 0, + &command->display_text.frame_id, STK_DATA_OBJECT_TYPE_INVALID); if (ret == FALSE)