Separation of decoding User Data Header from decoding 7 bit message

[project/uqmi.git] / commands-wms.c

diff --git a/commands-wms.c b/commands-wms.c
index 9b9aac374a5bca166aadde840a0c9c61e43e7248..9760d856780bf4b846059d34dd6e942ab18f7f95 100644 (file)
--- a/commands-wms.c
+++ b/commands-wms.c
@@ -158,13 +158,13 @@ pdu_decode_7bit_str(char *dest, const unsigned char *data, int data_len, int bit
        return len;
 }
 
-static void decode_udh(const unsigned char *data)
+static int decode_udh(const unsigned char *data)
 {
        const unsigned char *end;
-       unsigned int type, len;
+       unsigned int type, len, udh_len;
 
-       len = *(data++);
-       end = data + len;
+       udh_len = *(data++);
+       end = data + udh_len;
        while (data < end) {
                const unsigned char *val;
 
@@ -185,29 +185,15 @@ static void decode_udh(const unsigned char *data)
                        break;
                }
        }
+
+       return udh_len + 1;
 }
 
-static void decode_7bit_field(char *name, const unsigned char *data, int data_len, bool udh)
+static void decode_7bit_field(char *name, const unsigned char *data, int data_len, int bit_offset)
 {
-       const unsigned char *udh_start;
-       char *dest;
-       int pos_offset = 0;
-
-       if (udh) {
-               int len = data[0] + 1;
-
-               udh_start = data;
-               data += len;
-               data_len -= len;
-               pos_offset = len % 7;
-       }
-
-       dest = blobmsg_alloc_string_buffer(&status, name, 3 * (data_len * 8 / 7) + 2);
-       pdu_decode_7bit_str(dest, data, data_len, pos_offset);
+       char *dest = blobmsg_alloc_string_buffer(&status, name, 3 * (data_len * 8 / 7) + 2);
+       pdu_decode_7bit_str(dest, data, data_len, bit_offset);
        blobmsg_add_string_buffer(&status);
-
-       if (udh)
-               decode_udh(udh_start);
 }
 
 static char *pdu_add_semioctet(char *str, char val)
@@ -253,6 +239,33 @@ static void wms_decode_address(char *name, unsigned char *data, int len)
        blobmsg_add_string_buffer(&status);
 }
 
+#define cmd_wms_delete_message_cb no_cb
+static enum qmi_cmd_result
+cmd_wms_delete_message_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+       char *err;
+       int id;
+
+       id = strtoul(arg, &err, 10);
+       if (err && *err) {
+               uqmi_add_error("Invalid message ID");
+               return QMI_CMD_EXIT;
+       }
+
+       static struct qmi_wms_delete_request mreq = {
+               QMI_INIT(memory_storage, QMI_WMS_STORAGE_TYPE_UIM),
+               QMI_INIT(message_mode, QMI_WMS_MESSAGE_MODE_GSM_WCDMA),
+       };
+
+       mreq.set.memory_index = 1;
+       mreq.data.memory_index = id;
+
+       qmi_set_wms_delete_request(msg, &mreq);
+
+       return QMI_CMD_REQUEST;
+}
+
+
 static void cmd_wms_get_message_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
 {
        struct qmi_wms_raw_read_response res;
@@ -270,7 +283,7 @@ static void cmd_wms_get_message_cb(struct qmi_dev *qmi, struct qmi_request *req,
 
        cur_len = *(data++);
        if (data + cur_len >= end)
-               return;
+               goto error;
 
        if (cur_len) {
                wms_decode_address("smsc", data, cur_len - 1);
@@ -278,7 +291,7 @@ static void cmd_wms_get_message_cb(struct qmi_dev *qmi, struct qmi_request *req,
        }
 
        if (data + 3 >= end)
-               return;
+               goto error;
 
        first = *(data++);
        sent = (first & 0x3) == 1;
@@ -287,7 +300,7 @@ static void cmd_wms_get_message_cb(struct qmi_dev *qmi, struct qmi_request *req,
 
        cur_len = *(data++);
        if (data + cur_len >= end)
-               return;
+               goto error;
 
        if (cur_len) {
                cur_len = (cur_len + 1) / 2;
@@ -296,18 +309,18 @@ static void cmd_wms_get_message_cb(struct qmi_dev *qmi, struct qmi_request *req,
        }
 
        if (data + 3 >= end)
-               return;
+               goto error;
 
        /* Protocol ID */
        if (*(data++) != 0)
-               return;
+               goto error;
 
        /* Data Encoding */
        dcs = *(data++);
 
        /* only 7-bit encoding supported for now */
        if (dcs & 0x0c)
-               return;
+               goto error;
 
        if (dcs & 0x10)
                blobmsg_add_u32(&status, "class", (dcs & 3));
@@ -317,7 +330,7 @@ static void cmd_wms_get_message_cb(struct qmi_dev *qmi, struct qmi_request *req,
                data++;
        } else {
                if (data + 6 >= end)
-                       return;
+                       goto error;
 
                str = blobmsg_alloc_string_buffer(&status, "timestamp", 32);
 
@@ -348,9 +361,27 @@ static void cmd_wms_get_message_cb(struct qmi_dev *qmi, struct qmi_request *req,
                data += 7;
        }
 
-       cur_len = *(data++);
-       decode_7bit_field("text", data, end - data, !!(first & 0x40));
+       data++;
+       int bit_offset = 0;
+
+       /* User Data Header */
+       if (first & 0x40) {
+               int udh_len = decode_udh(data);
+               data += udh_len;
+               bit_offset = udh_len % 7;
+               }
+
+       if (data >= end)
+               goto error;
+
+       decode_7bit_field("text", data, end - data, bit_offset);
+       blobmsg_close_table(&status, c);
+
+       return;
+
+error:
        blobmsg_close_table(&status, c);
+       fprintf(stderr, "There was an error reading message.\n");
 }
 
 static enum qmi_cmd_result