X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuqmi.git;a=blobdiff_plain;f=commands-wms.c;h=2e4e08ff3ec0705286efd0f5deb4441ad67afea1;hp=78554c5752628a5d37f452a4473ee76f56241e5e;hb=411f854ef609b66806ca7f2ce364d2f2137abe40;hpb=213dc83117e43ae376cd2a2825cfd6b0f10b0c79;ds=sidebyside diff --git a/commands-wms.c b/commands-wms.c index 78554c5..2e4e08f 100644 --- a/commands-wms.c +++ b/commands-wms.c @@ -1,18 +1,20 @@ #include "qmi-message.h" +#define MIN(a,b) (((a)<(b))?(a):(b)) +#define CEILDIV(x,y) (((x) + (y) - 1) / (y)) + static void cmd_wms_list_messages_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg) { struct qmi_wms_list_messages_response res; - int i, len = 0; + void *c; + int i; qmi_parse_wms_list_messages_response(msg, &res); - blobmsg_alloc_string_buffer(&status, "messages", 1); - for (i = 0; i < res.data.message_list_n; i++) { - len += sprintf(blobmsg_realloc_string_buffer(&status, len + 12) + len, - " %d" + (len ? 0 : 1), - res.data.message_list[i].memory_index); - } - blobmsg_add_string_buffer(&status); + c = blobmsg_open_array(&status, NULL); + for (i = 0; i < res.data.message_list_n; i++) + blobmsg_add_u32(&status, NULL, res.data.message_list[i].memory_index); + + blobmsg_close_array(&status, c); } static enum qmi_cmd_result @@ -68,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; @@ -159,13 +162,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; @@ -177,38 +180,30 @@ static void 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] + 1); + 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; } } + + 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 + 2); + pdu_decode_7bit_str(dest, data, CEILDIV(data_len * 7, 8), bit_offset); + dest[data_len] = 0; blobmsg_add_string_buffer(&status); - - if (udh) - decode_udh(udh_start); } static char *pdu_add_semioctet(char *str, char val) @@ -247,13 +242,49 @@ pdu_decode_address(char *str, unsigned char *data, int len) *str = 0; } -static void wms_decode_address(char *str, char *name, unsigned char *data, int len) +static void wms_decode_address(char *name, unsigned char *data, int len) { - str = blobmsg_alloc_string_buffer(&status, name, len * 2 + 2); + char *str = blobmsg_alloc_string_buffer(&status, name, len * 2 + 2); pdu_decode_address(str, data, len); blobmsg_add_string_buffer(&status); } +static void blobmsg_add_hex(struct blob_buf *buf, const char *name, unsigned const char *data, int len) +{ + char* str = blobmsg_alloc_string_buffer(buf, name, len * 2 + 1); + for (int i = 0; i < len; i++) { + str += sprintf(str, "%02x", data[i]); + } + blobmsg_add_string_buffer(buf); +} + +#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; @@ -262,22 +293,24 @@ static void cmd_wms_get_message_cb(struct qmi_dev *qmi, struct qmi_request *req, int cur_len; bool sent; unsigned char first, dcs; + void *c; qmi_parse_wms_raw_read_response(msg, &res); + c = blobmsg_open_table(&status, NULL); data = (unsigned char *) res.data.raw_message_data.raw_data; end = data + res.data.raw_message_data.raw_data_n; cur_len = *(data++); if (data + cur_len >= end) - return; + goto error; if (cur_len) { - wms_decode_address(str, "smsc", data, cur_len - 1); + wms_decode_address("smsc", data, cur_len - 1); data += cur_len; } if (data + 3 >= end) - return; + goto error; first = *(data++); sent = (first & 0x3) == 1; @@ -286,28 +319,24 @@ 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; - wms_decode_address(str, sent ? "receiver" : "sender", data, cur_len); + wms_decode_address(sent ? "receiver" : "sender", data, cur_len); data += cur_len + 1; } 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; - if (dcs & 0x10) blobmsg_add_u32(&status, "class", (dcs & 3)); @@ -316,7 +345,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); @@ -347,8 +376,47 @@ 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)); + int message_len = *(data++); + int udh_len = 0; + int bit_offset = 0; + + /* User Data Header */ + if (first & 0x40) { + udh_len = decode_udh(data); + data += udh_len; + bit_offset = udh_len % 7; + } + + if (data >= end) + goto error; + + switch(dcs & 0x0c) { + case 0x00: + /* 7 bit GSM alphabet */ + message_len = message_len - CEILDIV(udh_len * 8, 7); + message_len = MIN(message_len, CEILDIV((end - data) * 8, 7)); + decode_7bit_field("text", data, message_len, bit_offset); + break; + case 0x04: + /* 8 bit data */ + message_len = MIN(message_len - udh_len, end - data); + blobmsg_add_hex(&status, "data", data, message_len); + break; + case 0x08: + /* 16 bit UCS-2 string */ + message_len = MIN(message_len - udh_len, end - data); + blobmsg_add_hex(&status, "ucs-2", data, message_len); + break; + default: + goto error; + } + + 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 @@ -365,7 +433,7 @@ cmd_wms_get_message_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct id = strtoul(arg, &err, 10); if (err && *err) { - blobmsg_add_string(&status, "error", "Invalid message ID"); + uqmi_add_error("Invalid message ID"); return QMI_CMD_EXIT; } @@ -385,9 +453,9 @@ static void cmd_wms_get_raw_message_cb(struct qmi_dev *qmi, struct qmi_request * qmi_parse_wms_raw_read_response(msg, &res); data = (unsigned char *) res.data.raw_message_data.raw_data; - str = blobmsg_alloc_string_buffer(&status, "data", res.data.raw_message_data.raw_data_n * 3); + str = blobmsg_alloc_string_buffer(&status, NULL, res.data.raw_message_data.raw_data_n * 3); for (i = 0; i < res.data.raw_message_data.raw_data_n; i++) { - str += sprintf(str, " %02x" + (i ? 0 : 1), data[i]); + str += sprintf(str, &" %02x"[i ? 0 : 1], data[i]); } blobmsg_add_string_buffer(&status); } @@ -399,14 +467,14 @@ static struct { const char *smsc; const char *target; bool flash; -} send; +} _send; #define cmd_wms_send_message_smsc_cb no_cb static enum qmi_cmd_result cmd_wms_send_message_smsc_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg) { - send.smsc = arg; + _send.smsc = arg; return QMI_CMD_DONE; } @@ -414,7 +482,7 @@ cmd_wms_send_message_smsc_prepare(struct qmi_dev *qmi, struct qmi_request *req, static enum qmi_cmd_result cmd_wms_send_message_target_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg) { - send.target = arg; + _send.target = arg; return QMI_CMD_DONE; } @@ -422,7 +490,7 @@ cmd_wms_send_message_target_prepare(struct qmi_dev *qmi, struct qmi_request *req static enum qmi_cmd_result cmd_wms_send_message_flash_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg) { - send.flash = true; + _send.flash = true; return QMI_CMD_DONE; } @@ -492,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; @@ -523,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; } @@ -544,24 +612,24 @@ 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) { - blobmsg_add_string(&status, "error", "Missing argument"); + if (!_send.smsc || !*_send.smsc || !_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) { - blobmsg_add_string(&status, "error", "Argument too long"); + if (strlen(_send.smsc) > 16 || strlen(_send.target) > 16 || strlen(arg) > 160) { + uqmi_add_error("Argument too long"); return QMI_CMD_EXIT; } - if (send.flash) + if (_send.flash) dcs |= 0x10; - cur += pdu_encode_number(cur, send.smsc, true); + cur += pdu_encode_number(cur, _send.smsc, true); *(cur++) = first_octet; *(cur++) = 0; /* reference */ - cur += pdu_encode_number(cur, send.target, false); + cur += pdu_encode_number(cur, _send.target, false); *(cur++) = protocol_id; *(cur++) = dcs;