sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

sms: Update to the new smsutil api

This commit is contained in:
Denis Kenzior 2010-11-02 13:39:50 -05:00
parent 149ebae625
commit e29d1338b9
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/sms.c
View File

@ -835,29 +835,6 @@ static gboolean tx_next(gpointer user_data)
return FALSE;
}
static void set_ref_and_to(GSList *msg_list, guint16 ref, int offset,
gboolean use_16bit, const char *to)
{
GSList *l;
struct sms *sms;
for (l = msg_list; l; l = l->next) {
sms = l->data;
sms_address_from_string(&sms->submit.daddr, to);
if (offset == 0)
continue;
if (use_16bit) {
sms->submit.ud[offset] = (ref & 0xf0) >> 8;
sms->submit.ud[offset+1] = ref & 0x0f;
} else {
sms->submit.ud[offset] = ref & 0x0f;
}
}
}
/**
* Generate a UUID from an SMS PDU List
*
@ -987,16 +964,13 @@ static DBusMessage *sms_send_message(DBusConnection *conn, DBusMessage *msg,
if (valid_phone_number_format(to) == FALSE)
return __ofono_error_invalid_format(msg);
msg_list = sms_text_prepare(text, 0, use_16bit_ref, &ref_offset,
sms->use_delivery_reports);
msg_list = sms_text_prepare(to, text, sms->ref, use_16bit_ref,
sms->use_delivery_reports);
if (!msg_list)
return __ofono_error_invalid_format(msg);
set_ref_and_to(msg_list, sms->ref, ref_offset, use_16bit_ref, to);
DBG("ref: %d, offset: %d", sms->ref, ref_offset);
if (ref_offset != 0) {
if (msg_list->next != NULL) {
if (sms->ref == 65536)
sms->ref = 1;
else