Based on patch from Kristen Carlson Accardi <kristen(a)linux.intel.com&gt; --- src/sms.c | 16 ++++++++++++++++ src/smsutil.c | 25 +++++++++++++++++++++++++ src/smsutil.h | 3 +++ 3 files changed, 44 insertions(+), 0 deletions(-) diff --git a/src/sms.c b/src/sms.c index 7224bdf..5718bba 100644 --- a/src/sms.c +++ b/src/sms.c @@ -65,6 +65,7 @@ struct ofono_sms { struct sms_assembly *assembly; guint ref; GQueue *txq; + unsigned long tx_counter; guint tx_source; struct ofono_message_waiting *mw; unsigned int mw_watch; @@ -103,6 +104,7 @@ struct tx_queue_entry { ofono_sms_txq_submit_cb_t cb; void *data; ofono_destroy_func destroy; + unsigned long id; }; static gboolean uuid_equal(gconstpointer v1, gconstpointer v2) @@ -1814,6 +1816,8 @@ int __ofono_sms_txq_submit(struct ofono_sms *sms, GSList *list, sms->ref = sms->ref + 1; } + entry->id = sms->tx_counter++; + g_queue_push_tail(sms->txq, entry); if (sms->registered && g_queue_get_length(sms->txq) == 1) @@ -1822,6 +1826,18 @@ int __ofono_sms_txq_submit(struct ofono_sms *sms, GSList *list, if (uuid) memcpy(uuid, &entry->uuid, sizeof(*uuid)); + if (flags & OFONO_SMS_SUBMIT_FLAG_EXPOSE_DBUS) { + int i; + GSList *l; + + for (i = 0, l = list; l; i++, l = l->next) { + struct sms *s = l->data; + + sms_tx_store(sms->imsi, entry->id, entry->flags, + ofono_uuid_to_str(&entry->uuid), s, i); + } + } + if (cb) cb(sms, &entry->uuid, data); diff --git a/src/smsutil.c b/src/smsutil.c index 3a54fe6..248c1ad 100644 --- a/src/smsutil.c +++ b/src/smsutil.c @@ -48,6 +48,10 @@ #define SMS_SR_BACKUP_PATH STORAGEDIR "/%s/sms_sr" #define SMS_SR_BACKUP_PATH_FILE SMS_SR_BACKUP_PATH "/%s-%s" +#define SMS_TX_BACKUP_PATH STORAGEDIR "/%s/tx_queue" +#define SMS_TX_BACKUP_PATH_DIR SMS_TX_BACKUP_PATH "/%lu-%lu-%s" +#define SMS_TX_BACKUP_PATH_FILE SMS_TX_BACKUP_PATH_DIR "/%03i" + #define SMS_ADDR_FMT "%24[0-9A-F]" #define SMS_MSGID_FMT "%40[0-9A-F]" @@ -3143,6 +3147,27 @@ void status_report_assembly_expire(struct status_report_assembly *assembly, } } +gboolean sms_tx_store(const char *imsi, unsigned long id, unsigned long flags, + const char *uuid, struct sms *s, guint8 seq) +{ + int len; + unsigned char buf[177]; + + if (!imsi) + return FALSE; + + len = sms_serialize(buf, s); + + /* + * file name is: imsi/tx_queue/order-flags-uuid/pdu + */ + if (write_file(buf, len, SMS_BACKUP_MODE, SMS_TX_BACKUP_PATH_FILE, + imsi, id, flags, uuid, seq) != len) + return FALSE; + + return TRUE; +} + static inline GSList *sms_list_append(GSList *l, const struct sms *in) { struct sms *sms; diff --git a/src/smsutil.h b/src/smsutil.h index dd65884..7d27386 100644 --- a/src/smsutil.h +++ b/src/smsutil.h @@ -517,6 +517,9 @@ void status_report_assembly_add_fragment(struct status_report_assembly void status_report_assembly_expire(struct status_report_assembly *assembly, time_t before); +gboolean sms_tx_store(const char *imsi, unsigned long id, unsigned long flags, + const char *uuid, struct sms *s, guint8 seq); + GSList *sms_text_prepare(const char *to, const char *utf8, guint16 ref, gboolean use_16bit, gboolean use_delivery_reports); -- 1.7.3.5

Based on patch from: Kristen Carlson Accardi <kristen(a)linux.intel.com&gt; --- src/ofono.h | 1 + src/sms.c | 83 +++++++++++++++++++++++++++++++ src/smsutil.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/smsutil.h | 8 +++ 4 files changed, 243 insertions(+), 0 deletions(-) diff --git a/src/ofono.h b/src/ofono.h index e48dbf6..14f958e 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -245,6 +245,7 @@ enum ofono_sms_submit_flag { OFONO_SMS_SUBMIT_FLAG_RECORD_HISTORY = 0x2, OFONO_SMS_SUBMIT_FLAG_RETRY = 0x4, OFONO_SMS_SUBMIT_FLAG_EXPOSE_DBUS = 0x8, + OFONO_SMS_SUBMIT_FLAG_REUSE_UUID = 0x10, }; typedef void (*ofono_sms_txq_submit_cb_t)(gboolean ok, void *data); diff --git a/src/sms.c b/src/sms.c index 403e387..1c3109c 100644 --- a/src/sms.c +++ b/src/sms.c @@ -798,6 +798,9 @@ static struct tx_queue_entry *tx_queue_entry_new(GSList *msg_list, pdu->pdu_len, pdu->tpdu_len); } + if (flags & OFONO_SMS_SUBMIT_FLAG_REUSE_UUID) + return entry; + if (sms_uuid_from_pdus(entry->pdus, entry->num_pdus, &entry->uuid)) return entry; @@ -1694,6 +1697,84 @@ static void bearer_init_callback(const struct ofono_error *error, void *data) ofono_error("Error bootstrapping SMS Bearer Preference"); } +static void sms_restore_tx_queue(struct ofono_sms *sms) +{ + GQueue *backupq; + struct txq_backup_entry *backup_entry; + struct ofono_uuid ofono_uuid; + + DBG(""); + + backupq = sms_tx_queue_load(sms->imsi); + + if (backupq == NULL) + return; + + while ((backup_entry = g_queue_pop_head(backupq))) { + struct message *m; + struct tx_queue_entry *txq_entry; + + decode_hex_own_buf(backup_entry->uuid, -1, NULL, 0, + ofono_uuid.uuid); + + DBG("Trying to restore: %s", ofono_uuid.uuid); + + backup_entry->flags |= OFONO_SMS_SUBMIT_FLAG_REUSE_UUID; + txq_entry = tx_queue_entry_new(backup_entry->msg_list, + backup_entry->flags); + if (txq_entry == NULL) + goto loop_out; + + txq_entry->flags &= ~OFONO_SMS_SUBMIT_FLAG_REUSE_UUID; + memcpy(&txq_entry->uuid, &ofono_uuid, sizeof(ofono_uuid)); + + m = message_create(&txq_entry->uuid, sms->atom); + if (m == NULL) { + tx_queue_entry_destroy(txq_entry); + + goto loop_out; + } + + if (message_dbus_register(m) == FALSE) { + tx_queue_entry_destroy(txq_entry); + + goto loop_out; + } + + message_set_data(m, txq_entry); + g_hash_table_insert(sms->messages, &txq_entry->uuid, m); + + if (backup_entry->msg_list->next != NULL) { + if (sms->ref == 65536) + sms->ref = 1; + else + sms->ref = sms->ref + 1; + } + + txq_entry->id = sms->tx_counter++; + g_queue_push_tail(sms->txq, txq_entry); + + /* + * only messsages with OFONO_SMS_SUBMIT_FLAG_EXPOSE_DBUS flag + * are restored, so we can safely emit here without checking + * by this flag + */ + message_emit_added(m, OFONO_MESSAGE_MANAGER_INTERFACE); + +loop_out: + g_slist_foreach(backup_entry->msg_list, (GFunc)g_free, NULL); + g_slist_free(backup_entry->msg_list); + + g_free(backup_entry->uuid); + g_free(backup_entry); + } + + if (g_queue_get_length(sms->txq) > 0) + sms->tx_source = g_timeout_add(0, tx_next, sms); + + g_queue_free(backupq); +} + /* * Indicate oFono that a SMS driver is ready for operation * @@ -1766,6 +1847,8 @@ void ofono_sms_register(struct ofono_sms *sms) sms->driver->bearer_set(sms, sms->bearer, bearer_init_callback, sms); + sms_restore_tx_queue(sms); + sms->text_handlers = __ofono_watchlist_new(g_free); sms->datagram_handlers = __ofono_watchlist_new(g_free); diff --git a/src/smsutil.c b/src/smsutil.c index f4e3049..04759f0 100644 --- a/src/smsutil.c +++ b/src/smsutil.c @@ -2327,6 +2327,15 @@ static gboolean sms_deserialize(const unsigned char *buf, return sms_decode(buf + 1, len - 1, FALSE, buf[0], sms); } +static gboolean sms_deserialize_outgoing(const unsigned char *buf, + struct sms *sms, int len) +{ + if (len < 1) + return FALSE; + + return sms_decode(buf + 1, len - 1, TRUE, buf[0], sms); +} + static gboolean sms_assembly_extract_address(const char *straddr, struct sms_address *out) { @@ -3147,6 +3156,148 @@ void status_report_assembly_expire(struct status_report_assembly *assembly, } } +/* + * Each directory contains a file per pdu. + */ +static GSList *sms_tx_load(const char *imsi, const struct dirent *dir) +{ + GSList *list = NULL; + struct dirent **pdus; + char *path; + int len, r; + unsigned char buf[177]; + struct sms s; + + if (dir->d_type != DT_DIR) + return NULL; + + path = g_strdup_printf(SMS_TX_BACKUP_PATH "/%s", imsi, dir->d_name); + len = scandir(path, &pdus, NULL, versionsort); + g_free(path); + + if (len < 0) + return NULL; + + while (len-- > 2) { + if (pdus[len]->d_type != DT_REG) + goto free_pdu; + + r = read_file(buf, sizeof(buf), SMS_TX_BACKUP_PATH "/%s/%s", + imsi, dir->d_name, pdus[len]->d_name); + + if (r < 0) + goto free_pdu; + + if (sms_deserialize_outgoing(buf, &s, r) == FALSE) + goto free_pdu; + + list = g_slist_prepend(list, g_memdup(&s, sizeof(s))); + +free_pdu: + g_free(pdus[len]); + } + + g_free(pdus[1]); + g_free(pdus[0]); + g_free(pdus); + + return list; +} + +/* + * populate the queue with tx_backup_entry from stored backup + * data. + */ +GQueue *sms_tx_queue_load(const char *imsi) +{ + char *path; + GQueue *retq; + struct dirent **entries; + int len; + GSList *msg_list; + unsigned long flags; + unsigned long i; + + if (imsi == NULL) + return NULL; + + path = g_strdup_printf(SMS_TX_BACKUP_PATH, imsi); + if (path == NULL) + goto nomem_path; + + retq = g_queue_new(); + if (retq == NULL) + goto nomem_retq; + + len = scandir(path, &entries, NULL, versionsort); + + if (len < 0) + goto nodir_exit; + + while (len-- > 2) { + char *uuid; + char *oldpath; + struct txq_backup_entry *entry; + struct dirent *dir = entries[len]; + + entry = g_try_new0(struct txq_backup_entry, 1); + if (entry == NULL) + goto free_dir; + + msg_list = sms_tx_load(imsi, dir); + + if (msg_list == NULL) { + g_free(entry); + + goto free_dir; + } + + sscanf(dir->d_name, "%*u-%lu-%as", &flags, &uuid); + oldpath = g_strdup_printf("%s/%s", path, dir->d_name); + + entry->msg_list = msg_list; + entry->uuid = uuid; + entry->flags = flags; + entry->oldpath = oldpath; + + g_queue_push_head(retq, entry); + +free_dir: + g_free(dir); + } + + g_free(entries[1]); + g_free(entries[0]); + g_free(entries); + g_free(path); + + /* rename directory to reflect new position in queue */ + for (i = 0; i < g_queue_get_length(retq); i++) { + char *newpath; + struct txq_backup_entry *entry = g_queue_peek_nth(retq, i); + + newpath = g_strdup_printf(SMS_TX_BACKUP_PATH_DIR, + imsi, i, entry->flags, + entry->uuid); + + rename(entry->oldpath, newpath); + + g_free(newpath); + g_free(entry->oldpath); + } + + return retq; + +nodir_exit: + g_queue_free(retq); + +nomem_retq: + g_free(path); + +nomem_path: + return NULL; +} + gboolean sms_tx_store(const char *imsi, unsigned long id, unsigned long flags, const char *uuid, struct sms *s, guint8 seq) { diff --git a/src/smsutil.h b/src/smsutil.h index 3d3b72a..9e56c5f 100644 --- a/src/smsutil.h +++ b/src/smsutil.h @@ -408,6 +408,13 @@ struct cbs_topic_range { unsigned short max; }; +struct txq_backup_entry { + GSList *msg_list; + char *uuid; + unsigned long flags; + char *oldpath; +}; + static inline gboolean is_bit_set(unsigned char oct, int bit) { int mask = 0x1 << bit; @@ -524,6 +531,7 @@ void sms_tx_backup_remove(const char *imsi, unsigned long id, guint8 seq); void sms_tx_backup_free(const char *imsi, unsigned long id, unsigned long flags, const char *uuid); +GQueue *sms_tx_queue_load(const char *imsi); GSList *sms_text_prepare(const char *to, const char *utf8, guint16 ref, gboolean use_16bit, -- 1.7.3.5