From 08faed228763cb306440261a5781f37d470036f3 Mon Sep 17 00:00:00 2001
From: Yang Gu <yang.gu@intel.com>
Date: Fri, 5 Mar 2010 13:40:40 +0800
Subject: [PATCH] Add parser for item objects

---
 src/stkutil.c | 25 +++++++++++++++++++++++++
 src/stkutil.h |  6 ++++++
 2 files changed, 31 insertions(+)

diff --git a/src/stkutil.c b/src/stkutil.c
index 50730cdf..60def8a3 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -165,6 +165,29 @@ static gboolean parse_dataobj_duration(struct comprehension_tlv_iter *iter,
 	return TRUE;
 }
 
+/* Defined in TS 102.223 Section 8.9 */
+static gboolean parse_dataobj_item(
+		struct comprehension_tlv_iter *iter, void *user)
+{
+	struct stk_item *item = user;
+	const unsigned char *data;
+	unsigned int len;
+
+	if (comprehension_tlv_iter_get_tag(iter) !=
+			STK_DATA_OBJECT_TYPE_ITEM)
+		return FALSE;
+
+	len = comprehension_tlv_iter_get_length(iter);
+	if (len < 2)
+		return FALSE;
+
+	data = comprehension_tlv_iter_get_data(iter);
+	item->id = data[0];
+	item->text = sim_string_to_utf8(data+1, len-1);
+
+	return TRUE;
+}
+
 /* Defined in TS 102.223 Section 8.11 */
 static gboolean parse_dataobj_response_len(struct comprehension_tlv_iter *iter,
 						void *user)
@@ -359,6 +382,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type)
 		return parse_dataobj_capability_configuration_parameters;
 	case STK_DATA_OBJECT_TYPE_DURATION:
 		return parse_dataobj_duration;
+	case STK_DATA_OBJECT_TYPE_ITEM:
+		return parse_dataobj_item;
 	case STK_DATA_OBJECT_TYPE_RESPONSE_LENGTH:
 		return parse_dataobj_response_len;
 	case STK_DATA_OBJECT_TYPE_TEXT:
diff --git a/src/stkutil.h b/src/stkutil.h
index e72b70df..63f4eecb 100644
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -229,6 +229,12 @@ struct stk_duration {
 	unsigned char interval;
 };
 
+/* Defined in TS 102.223 Section 8.9 */
+struct stk_item {
+	unsigned char id;
+	char *text;
+};
+
 /*
  * 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