Add command to specify preferred PLMN

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

diff --git a/commands-wms.c b/commands-wms.c
index 47d4d76..e3bcbc8 100644 (file)
--- a/commands-wms.c
+++ b/commands-wms.c
@@ -70,6 +70,7 @@ pdu_decode_7bit_char(char *dest, int len, unsigned char c, bool *escape)
        fprintf(stderr, " %02x", c);
        dest += len;
        if (*escape) {
+               *escape = false;
                switch(c) {
                case 0x0A:
                        *dest = 0x0C;
@@ -179,11 +180,16 @@ static int decode_udh(const unsigned char *data)
                        break;
 
                switch (type) {
-               case 0:
+               case 0x00:
                        blobmsg_add_u32(&status, "concat_ref", (uint32_t) val[0]);
                        blobmsg_add_u32(&status, "concat_part", (uint32_t) val[2]);
                        blobmsg_add_u32(&status, "concat_parts", (uint32_t) val[1]);
                        break;
+               case 0x08:
+                       blobmsg_add_u32(&status, "concat_ref", (uint32_t) (val[0] << 8 | val[1]));
+                       blobmsg_add_u32(&status, "concat_part", (uint32_t) val[3]);
+                       blobmsg_add_u32(&status, "concat_parts", (uint32_t) val[2]);
+                       break;
                default:
                        break;
                }
@@ -506,7 +512,7 @@ pdu_encode_semioctet(unsigned char *dest, const char *str)
                str++;
        }
 
-       return len;
+       return lower ? len : (len + 1);
 }
 
 static int
@@ -554,7 +560,7 @@ pdu_encode_number(unsigned char *dest, const char *str, bool smsc)
        }
 
        for (i = 0; str[i]; i++) {
-               if (str[i] >= '0' || str[i] <= '9')
+               if (str[i] >= '0' && str[i] <= '9')
                        continue;
 
                ascii = true;
@@ -585,7 +591,7 @@ pdu_encode_data(unsigned char *dest, const char *str)
 
        dest[len++] = 0;
        len += pdu_encode_7bit_str(&dest[len], str);
-       dest[0] = len - 1;
+       dest[0] = strlen(str);
 
        return len;
 }
@@ -606,12 +612,12 @@ cmd_wms_send_message_prepare(struct qmi_dev *qmi, struct qmi_request *req, struc
        unsigned char protocol_id = 0x00;
        unsigned char dcs = 0x00;
 
-       if (!_send.smsc || !*_send.smsc || !_send.target || !*_send.target) {
+       if (!_send.target || !*_send.target) {
                uqmi_add_error("Missing argument");
                return QMI_CMD_EXIT;
        }
 
-       if (strlen(_send.smsc) > 16 || strlen(_send.target) > 16 || strlen(arg) > 160) {
+       if ((_send.smsc && strlen(_send.smsc) > 16) || strlen(_send.target) > 16 || strlen(arg) > 160) {
                uqmi_add_error("Argument too long");
                return QMI_CMD_EXIT;
        }
@@ -619,7 +625,11 @@ cmd_wms_send_message_prepare(struct qmi_dev *qmi, struct qmi_request *req, struc
        if (_send.flash)
                dcs |= 0x10;
 
-       cur += pdu_encode_number(cur, _send.smsc, true);
+       if (!_send.smsc || !*_send.smsc)
+               *(cur++) = 0;
+       else
+               cur += pdu_encode_number(cur, _send.smsc, true);
+
        *(cur++) = first_octet;
        *(cur++) = 0; /* reference */