[PATCH 3/4] Add parser for file list objects

--- src/stkutil.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/stkutil.h | 6 ++++++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/src/stkutil.c b/src/stkutil.c index ceba2d5..9f3bc0b 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -406,6 +406,46 @@ static gboolean parse_dataobj_tone(struct comprehension_tlv_iter *iter, return TRUE; } +/* Defined in TS 102.223 Section 8.18 */ +static gboolean parse_dataobj_file_list(struct comprehension_tlv_iter *iter, + void *user) +{ + GSList **fl = user; + const unsigned char *data; + unsigned int len; + unsigned int i; + unsigned int start = 1; + struct stk_file *sf; + + if (comprehension_tlv_iter_get_tag(iter) != + STK_DATA_OBJECT_TYPE_FILE_LIST) + return FALSE; + + len = comprehension_tlv_iter_get_length(iter); + if (len < 5) + return FALSE; + + data = comprehension_tlv_iter_get_data(iter); + + if (data[start] != 0x3f) + return FALSE; + + for (i = start + 4; i <= len; i += 2) { + if ((data[i] == 0x3f) || (i == len)) { + sf = g_new0(struct stk_file, 1); + sf->file = g_malloc(i-start); + memcpy(sf->file, data+start, i-start); + sf->len = i - start; + *fl = g_slist_prepend(*fl, sf); + start = i; + } + } + + *fl = g_slist_reverse(*fl); + + return TRUE; +} + /* Defined in TS 102.223 Section 8.31 */ static gboolean parse_dataobj_icon_id(struct comprehension_tlv_iter *iter, void *user) @@ -523,6 +563,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type) return parse_dataobj_text; case STK_DATA_OBJECT_TYPE_TONE: return parse_dataobj_tone; + case STK_DATA_OBJECT_TYPE_FILE_LIST: + return parse_dataobj_file_list; case STK_DATA_OBJECT_TYPE_ICON_ID: return parse_dataobj_icon_id; case STK_DATA_OBJECT_TYPE_IMMEDIATE_RESPONSE: diff --git a/src/stkutil.h b/src/stkutil.h index b408f38..5b1a44b 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -345,6 +345,12 @@ struct stk_result { unsigned char *additional; }; +/* Define the struct of single file in TS102.223 Section 8.18 */ +struct stk_file { + unsigned char *file; + 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 -- 1.6.3.3