From 150e5f3f66301b92425fc73bba2af87970c2e5f6 Mon Sep 17 00:00:00 2001 From: Yang Gu Date: Thu, 22 Apr 2010 23:12:20 +0800 Subject: [PATCH] stkutil: Add parser for frames information objects --- src/stkutil.c | 31 +++++++++++++++++++++++++++++++ src/stkutil.h | 12 ++++++++++++ 2 files changed, 43 insertions(+) diff --git a/src/stkutil.c b/src/stkutil.c index fab60a98..f2b4fba4 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -1602,6 +1602,35 @@ static gboolean parse_dataobj_frame_layout(struct comprehension_tlv_iter *iter, return TRUE; } +/* Defined in TS 102.223 Section 8.79 */ +static gboolean parse_dataobj_frames_info(struct comprehension_tlv_iter *iter, + void *user) +{ + struct stk_frames_info *fi = user; + const unsigned char *data; + unsigned char len = comprehension_tlv_iter_get_length(iter); + + if (len < 1) + return FALSE; + + data = comprehension_tlv_iter_get_data(iter); + + if (data[0] > 0x0f) + return FALSE; + + if ((len == 1 && data[0] != 0) || (len > 1 && data[0] == 0)) + return FALSE; + + if (len == 1) + return TRUE; + + fi->id = data[0]; + fi->len = len - 1; + memcpy(fi->list, data + 1, fi->len); + + return TRUE; +} + /* Defined in TS 102.223 Section 8.80 */ static gboolean parse_dataobj_frame_id(struct comprehension_tlv_iter *iter, void *user) @@ -1767,6 +1796,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type) return parse_dataobj_browsing_status; case STK_DATA_OBJECT_TYPE_FRAME_LAYOUT: return parse_dataobj_frame_layout; + case STK_DATA_OBJECT_TYPE_FRAMES_INFO: + return parse_dataobj_frames_info; case STK_DATA_OBJECT_TYPE_FRAME_ID: return parse_dataobj_frame_id; default: diff --git a/src/stkutil.h b/src/stkutil.h index 52b62af4..c2579dc6 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -709,6 +709,18 @@ struct stk_frame_layout { unsigned int len; }; +/* + * According to 102.223 Section 8.79 the length of CTLV is 1 byte. This means + * that the maximum length is 127 bytes for the total length of default frame + * id and frame information list. Thus the maximum length of frame information + * list is 126 bytes. + */ +struct stk_frames_info { + unsigned char id; + unsigned char list[126]; + unsigned int len; +}; + struct stk_command_display_text { char *text; struct stk_icon_id icon_id;