Suback, unsubscribe and unsuback

src/MQTTSNPacket.h

@@ -123,8 +123,7 @@ int MQTTstrlen(MQTTString mqttstring);
 #include "MQTTSNConnect.h"
 #include "MQTTSNPublish.h"
 #include "MQTTSNSubscribe.h"
-/*#include "MQTTSNUnsubscribe.h"
+#include "MQTTSNUnsubscribe.h"
-*/
 
 #include <stdio.h>
 

src/MQTTSNSubscribeClient.c

@@ -31,6 +31,8 @@ int MQTTSNSerialize_subscribeLength(MQTTSN_topicid* topicFilter)
 
 	if (topicFilter->type == MQTTSN_TOPIC_TYPE_NORMAL)
 		len += topicFilter->data.long_.len;
+	else if (topicFilter->type == MQTTSN_TOPIC_TYPE_SHORT || topicFilter->type == MQTTSN_TOPIC_TYPE_PREDEFINED)
+		len += 2;
 
 	return len;
 }

src/MQTTSNUnsubscribe.h

@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(MQTTSNUNSUBSCRIBE_H_)
+#define MQTTSNUNSUBSCRIBE_H_
+
+int MQTTSNSerialize_unsubscribe(unsigned char* buf, int buflen,
+		unsigned short packetid, MQTTSN_topicid* topicFilter);
+int MQTTSNDeserialize_unsubscribe(unsigned short* packetid, MQTTSN_topicid* topicFilter,
+		unsigned char* buf, int buflen);
+
+int MQTTSNSerialize_unsuback(unsigned char* buf, int buflen, unsigned short packetid);
+int MQTTSNDeserialize_unsuback(unsigned short* packetid, unsigned char* buf, int buflen);
+
+#endif /* MQTTSNUNSUBSCRIBE_H_ */

src/MQTTSNUnsubscribeClient.c

