X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuqmi.git;a=blobdiff_plain;f=commands-wms.c;h=9760d856780bf4b846059d34dd6e942ab18f7f95;hp=cdd1dd89ec47e04a75f9873a4752f4eaf2a50765;hb=894ffc95a6cccfe1b5aaf4361312b8939e685dff;hpb=5329a017951661d9d4c4fb7f8c7ab6809cf94901

diff --git a/commands-wms.c b/commands-wms.c
index cdd1dd8..9760d85 100644
--- a/commands-wms.c
+++ b/commands-wms.c
@@ -3,16 +3,15 @@
 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
@@ -29,37 +28,143 @@ cmd_wms_list_messages_prepare(struct qmi_dev *qmi, struct qmi_request *req, stru
 }
 
 static int
+put_unicode_char(char *dest, uint16_t c)
+{
+	if (c < 0x80) {
+		*dest = c;
+		return 1;
+	} else if (c < 0x800) {
+		*(dest++) = 0xc0 | ((c >> 6) & 0x1f);
+		*dest = 0x80 | (c & 0x3f);
+		return 2;
+	} else {
+		*(dest++) = 0xe0 | ((c >> 12) & 0xf);
+		*(dest++) = 0x80 | ((c >> 6) & 0x3f);
+		*dest = 0x80 | (c & 0x3f);
+		return 3;
+	}
+}
+
+
+static int
+pdu_decode_7bit_char(char *dest, int len, unsigned char c, bool *escape)
+{
+	uint16_t conv_0x20[] = {
+		0x0040, 0x00A3, 0x0024, 0x00A5, 0x00E8, 0x00E9, 0x00F9, 0x00EC,
+		0x00F2, 0x00E7, 0x000A, 0x00D8, 0x00F8, 0x000D, 0x00C5, 0x00E5,
+		0x0394, 0x005F, 0x03A6, 0x0393, 0x039B, 0x03A9, 0x03A0, 0x03A8,
+		0x03A3, 0x0398, 0x039E, 0x00A0, 0x00C6, 0x00E6, 0x00DF, 0x00C9,
+	};
+	uint16_t conv_0x5b[] = {
+		0x00C4, 0x00D6, 0x00D1, 0x00DC, 0x00A7, 0x00BF,
+	};
+	uint16_t conv_0x7b[] = {
+		0x00E4, 0x00F6, 0x00F1, 0x00FC, 0x00E0
+	};
+	int cur_len = 0;
+	uint16_t outc;
+
+	fprintf(stderr, " %02x", c);
+	dest += len;
+	if (*escape) {
+		switch(c) {
+		case 0x0A:
+			*dest = 0x0C;
+			return 1;
+		case 0x14:
+			*dest = 0x5E;
+			return 1;
+		case 0x28:
+			*dest = 0x7B;
+			return 1;
+		case 0x29:
+			*dest = 0x7D;
+			return 1;
+		case 0x2F:
+			*dest = 0x5C;
+			return 1;
+		case 0x3C:
+			*dest = 0x5B;
+			return 1;
+		case 0x3D:
+			*dest = 0x7E;
+			return 1;
+		case 0x3E:
+			*dest = 0x5D;
+			return 1;
+		case 0x40:
+			*dest = 0x7C;
+			return 1;
+		case 0x65:
+			outc = 0x20AC;
+			goto out;
+		case 0x1B:
+			goto normal;
+		default:
+			/* invalid */
+			*(dest++) = conv_0x20[0x1B];
+			cur_len++;
+			goto normal;
+		}
+	}
+
+	if (c == 0x1b) {
+		*escape = true;
+		return 0;
+	}
+
+normal:
+	if (c < 0x20)
+		outc = conv_0x20[(int) c];
+	else if (c == 0x40)
+		outc = 0x00A1;
+	else if (c >= 0x5b && c <= 0x60)
+		outc = conv_0x5b[c - 0x5b];
+	else if (c >= 0x7b && c <= 0x7f)
+		outc = conv_0x7b[c - 0x7b];
+	else
+		outc = c;
+
+out:
+	return cur_len + put_unicode_char(dest, outc);
+}
+
+static int
 pdu_decode_7bit_str(char *dest, const unsigned char *data, int data_len, int bit_offset)
 {
-	char *orig_dest = dest;
+	bool escape = false;
+	int len = 0;
 	int i;
 
+	fprintf(stderr, "Raw text:");
 	for (i = 0; i < data_len; i++) {
 		int pos = (i + bit_offset) % 7;
 
 		if (pos == 0) {
-			*(dest++) = data[i] & 0x7f;
+			len += pdu_decode_7bit_char(dest, len, data[i] & 0x7f, &escape);
 		} else {
 			if (i)
-				*(dest++) = (data[i - 1] >> (7 + 1 - pos)) |
-				            ((data[i] << pos) & 0x7f);
+				len += pdu_decode_7bit_char(dest, len,
+				                            (data[i - 1] >> (7 + 1 - pos)) |
+				                            ((data[i] << pos) & 0x7f), &escape);
 
 			if (pos == 6)
-				*(dest++) = (data[i] >> 1) & 0x7f;
+				len += pdu_decode_7bit_char(dest, len, (data[i] >> 1) & 0x7f,
+				                            &escape);
 		}
 	}
-	*dest = 0;
-	return dest - orig_dest;
+	dest[len] = 0;
+	fprintf(stderr, "\n");
+	return len;
 }
 
-static void decode_udh(const unsigned char *data)
+static int decode_udh(const unsigned char *data)
 {
-	const unsigned char *start = 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;
 
@@ -73,37 +178,22 @@ static void decode_udh(const unsigned char *data)
 		switch (type) {
 		case 0:
 			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;
 		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)
 {
-	bool multipart = false;
-	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, 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)
@@ -142,37 +232,66 @@ 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);
 }
 
+#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;
 	unsigned char *data, *end;
 	char *str;
-	int i, cur_len;
+	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;
@@ -181,27 +300,27 @@ 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;
+		goto error;
 
 	if (dcs & 0x10)
 		blobmsg_add_u32(&status, "class", (dcs & 3));
@@ -211,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);
 
@@ -242,8 +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
@@ -260,7 +398,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;
 	}
 
@@ -275,14 +413,14 @@ static void cmd_wms_get_raw_message_cb(struct qmi_dev *qmi, struct qmi_request *
 {
 	struct qmi_wms_raw_read_response res;
 	unsigned char *data;
-	int i, len = 0;
 	char *str;
+	int i;
 
 	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);
 }
@@ -294,14 +432,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;
 }
 
@@ -309,7 +447,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;
 }
 
@@ -317,7 +455,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;
 }
 
@@ -350,8 +488,6 @@ pdu_encode_7bit_str(unsigned char *data, const char *str)
 	int ofs = 0;
 
 	while(1) {
-		unsigned char mask;
-
 		c = *(str++) & 0x7f;
 		if (!c)
 			break;
@@ -366,7 +502,7 @@ pdu_encode_7bit_str(unsigned char *data, const char *str)
 			break;
 		}
 
-		ofs = (ofs + 1) % 7;
+		ofs = (ofs + 1) % 8;
 	}
 
 	return len + 1;
@@ -440,27 +576,25 @@ cmd_wms_send_message_prepare(struct qmi_dev *qmi, struct qmi_request *req, struc
 	unsigned char first_octet = 0x11;
 	unsigned char protocol_id = 0x00;
 	unsigned char dcs = 0x00;
-	char *str;
-	int i;
 
-	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;