mirror of git://git.sysmocom.de/ofono
sms: restore pending tx messages from backup
Based on patch from: Kristen Carlson Accardi <kristen@linux.intel.com>
This commit is contained in:
Lucas De Marchi
Denis Kenzior
parent
f55447a39e
commit
bc0386cb23
|
|
@ -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);
|
||||
|
|
|
|||
62
src/sms.c
62
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,63 @@ 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;
|
||||
|
||||
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;
|
||||
|
||||
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.uuid, &backup_entry->uuid,
|
||||
SMS_MSGID_LEN);
|
||||
|
||||
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);
|
||||
|
||||
txq_entry->id = sms->tx_counter++;
|
||||
g_queue_push_tail(sms->txq, txq_entry);
|
||||
|
||||
loop_out:
|
||||
g_slist_foreach(backup_entry->msg_list, (GFunc)g_free, NULL);
|
||||
g_slist_free(backup_entry->msg_list);
|
||||
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 +1826,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);
|
||||
|
||||
|
|
|
|||
181
src/smsutil.c
181
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,178 @@ void status_report_assembly_expire(struct status_report_assembly *assembly,
|
|||
}
|
||||
}
|
||||
|
||||
static int sms_tx_load_filter(const struct dirent *dent)
|
||||
{
|
||||
char *endp;
|
||||
guint8 seq;
|
||||
|
||||
if (dent->d_type != DT_REG)
|
||||
return 0;
|
||||
|
||||
seq = strtol(dent->d_name, &endp, 10);
|
||||
|
||||
if (*endp != '\0')
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* 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, sms_tx_load_filter, versionsort);
|
||||
g_free(path);
|
||||
|
||||
if (len < 0)
|
||||
return NULL;
|
||||
|
||||
while (len--) {
|
||||
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);
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
static int sms_tx_queue_filter(const struct dirent *dirent)
|
||||
{
|
||||
if (dirent->d_type != DT_DIR)
|
||||
return 0;
|
||||
|
||||
if (!strcmp(dirent->d_name, ".") || !strcmp(dirent->d_name, ".."))
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* 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;
|
||||
|
||||
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, sms_tx_queue_filter, versionsort);
|
||||
|
||||
if (len < 0)
|
||||
goto nodir_exit;
|
||||
|
||||
while (len--) {
|
||||
char uuid[SMS_MSGID_LEN * 2 + 1];
|
||||
GSList *msg_list;
|
||||
unsigned long flags;
|
||||
char *oldpath, *newpath;
|
||||
struct txq_backup_entry *entry;
|
||||
struct dirent *dir = entries[len];
|
||||
char endc;
|
||||
unsigned long i;
|
||||
|
||||
if (sscanf(dir->d_name, "%*u-%lu-" SMS_MSGID_FMT "%c",
|
||||
&flags, uuid, &endc) != 2)
|
||||
goto err_free_dir;
|
||||
|
||||
if (strlen(uuid) != 2 * SMS_MSGID_LEN)
|
||||
goto err_free_dir;
|
||||
|
||||
entry = g_try_new0(struct txq_backup_entry, 1);
|
||||
if (entry == NULL)
|
||||
goto err_free_dir;
|
||||
|
||||
oldpath = g_strdup_printf("%s/%s", path, dir->d_name);
|
||||
if (oldpath == NULL)
|
||||
goto err_free_entry;
|
||||
|
||||
i = len;
|
||||
newpath = g_strdup_printf(SMS_TX_BACKUP_PATH_DIR,
|
||||
imsi, i, flags, uuid);
|
||||
if (newpath == NULL)
|
||||
goto err_free_oldpath;
|
||||
|
||||
msg_list = sms_tx_load(imsi, dir);
|
||||
if (msg_list == NULL)
|
||||
goto err_free_newpath;
|
||||
|
||||
entry->msg_list = msg_list;
|
||||
entry->flags = flags;
|
||||
decode_hex_own_buf(uuid, -1, NULL, 0, entry->uuid);
|
||||
|
||||
g_queue_push_head(retq, entry);
|
||||
|
||||
/* rename directory to reflect new position in queue */
|
||||
rename(oldpath, newpath);
|
||||
|
||||
g_free(dir);
|
||||
g_free(newpath);
|
||||
g_free(oldpath);
|
||||
|
||||
continue;
|
||||
|
||||
err_free_newpath:
|
||||
g_free(newpath);
|
||||
err_free_oldpath:
|
||||
g_free(oldpath);
|
||||
err_free_entry:
|
||||
g_free(entry);
|
||||
err_free_dir:
|
||||
g_free(dir);
|
||||
}
|
||||
|
||||
g_free(entries);
|
||||
g_free(path);
|
||||
|
||||
return retq;
|
||||
|
||||
nodir_exit:
|
||||
g_queue_free(retq);
|
||||
|
||||
nomem_retq:
|
||||
g_free(path);
|
||||
|
||||
nomem_path:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gboolean sms_tx_backup_store(const char *imsi, unsigned long id,
|
||||
unsigned long flags, const char *uuid,
|
||||
guint8 seq, const unsigned char *pdu,
|
||||
|
|
|
|||
|
|
@ -408,6 +408,12 @@ struct cbs_topic_range {
|
|||
unsigned short max;
|
||||
};
|
||||
|
||||
struct txq_backup_entry {
|
||||
GSList *msg_list;
|
||||
unsigned char uuid[SMS_MSGID_LEN];
|
||||
unsigned long flags;
|
||||
};
|
||||
|
||||
static inline gboolean is_bit_set(unsigned char oct, int bit)
|
||||
{
|
||||
int mask = 0x1 << bit;
|
||||
|
|
@ -526,6 +532,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,
|
||||
|
|
|
|||
Loading…
Reference in New Issue