@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#include "MQTTSNPacket.h"
+#include "StackTrace.h"
+
+#include <string.h>
+
+/**
+  * Determines the length of the MQTTSN subscribe packet that would be produced using the supplied parameters, 
+  * excluding length
+  * @param topicName the topic name to be used in the publish  
+  * @return the length of buffer needed to contain the serialized version of the packet
+  */
+int MQTTSNSerialize_unsubscribeLength(MQTTSN_topicid* topicFilter)
+{
+	int len = 4;
+
+	if (topicFilter->type == MQTTSN_TOPIC_TYPE_NORMAL)
+		len += topicFilter->data.long_.len;
+	else if (topicFilter->type == MQTTSN_TOPIC_TYPE_SHORT || topicFilter->type == MQTTSN_TOPIC_TYPE_PREDEFINED)
+		len += 2;
+
+	return len;
+}
+
+
+int MQTTSNSerialize_unsubscribe(unsigned char* buf, int buflen, unsigned short packetid, MQTTSN_topicid* topicFilter)
+{
+	unsigned char *ptr = buf;
+	MQTTSNFlags flags;
+	int len = 0;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if ((len = MQTTSNPacket_len(MQTTSNSerialize_unsubscribeLength(topicFilter))) > buflen)
+	{
+		rc = MQTTSNPACKET_BUFFER_TOO_SHORT;
+		goto exit;
+	}
+	ptr += MQTTSNPacket_encode(ptr, len);   /* write length */
+	writeChar(&ptr, MQTTSN_UNSUBSCRIBE);      /* write message type */
+
+	flags.all = 0;
+	flags.bits.topicIdType = topicFilter->type;
+	writeChar(&ptr, flags.all);
+
+	writeInt(&ptr, packetid);
+
+	/* now the topic id or name */
+	if (topicFilter->type == MQTTSN_TOPIC_TYPE_NORMAL) /* means long topic name */
+	{
+		memcpy(ptr, topicFilter->data.long_.name, topicFilter->data.long_.len);
+		ptr += topicFilter->data.long_.len;
+	}
+	else if (topicFilter->type == MQTTSN_TOPIC_TYPE_PREDEFINED)
+		writeInt(&ptr, topicFilter->data.id);
+	else if (topicFilter->type == MQTTSN_TOPIC_TYPE_SHORT)
+	{
+		writeChar(&ptr, topicFilter->data.short_name[0]);
+		writeChar(&ptr, topicFilter->data.short_name[1]);
+	}
+
+	rc = ptr - buf;
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+
+}
+
+
+int MQTTSNDeserialize_unsuback(unsigned short* packetid, unsigned char* buf, int buflen)
+{
+	unsigned char* curdata = buf;
+	unsigned char* enddata = NULL;
+	int rc = 0;
+	int mylen = 0;
+
+	FUNC_ENTRY;
+	curdata += (rc = MQTTSNPacket_decode(curdata, buflen, &mylen)); /* read length */
+	enddata = buf + mylen;
+	if (enddata - curdata > buflen)
+		goto exit;
+
+	if (readChar(&curdata) != MQTTSN_UNSUBACK)
+		goto exit;
+
+	*packetid = readInt(&curdata);
+
+	rc = 1;
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+

src/MQTTSNUnsubscribeServer.c

@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#include "StackTrace.h"
+#include "MQTTSNPacket.h"
+#include <string.h>
+
+int MQTTSNDeserialize_unsubscribe(unsigned short* packetid, MQTTSN_topicid* topicFilter,
+		unsigned char* buf, int buflen)
+{
+	MQTTSNFlags flags;
+	unsigned char* curdata = buf;
+	unsigned char* enddata = NULL;
+	int rc = 0;
+	int mylen = 0;
+
+	FUNC_ENTRY;
+	curdata += (rc = MQTTSNPacket_decode(curdata, buflen, &mylen)); /* read length */
+	enddata = buf + mylen;
+	if (enddata - curdata > buflen)
+		goto exit;
+
+	if (readChar(&curdata) != MQTTSN_UNSUBSCRIBE)
+		goto exit;
+
+	flags.all = readChar(&curdata);
+	*packetid = readInt(&curdata);
+
+	topicFilter->type = flags.bits.topicIdType;
+	if (topicFilter->type == MQTTSN_TOPIC_TYPE_NORMAL)
+	{
+		topicFilter->data.long_.len = enddata - curdata;
+		topicFilter->data.long_.name = (char*)curdata;
+	}
+	else if (topicFilter->type == MQTTSN_TOPIC_TYPE_PREDEFINED)
+		topicFilter->data.id = readInt(&curdata);
+	else if (topicFilter->type == MQTTSN_TOPIC_TYPE_SHORT)
+	{
+		topicFilter->data.short_name[0] = readChar(&curdata);
+		topicFilter->data.short_name[1] = readChar(&curdata);
+	}
+
+	rc = 1;
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTSNSerialize_unsuback(unsigned char* buf, int buflen, unsigned short packetid)
+{
+	unsigned char *ptr = buf;
+	int len = 0;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if ((len = MQTTSNPacket_len(7)) > buflen)
+	{
+		rc = MQTTSNPACKET_BUFFER_TOO_SHORT;
+		goto exit;
+	}
+	ptr += MQTTSNPacket_encode(ptr, len); /* write length */
+	writeChar(&ptr, MQTTSN_UNSUBACK);      /* write message type */
+
+	writeInt(&ptr, packetid);
+
+	rc = ptr - buf;
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+

test/build_test

@@ -1,3 +1,3 @@
-gcc -Wall test1.c -o test1 -I../src ../src/MQTTSNConnectClient.c ../src/MQTTSNConnectServer.c ../src/MQTTSNPacket.c ../src/MQTTSNSerializePublish.c ../src/MQTTSNDeserializePublish.c ../src/MQTTSNSubscribeClient.c ../src/MQTTSNSubscribeServer.c
+gcc -Wall test1.c -o test1 -I../src ../src/MQTTSNConnectClient.c ../src/MQTTSNConnectServer.c ../src/MQTTSNPacket.c ../src/MQTTSNSerializePublish.c ../src/MQTTSNDeserializePublish.c ../src/MQTTSNSubscribeClient.c ../src/MQTTSNSubscribeServer.c ../src/MQTTSNUnsubscribeClient.c ../src/MQTTSNUnsubscribeServer.c
 
 gcc -Wall test2.c -o test2 -I../src ../src/MQTTSNConnectClient.c ../src/MQTTSNConnectServer.c ../src/MQTTSNPacket.c ../src/MQTTSNSerializePublish.c ../src/MQTTSNDeserializePublish.c ../src/MQTTSNSubscribeClient.c

test/test1.c

@@ -584,6 +584,7 @@ int test3(struct Options options)
 
 
 
+
 int test4(struct Options options)
 {
 	int rc = 0;
@@ -632,98 +633,46 @@ int test4(struct Options options)
 }
 
 
-#if 0
-int test4(struct Options options)
-{
-	int i = 0;
-	int rc = 0;
-	char buf[100];
-	int buflen = sizeof(buf);
-#define TOPIC_COUNT 2
-
-	int msgid = 23;
-	int count = TOPIC_COUNT;
-	int granted_qoss[TOPIC_COUNT] = {2, 1};
-;
-	int msgid2 = 2223;
-	int count2 = 0;
-	int granted_qoss2[TOPIC_COUNT] = {0, 0};
-
-	fprintf(xml, "<testcase classname=\"test1\" name=\"de/serialization\"");
-	global_start_time = start_clock();
-	failures = 0;
-	MyLog(LOGA_INFO, "Starting test 4 - serialization of suback and back");
-
-	rc = MQTTSerialize_suback(buf, buflen, msgid, count, granted_qoss);
-	assert("good rc from serialize suback", rc > 0, "rc was %d\n", rc);
-
-	rc = MQTTDeserialize_suback(&msgid2, 2, &count2, granted_qoss2, buf, buflen);
-	assert("good rc from deserialize suback", rc == 1, "rc was %d\n", rc);
-
-	/* data after should be the same as data before */
-	assert("msgids should be the same", msgid == msgid2, "msgids were different %d\n", msgid2);
-
-	assert("count should be the same", count == count2, "counts were different %d\n", count2);
-
-	for (i = 0; i < count2; ++i)
-		assert("qoss should be the same", granted_qoss[i] == granted_qoss2[i], "qoss were different %d\n", granted_qoss2[i]);
-
-/* exit: */
-	MyLog(LOGA_INFO, "TEST4: test %s. %d tests run, %d failures.",
-			(failures == 0) ? "passed" : "failed", tests, failures);
-	write_test_result();
-	return failures;
-}
-
-
 int test5(struct Options options)
 {
-	int i = 0;
 	int rc = 0;
-	char buf[100];
+	unsigned char buf[100];
-	int buflen = sizeof(buf);
+	size_t buflen = sizeof(buf);
-#define TOPIC_COUNT 2
 
-	int dup = 0;
+	unsigned short packetid = 23;
-	int msgid = 23;
+	MQTTSN_topicid topicFilter;
-	int count = TOPIC_COUNT;
-	MQTTString topicStrings[TOPIC_COUNT] = { MQTTString_initializer, MQTTString_initializer };
 
-	int dup2 = 1;
+	unsigned short packetid2 = 2223;
-	int msgid2 = 2223;
+	MQTTSN_topicid topicFilter2;
-	int count2 = 0;
-	MQTTString topicStrings2[TOPIC_COUNT] = { MQTTString_initializer, MQTTString_initializer };
 
-	fprintf(xml, "<testcase classname=\"test1\" name=\"de/serialization\"");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"de/serialization\"");
 	global_start_time = start_clock();
 	failures = 0;
-	MyLog(LOGA_INFO, "Starting test 2 - serialization of unsubscribe and back");
+	MyLog(LOGA_INFO, "Starting test 4 - serialization of unsubscribe and back");
 
-	topicStrings[0].cstring = "mytopic";
+	memset(&topicFilter, '\0', sizeof(topicFilter));
-	topicStrings[1].cstring = "mytopic2";
+	memset(&topicFilter2, '\0', sizeof(topicFilter2));
-	rc = MQTTSerialize_unsubscribe(buf, buflen, dup, msgid, count, topicStrings);
+	topicFilter.type = MQTTSN_TOPIC_TYPE_NORMAL;
+	topicFilter.data.long_.name = "mytopic";
+	topicFilter.data.long_.len = strlen(topicFilter.data.long_.name);
+	rc = MQTTSNSerialize_unsubscribe(buf, buflen, packetid, &topicFilter);
 	assert("good rc from serialize unsubscribe", rc > 0, "rc was %d\n", rc);
 
-	rc = MQTTDeserialize_unsubscribe(&dup2, &msgid2, 2, &count2, topicStrings2, buf, buflen);
+	rc = MQTTSNDeserialize_unsubscribe(&packetid2, &topicFilter2, buf, buflen);
 	assert("good rc from deserialize unsubscribe", rc == 1, "rc was %d\n", rc);
 
 	/* data after should be the same as data before */
-	assert("dups should be the same", dup == dup2, "dups were different %d\n", dup2);
+	assert("msgids should be the same", packetid == packetid2, "packetids were different %d\n", packetid2);
-	assert("msgids should be the same", msgid == msgid2, "msgids were different %d\n", msgid2);
 
-	assert("count should be the same", count == count2, "counts were different %d\n", count2);
-
-	for (i = 0; i < count2; ++i)
 	assert("topics should be the same",
-					checkMQTTStrings(topicStrings[i], topicStrings2[i]), "topics were different %s\n", "");
+					checkMQTTSNTopics(topicFilter, topicFilter2), "topics were different %s\n", "");
 
-/* exit: */
+/*exit:*/
 	MyLog(LOGA_INFO, "TEST5: test %s. %d tests run, %d failures.",
 			(failures == 0) ? "passed" : "failed", tests, failures);
 	write_test_result();
 	return failures;
 }
-#endif
 
 
 int test6(struct Options options)
@@ -758,10 +707,75 @@ int test6(struct Options options)
 }
 
 
