---
src/stkutil.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
src/stkutil.h | 11 +++++
2 files changed, 132 insertions(+), 12 deletions(-)
diff --git a/src/stkutil.c b/src/stkutil.c
index 2074d19..45bb285 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -281,8 +281,9 @@ static gboolean parse_dataobj_alpha_id(struct
comprehension_tlv_iter *iter,
char *utf8;
len = comprehension_tlv_iter_get_length(iter);
- if (len < 1)
- return FALSE;
+
+ if (len == 0)
+ return TRUE;
data = comprehension_tlv_iter_get_data(iter);
utf8 = sim_string_to_utf8(data, len);
@@ -373,8 +374,10 @@ static gboolean parse_dataobj_item(struct
comprehension_tlv_iter *iter,
char *utf8;
len = comprehension_tlv_iter_get_length(iter);
- if (len < 2)
- return FALSE;
+
+ if (len == 0)
+ return TRUE;
+
data = comprehension_tlv_iter_get_data(iter);
@@ -2006,6 +2009,7 @@ static gboolean parse_dataobj(struct
comprehension_tlv_iter *iter,
GSList *l;
va_list args;
gboolean minimum_set = TRUE;
+ GSList **list = NULL;
va_start(args, type);
@@ -2022,29 +2026,74 @@ static gboolean parse_dataobj(struct
comprehension_tlv_iter *iter,
entries = g_slist_prepend(entries, entry);
}
-
if (comprehension_tlv_iter_next(iter) != TRUE)
goto out;
entries = g_slist_reverse(entries);
- for (l = entries; l; l = l->next) {
+ for (l = entries; l;) {
dataobj_handler handler;
struct dataobj_handler_entry *entry = l->data;
+ unsigned short tag;
+ gboolean ret;
+ void *dataobj;
handler = handler_for_type(entry->type);
- if (handler == NULL)
+ if (handler == NULL) {
+ l = l->next;
continue;
+ }
- if (comprehension_tlv_iter_get_tag(iter) == entry->type) {
- if (handler(iter, entry->data))
- entry->parsed = TRUE;
- if (comprehension_tlv_iter_next(iter) == FALSE)
- break;
+ tag = comprehension_tlv_iter_get_tag(iter);
+ if (tag != entry->type) {
+ l = l->next;
+ continue;
}
+
+ if (tag == STK_DATA_OBJECT_TYPE_PROVISIONING_FILE_REFERENCE ||
+ tag == STK_DATA_OBJECT_TYPE_ITEM) {
+
+ if (tag == STK_DATA_OBJECT_TYPE_ITEM)
+ dataobj = g_try_new0(struct stk_item, 1);
+ else
+ dataobj = g_try_new0(struct stk_file, 1);
+
+ if (!dataobj)
+ goto out;
+
+ if (!list)
+ list = entry->data;
+
+ ret = handler(iter, dataobj);
+ } else
+ ret = handler(iter, entry->data);
+
+ if (ret)
+ entry->parsed = TRUE;
+
+ if (tag == STK_DATA_OBJECT_TYPE_PROVISIONING_FILE_REFERENCE ||
+ tag == STK_DATA_OBJECT_TYPE_ITEM) {
+
+ if (tag == STK_DATA_OBJECT_TYPE_ITEM) {
+ struct stk_item *item = dataobj;
+ /* either return is FALSE or item is empty */
+ if (item->id == 0)
+ g_free(item);
+ else
+ *list = g_slist_prepend(*list, item);
+ } else
+ *list = g_slist_prepend(*list, dataobj);
+ } else
+ l = l->next;
+
+ if (comprehension_tlv_iter_next(iter) == FALSE)
+ break;
}
out:
+ if (list)
+ *list = g_slist_reverse(*list);
+
for (l = entries; l; l = l->next) {
struct dataobj_handler_entry *entry = l->data;
@@ -2254,6 +2303,63 @@ static gboolean parse_poll_interval(struct stk_command
*command,
return TRUE;
}
+static void destroy_stk_item(struct stk_item *item)
+{
+ g_free(item->text);
+ g_free(item);
+}
+
+static void destroy_setup_menu(struct stk_command *command)
+{
+ g_free(command->setup_menu.alpha_id);
+ g_slist_foreach(command->setup_menu.items,
+ (GFunc)destroy_stk_item, NULL);
+ g_slist_free(command->setup_menu.items);
+}
+
+static gboolean parse_setup_menu(struct stk_command *command,
+ struct comprehension_tlv_iter *iter)
+{
+ struct stk_command_setup_menu *obj = &command->setup_menu;
+ gboolean ret;
+
+ if (command->src != STK_DEVICE_IDENTITY_TYPE_UICC)
+ goto error;
+
+ if (command->dst != STK_DEVICE_IDENTITY_TYPE_TERMINAL)
+ goto error;
+
+ ret = parse_dataobj(iter,
+ STK_DATA_OBJECT_TYPE_ALPHA_ID,
+ DATAOBJ_FLAG_MANDATORY | DATAOBJ_FLAG_MINIMUM,
+ &obj->alpha_id,
+ STK_DATA_OBJECT_TYPE_ITEM,
+ DATAOBJ_FLAG_MANDATORY | DATAOBJ_FLAG_MINIMUM,
+ &obj->items,
+ STK_DATA_OBJECT_TYPE_ITEMS_NEXT_ACTION_INDICATOR, 0,
+ &obj->next_act,
+ STK_DATA_OBJECT_TYPE_ICON_ID, 0,
+ &obj->icon_id,
+ STK_DATA_OBJECT_TYPE_ITEM_ICON_ID_LIST, 0,
+ &obj->item_icon_id_list,
+ STK_DATA_OBJECT_TYPE_TEXT_ATTRIBUTE, 0,
+ &obj->text_attr,
+ STK_DATA_OBJECT_TYPE_ITEM_TEXT_ATTRIBUTE_LIST, 0,
+ &obj->item_text_attr_list,
+ STK_DATA_OBJECT_TYPE_INVALID);
+
+ if (ret == FALSE)
+ goto error;
+
+ command->destructor = destroy_setup_menu;
+
+ return TRUE;
+
+error:
+ destroy_setup_menu(command);
+ return FALSE;
+}
+
static void destroy_send_sms(struct stk_command *command)
{
g_free(command->send_sms.alpha_id);
@@ -2377,6 +2483,9 @@ struct stk_command *stk_command_new_from_pdu(const
unsigned char *pdu,
case STK_COMMAND_TYPE_POLL_INTERVAL:
ok = parse_poll_interval(command, &iter);
break;
+ case STK_COMMAND_TYPE_SETUP_MENU:
+ ok = parse_setup_menu(command, &iter);
+ break;
case STK_COMMAND_TYPE_SEND_SMS:
ok = parse_send_sms(command, &iter);
break;
diff --git a/src/stkutil.h b/src/stkutil.h
index dc25f99..d91ac66 100644
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -824,6 +824,16 @@ struct stk_command_play_tone {
struct stk_frame_id frame_id;
};
+struct stk_command_setup_menu {
+ char *alpha_id;
+ GSList *items;
+ struct stk_items_next_action_indicator next_act;
+ struct stk_icon_id icon_id;
+ struct stk_item_icon_id_list item_icon_id_list;
+ struct stk_text_attribute text_attr;
+ struct stk_item_text_attribute_list item_text_attr_list;
+};
+
struct stk_command_send_sms {
char *alpha_id;
struct stk_address address;
@@ -846,6 +856,7 @@ struct stk_command {
struct stk_command_get_inkey get_inkey;
struct stk_command_get_input get_input;
struct stk_command_play_tone play_tone;
+ struct stk_command_setup_menu setup_menu;
struct stk_command_send_sms send_sms;
};
--
1.7.0.4
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
