---
src/simutil.c | 12 +++++
src/simutil.h | 3 +
src/stkutil.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
src/stkutil.h | 11 +++++
4 files changed, 160 insertions(+), 4 deletions(-)
diff --git a/src/simutil.c b/src/simutil.c
index 941c551..b98c011 100644
--- a/src/simutil.c
+++ b/src/simutil.c
@@ -307,6 +307,18 @@ const unsigned char *comprehension_tlv_iter_get_data(
return iter->data;
}
+void comprehension_tlv_iter_copy(struct comprehension_tlv_iter *from,
+ struct comprehension_tlv_iter *to)
+{
+ to->max = from->max;
+ to->pos = from->pos;
+ to->pdu = from->pdu;
+ to->tag = from->tag;
+ to->cr = from->cr;
+ to->len = from->len;
+ to->data = from->data;
+}
+
void ber_tlv_iter_init(struct ber_tlv_iter *iter, const unsigned char *pdu,
unsigned int len)
{
diff --git a/src/simutil.h b/src/simutil.h
index 7590cca..45b6847 100644
--- a/src/simutil.h
+++ b/src/simutil.h
@@ -132,6 +132,9 @@ unsigned int comprehension_tlv_iter_get_length(
const unsigned char *comprehension_tlv_iter_get_data(
struct comprehension_tlv_iter *iter);
+void comprehension_tlv_iter_copy(struct comprehension_tlv_iter *from,
+ struct comprehension_tlv_iter *to);
+
void ber_tlv_iter_init(struct ber_tlv_iter *iter, const unsigned char *pdu,
unsigned int len);
/*
diff --git a/src/stkutil.c b/src/stkutil.c
index 46f4796..1698321 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -281,8 +281,8 @@ 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,7 +373,11 @@ static gboolean parse_dataobj_item(struct
comprehension_tlv_iter *iter,
char *utf8;
len = comprehension_tlv_iter_get_length(iter);
- if (len < 2)
+
+ if (len == 0)
+ return TRUE;
+
+ if (len == 1)
return FALSE;
data = comprehension_tlv_iter_get_data(iter);
@@ -2022,7 +2026,6 @@ static gboolean parse_dataobj(struct
comprehension_tlv_iter *iter,
entries = g_slist_prepend(entries, entry);
}
-
if (comprehension_tlv_iter_next(iter) != TRUE)
goto out;
@@ -2039,6 +2042,10 @@ static gboolean parse_dataobj(struct
comprehension_tlv_iter *iter,
if (comprehension_tlv_iter_get_tag(iter) == entry->type) {
if (handler(iter, entry->data))
entry->parsed = TRUE;
+
+ if (l->next == NULL)
+ break;
+
if (comprehension_tlv_iter_next(iter) == FALSE)
break;
}
@@ -2255,6 +2262,126 @@ 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_list(struct comprehension_tlv_iter *iter,
+ enum stk_data_object_type type, int flags, GSList **list)
+{
+ struct comprehension_tlv_iter iter_old;
+ void *dataobj;
+ gboolean has_obj = FALSE;
+ dataobj_handler handler = handler_for_type(type);
+ gboolean ret;
+
+ if ((type != STK_DATA_OBJECT_TYPE_ITEM) && (type !=
+ STK_DATA_OBJECT_TYPE_PROVISIONING_FILE_REFERENCE))
+ return FALSE;
+
+ comprehension_tlv_iter_copy(iter, &iter_old);
+
+ while (comprehension_tlv_iter_next(iter)) {
+ if (comprehension_tlv_iter_get_tag(iter) != type)
+ break;
+
+ comprehension_tlv_iter_copy(iter, &iter_old);
+
+ if (type == 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;
+
+ ret = handler(iter, dataobj);
+ has_obj |= ret;
+
+ if (type == STK_DATA_OBJECT_TYPE_ITEM) {
+ struct stk_item *item = dataobj;
+
+ /* either return is FALSE or item is empty */
+ if (item->id == 0)
+ g_free(dataobj);
+ else
+ *list = g_slist_prepend(*list, dataobj);
+ } else
+ *list = g_slist_prepend(*list, dataobj);
+ }
+
+ comprehension_tlv_iter_copy(&iter_old, iter);
+out:
+ if ((flags & DATAOBJ_FLAG_MANDATORY) && !has_obj)
+ return FALSE;
+
+ *list = g_slist_reverse(*list);
+
+ return TRUE;
+}
+
+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_INVALID);
+
+ if (ret == FALSE)
+ goto error;
+
+ ret = parse_list(iter, STK_DATA_OBJECT_TYPE_ITEM,
+ DATAOBJ_FLAG_MANDATORY, &obj->items);
+
+ if (ret == FALSE)
+ goto error;
+
+ ret = parse_dataobj(iter,
+ 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);
@@ -2386,6 +2513,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 02451b4..e22292b 100644
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -828,6 +828,16 @@ struct stk_command_poll_interval {
struct stk_duration duration;
};
+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;
@@ -852,6 +862,7 @@ struct stk_command {
struct stk_command_play_tone play_tone;
struct stk_command_send_sms send_sms;
struct stk_command_poll_interval poll_interval;
+ struct stk_command_setup_menu setup_menu;
};
void (*destructor)(struct stk_command *command);
--
1.7.0.4
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
