From a60ae2b7baeaa5127c7a909035f4fd85f59c68cb Mon Sep 17 00:00:00 2001 From: Yang Gu Date: Wed, 31 Mar 2010 17:16:54 +0800 Subject: [PATCH] Add parser for items next action indicator objects --- src/stkutil.c | 20 ++++++++++++++++++++ src/stkutil.h | 9 +++++++++ 2 files changed, 29 insertions(+) diff --git a/src/stkutil.c b/src/stkutil.c index c737395e..37db3c32 100644 --- a/src/stkutil.c +++ b/src/stkutil.c @@ -592,6 +592,24 @@ static gboolean parse_dataobj_default_text(struct comprehension_tlv_iter *iter, return TRUE; } +/* Defined in TS 102.223 Section 8.24 */ +static gboolean parse_dataobj_items_next_action_indicator( + struct comprehension_tlv_iter *iter, void *user) +{ + struct stk_items_next_action_indicator *inai = user; + const unsigned char *data; + unsigned int len = comprehension_tlv_iter_get_length(iter); + + if ((len < 1) || (len > sizeof(inai->list))) + return FALSE; + + data = comprehension_tlv_iter_get_data(iter); + inai->len = len; + memcpy(inai->list, data, len); + + return TRUE; +} + /* Defined in TS 102.223 Section 8.31 */ static gboolean parse_dataobj_icon_id(struct comprehension_tlv_iter *iter, void *user) @@ -698,6 +716,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type) return parse_dataobj_network_measurement_results; case STK_DATA_OBJECT_TYPE_DEFAULT_TEXT: return parse_dataobj_default_text; + case STK_DATA_OBJECT_TYPE_ITEMS_NEXT_ACTION_INDICATOR: + return parse_dataobj_items_next_action_indicator; 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 b0b09df3..fb7a2d06 100644 --- a/src/stkutil.h +++ b/src/stkutil.h @@ -360,6 +360,15 @@ struct stk_location_info { unsigned short ext_ci; }; +/* + * According to 102.223 Section 8.24 the length of CTLV is 1 byte. This means + * that the maximum size is 127 according to the rules of CTLVs. + */ +struct stk_items_next_action_indicator { + unsigned char list[127]; + unsigned int len; +}; + /* * Defined in TS 102.223 Section 8.31 * Icon ID denotes a file on the SIM filesystem. Since EF cannot have record