From 7b663e9474d71361433f3794073ca68bf8e5f4f0 Mon Sep 17 00:00:00 2001
From: Yang Gu <yang.gu@intel.com>
Date: Fri, 5 Mar 2010 12:43:34 +0800
Subject: [PATCH] Add parser for subaddress objects

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

diff --git a/src/stkutil.c b/src/stkutil.c
index 22bef306..0c49ff99 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -89,6 +89,30 @@ static gboolean parse_dataobj_alpha_identifier(
 	return TRUE;
 }
 
+/* Defined in TS 102.223 Section 8.3 */
+static gboolean parse_dataobj_subaddress(
+		struct comprehension_tlv_iter *iter, void *user)
+{
+	struct stk_subaddress *subaddr = user;
+	const unsigned char *data;
+	unsigned int len;
+
+	if (comprehension_tlv_iter_get_tag(iter) !=
+			STK_DATA_OBJECT_TYPE_SUBADDRESS)
+		return FALSE;
+
+	len = comprehension_tlv_iter_get_length(iter);
+	if (len < 1)
+		return FALSE;
+
+	data = comprehension_tlv_iter_get_data(iter);
+	subaddr->subaddr_len = len;
+	subaddr->subaddr = g_malloc(len);
+	memcpy(subaddr->subaddr, data, len);
+
+	return TRUE;
+}
+
 /* Described in TS 102.223 Section 8.8 */
 static gboolean parse_dataobj_duration(struct comprehension_tlv_iter *iter,
 					void *user)
@@ -305,6 +329,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type)
 		return parse_dataobj_address;
 	case STK_DATA_OBJECT_TYPE_ALPHA_IDENTIFIER:
 		return parse_dataobj_alpha_identifier;
+	case STK_DATA_OBJECT_TYPE_SUBADDRESS:
+		return parse_dataobj_subaddress;
 	case STK_DATA_OBJECT_TYPE_DURATION:
 		return parse_dataobj_duration;
 	case STK_DATA_OBJECT_TYPE_RESPONSE_LENGTH:
diff --git a/src/stkutil.h b/src/stkutil.h
index 4576ddda..544d1048 100644
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -199,6 +199,12 @@ struct stk_address {
 	char *number;
 };
 
+/* Defined in TS 102.223 Section 8.3 */
+struct stk_subaddress {
+	unsigned int subaddr_len;
+	unsigned char *subaddr;
+};
+
 /*
  * Icon ID denotes a file on the SIM filesystem.  Since EF cannot have record
  * ids of 0, we use icon_id with 0 to denote empty icon_identifier objects