diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2010-06-21 12:48:55 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2010-06-21 15:21:40 -0500 |
| commit | 5aa88414403ebcef6e1e8e8266d180b6ce1cc1f8 (patch) | |
| tree | 7bd7e04224a42302605c53e277cc601ecc4e7f6f /src | |
| parent | 36bcae5ff19d6831b1c5d0a612fd893cad49d9d2 (diff) | |
| download | ofono-5aa88414403ebcef6e1e8e8266d180b6ce1cc1f8.tar.bz2 | |
smsutil: Take ton_npi into account in sr assembly
Diffstat (limited to 'src')
| -rw-r--r-- | src/smsutil.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/smsutil.c b/src/smsutil.c index e4c0a64f..f9e1615a 100644 --- a/src/smsutil.c +++ b/src/smsutil.c @@ -2674,6 +2674,7 @@ gboolean status_report_assembly_report(struct status_report_assembly *assembly, unsigned int offset = status_report->status_report.mr / 32; unsigned int bit = 1 << (status_report->status_report.mr % 32); struct id_table_node *node = NULL; + const char *straddr; GHashTable *id_table; gpointer key, value; gboolean delivered; @@ -2686,8 +2687,8 @@ gboolean status_report_assembly_report(struct status_report_assembly *assembly, &delivered) == FALSE) return FALSE; - id_table = g_hash_table_lookup(assembly->assembly_table, - status_report->status_report.raddr.address); + straddr = sms_address_to_string(&status_report->status_report.raddr); + id_table = g_hash_table_lookup(assembly->assembly_table, straddr); /* key (receiver address) does not exist in assembly */ if (id_table == NULL) @@ -2754,26 +2755,18 @@ void status_report_assembly_add_fragment( unsigned int bit = 1 << (mr % 32); GHashTable *id_table; struct id_table_node *node; - char *assembly_table_key; unsigned int *id_table_key; - id_table = g_hash_table_lookup(assembly->assembly_table, to->address); + id_table = g_hash_table_lookup(assembly->assembly_table, + sms_address_to_string(to)); /* Create hashtable keyed by the to address if required */ if (id_table == NULL) { id_table = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free); - assembly_table_key = g_try_malloc(sizeof(to->address)); - - if (assembly_table_key == NULL) { - g_hash_table_destroy(id_table); - return; - } - - g_strlcpy(assembly_table_key, to->address, sizeof(to->address)); - g_hash_table_insert(assembly->assembly_table, - assembly_table_key, id_table); + g_strdup(sms_address_to_string(to)), + id_table); } node = g_hash_table_lookup(id_table, &msg_id); |