Refactor: stk address structure

diff --git a/src/stkutil.c b/src/stkutil.c
index 677860b..a270282 100644 (file)
--- 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 1b3c1de..7acf3fa 100644 (file)
--- 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;
 };