+int test7(struct Options options)
+{
+	int rc = 0;
+	unsigned char buf[100];
+	int buflen = sizeof(buf);
+	unsigned short packetid = 255, packetid2 = 0;
+	int qos = 2, qos2 = 0;
+	unsigned short topicid = 233, topicid2 = 0;
+	unsigned char return_code = 32, return_code2 = 0;
+
+	fprintf(xml, "<testcase classname=\"test7\" name=\"de/serialization\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 6 - serialization of suback and back");
+
+	rc = MQTTSNSerialize_suback(buf, buflen, qos, topicid, packetid, return_code);
+	assert("good rc from serialize suback", rc > 0, "rc was %d\n", rc);
+
+	rc = MQTTSNDeserialize_suback(&qos2, &topicid2, &packetid2, &return_code2, buf, buflen);
+	assert("good rc from deserialize suback", rc == 1, "rc was %d\n", rc);
+
+	assert("packetids should be the same", packetid == packetid2, "packetids were different %d\n", packetid2);
+	assert("qoss should be the same", qos == qos2, "qoss were different %d\n", qos2);
+	assert("topicids should be the same", topicid == topicid2, "topicids were different %d\n", topicid2);
+	assert("return codes should be the same", return_code == return_code2, "return codes were different %d\n", return_code2);
+
+/* exit: */
+	MyLog(LOGA_INFO, "TEST7: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int test8(struct Options options)
+{
+	int rc = 0;
+	unsigned char buf[100];
+	int buflen = sizeof(buf);
+	unsigned short packetid = 255, packetid2 = 0;
+
+	fprintf(xml, "<testcase classname=\"test8\" name=\"de/serialization\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 6 - serialization of unsuback and back");
+
+	rc = MQTTSNSerialize_unsuback(buf, buflen, packetid);
+	assert("good rc from serialize unsuback", rc > 0, "rc was %d\n", rc);
+
+	rc = MQTTSNDeserialize_unsuback(&packetid2, buf, buflen);
+	assert("good rc from deserialize unsuback", rc == 1, "rc was %d\n", rc);
+
+	assert("packetids should be the same", packetid == packetid2, "packetids were different %d\n", packetid2);
+
+/* exit: */
+	MyLog(LOGA_INFO, "TEST8: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+
+
 int main(int argc, char** argv)
 {
 	int rc = 0;
- 	int (*tests[])() = {NULL, test1, test2, test3, test4, test6};
+ 	int (*tests[])() = {NULL, test1, test2, test3, test4, test5, test6, test7};
 
 	xml = fopen("TEST-test1.xml", "w");
 	fprintf(xml, "<testsuite name=\"test1\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));