From 1dfb59b6102511536c79220c610c016d53897602 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Wed, 10 Mar 2010 13:10:14 -0600
Subject: [PATCH] Refactor: stk address structure

---
 src/stkutil.c | 3 +--
 src/stkutil.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/stkutil.c b/src/stkutil.c
index 677860b1..a2702829 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -59,8 +59,7 @@ static gboolean parse_dataobj_address(struct comprehension_tlv_iter *iter,
 
 	data = comprehension_tlv_iter_get_data(iter);
 
-	addr->ton = (data[0] >> 4) & 0x07;
-	addr->npi = data[0] & 0x0f;
+	addr->ton_npi = data[0];
 	addr->number = g_malloc(len*2-1);
 	extract_bcd_number(data+1, len-1, addr->number);
 
diff --git a/src/stkutil.h b/src/stkutil.h
index 1b3c1de6..7acf3faf 100644
--- a/src/stkutil.h
+++ b/src/stkutil.h
@@ -194,8 +194,7 @@ enum stk_duration_type {
 
 /* Defined in TS 102.223 Section 8.1 */
 struct stk_address {
-	unsigned char ton;
-	unsigned char npi;
+	unsigned char ton_npi;
 	char *number;
 };