Move utility to its own file

4 files changed, 89 insertions, 39 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index baa58b70..2fb3f063 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,7 @@ ofonod_SOURCES = main.c ofono.h log.c plugin.c \
 		network.c voicecall.c ussd.h ussd.c sms.c \
 		call-settings.c call-forwarding.c call-meter.c \
 		smsutil.h smsutil.c cssn.h cssn.c call-barring.c sim.h sim.c \
-		phonebook.c history.c
+		phonebook.c history.c simutil.h simutil.c
 
 ofonod_LDADD = $(top_builddir)/plugins/libbuiltin.la \
 		$(top_builddir)/drivers/libbuiltin.la \
diff --git a/src/sim.c b/src/sim.c
index beba0fcf..6af44a89 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -92,44 +92,6 @@ static char **get_own_numbers(GSList *own_numbers)
 	return ret;
 }
 
-/* Parse ASN.1 Basic Encoding Rules TLVs per ISO/IEC 7816 */
-static const guint8 *ber_tlv_find_by_tag(const guint8 *pdu, guint8 in_tag,
-						int in_len, int *out_len)
-{
-	guint8 tag;
-	int len;
-	const guint8 *end = pdu + in_len;
-
-	do {
-		while (pdu < end && (*pdu == 0x00 || *pdu == 0xff))
-			pdu ++;
-		if (pdu == end)
-			break;
-
-		tag = *pdu ++;
-		if (!(0x1f & ~tag))
-			while (pdu < end && (*pdu ++ & 0x80));
-		if (pdu == end)
-			break;
-
-		for (len = 0; pdu + 1 < end && (*pdu & 0x80);
-				len = (len | (*pdu ++ & 0x7f)) << 7);
-		if (*pdu & 0x80)
-			break;
-		len |= *pdu ++;
-
-		if (tag == in_tag && pdu + len <= end) {
-			if (out_len)
-				*out_len = len;
-			return pdu;
-		}
-
-		pdu += len;
-	} while (pdu < end);
-
-	return NULL;
-}
-
 struct pnn_operator {
 	char *longname;
 	char *shortname;
diff --git a/src/simutil.c b/src/simutil.c
new file mode 100644
index 00000000..e4fbd9b7
--- /dev/null
+++ b/src/simutil.c
@@ -0,0 +1,66 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+
+#include "simutil.h"
+
+/* Parse ASN.1 Basic Encoding Rules TLVs per ISO/IEC 7816 */
+const guint8 *ber_tlv_find_by_tag(const guint8 *pdu, guint8 in_tag,
+					int in_len, int *out_len)
+{
+	guint8 tag;
+	int len;
+	const guint8 *end = pdu + in_len;
+
+	do {
+		while (pdu < end && (*pdu == 0x00 || *pdu == 0xff))
+			pdu ++;
+		if (pdu == end)
+			break;
+
+		tag = *pdu ++;
+		if (!(0x1f & ~tag))
+			while (pdu < end && (*pdu ++ & 0x80));
+		if (pdu == end)
+			break;
+
+		for (len = 0; pdu + 1 < end && (*pdu & 0x80);
+				len = (len | (*pdu ++ & 0x7f)) << 7);
+		if (*pdu & 0x80)
+			break;
+		len |= *pdu ++;
+
+		if (tag == in_tag && pdu + len <= end) {
+			if (out_len)
+				*out_len = len;
+			return pdu;
+		}
+
+		pdu += len;
+	} while (pdu < end);
+
+	return NULL;
+}
diff --git a/src/simutil.h b/src/simutil.h
new file mode 100644
index 00000000..ebbf1e5a
--- /dev/null
+++ b/src/simutil.h
@@ -0,0 +1,22 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+const guint8 *ber_tlv_find_by_tag(const guint8 *pdu, guint8 in_tag,
+					int in_len, int *out_len);