---
src/sms.c | 15 +++++++++++++++
src/smsutil.c | 26 ++++++++++++++++++++++++++
src/smsutil.h | 3 +++
3 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/sms.c b/src/sms.c
index 163eab0..e5e06db 100644
--- a/src/sms.c
+++ b/src/sms.c
@@ -77,6 +77,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;
@@ -111,6 +112,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)
@@ -1896,6 +1898,8 @@ int __ofono_sms_txq_submit(struct ofono_sms *sms, GSList
*list,
{
struct message *m = NULL;
struct tx_queue_entry *entry;
+ int i;
+ GSList *l;
entry = tx_queue_entry_new(list, flags);
if (entry == NULL)
@@ -1920,6 +1924,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 (g_queue_get_length(sms->txq) == 1)
@@ -1928,6 +1934,15 @@ 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) {
+ 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 5e1d233..9c6596f 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,28 @@ 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/order in tx_queue-flags-uuid/order of pdus
+ */
+ 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 4b6159f..46084ab 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.2.3
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono