From 2e590a956476c1e04e486e0fb1a7f3982aa684c8 Mon Sep 17 00:00:00 2001
From: CIPop <Cristian.Pop@microsoft.com>
Date: Mon, 14 Aug 2023 23:22:19 +0000
Subject: [PATCH] Add side-by-side v3 and v5 test.

---
 MQTTPacket/src/MQTTPacketCommon.h |   7 +-
 MQTTPacket/test/CMakeLists.txt    |  28 +-
 MQTTPacket/test/test35.c          | 904 ++++++++++++++++++++++++++++++
 3 files changed, 933 insertions(+), 6 deletions(-)
 create mode 100644 MQTTPacket/test/test35.c

diff --git a/MQTTPacket/src/MQTTPacketCommon.h b/MQTTPacket/src/MQTTPacketCommon.h
index 1eb7ee8..3b4f4bf 100644
--- a/MQTTPacket/src/MQTTPacketCommon.h
+++ b/MQTTPacket/src/MQTTPacketCommon.h
@@ -43,10 +43,7 @@ enum msgTypes
 {
 	CONNECT = 1, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL,
 	PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK,
-	PINGREQ, PINGRESP, DISCONNECT
-#if defined(MQTTV5)
-  , AUTH
-#endif
+	PINGREQ, PINGRESP, DISCONNECT, AUTH
 };
 
 /**
@@ -118,7 +115,7 @@ typedef struct {
 	int rem_len;
 	int32_t len;
 	char state;
-}MQTTTransport;
+} MQTTTransport;
 
 int MQTTPacket_readnb(unsigned char* buf, int32_t buflen, MQTTTransport *trp);
 
diff --git a/MQTTPacket/test/CMakeLists.txt b/MQTTPacket/test/CMakeLists.txt
index a18ecc7..a607d97 100644
--- a/MQTTPacket/test/CMakeLists.txt
+++ b/MQTTPacket/test/CMakeLists.txt
@@ -87,4 +87,30 @@ ADD_TEST(
 SET_TESTS_PROPERTIES(
 	test3
 	PROPERTIES TIMEOUT 540
-)
\ No newline at end of file
+)
+
+ADD_EXECUTABLE(
+	test35
+	test35.c
+	../samples/transport.c
+)
+
+# Disabling deprecation warnings:
+#  warning: ‘ftime’ is deprecated [-Wdeprecated-declarations]
+target_compile_options(test35 PRIVATE -Wno-deprecated-declarations)
+
+TARGET_LINK_LIBRARIES(
+	test35
+	paho-embed-mqtt3c
+	paho-embed-mqtt5c
+)
+
+ADD_TEST(
+	NAME test35
+	COMMAND "test35" "--connection" ${MQTT_TEST_BROKER}
+)
+
+SET_TESTS_PROPERTIES(
+	test35
+	PROPERTIES TIMEOUT 540
+)
diff --git a/MQTTPacket/test/test35.c b/MQTTPacket/test/test35.c
new file mode 100644
index 0000000..77ce036
--- /dev/null
+++ b/MQTTPacket/test/test35.c
@@ -0,0 +1,904 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Microsoft Corporation. All rights reserved.
+ *
+ * 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.
+ *
+ *******************************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+//#include "MQTTPacket.h"
+#include "MQTTV5Packet.h"
+#include "transport.h"
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  	#include <sys/socket.h>
+	#include <unistd.h>
+  	#include <errno.h>
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#define MAXHOSTNAMELEN 256
+#define EAGAIN WSAEWOULDBLOCK
+#define EINTR WSAEINTR
+#define EINPROGRESS WSAEINPROGRESS
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define ENOTCONN WSAENOTCONN
+#define ECONNRESET WSAECONNRESET
+#endif
+
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+struct Options
+{
+	char* host;         /**< connection to system under test. */
+	int port;
+	int verbose;
+	int test_no;
+} options =
+{
+	"localhost",
+	1883,
+	0,
+	0,
+};
+
+void usage()
+{
+
+}
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--host") == 0)
+		{
+			if (++count < argc)
+			{
+				options.host = argv[count];
+				printf("\nSetting host to %s\n", options.host);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--port") == 0)
+		{
+			if (++count < argc)
+				options.port = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		count++;
+	}
+}
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result()
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+
+int test_v3(struct Options options) 
+{
+	MQTTPacket_connectData data = MQTTPacket_connectData_initializer;
+	int rc = 0;
+	unsigned char buf[200];
+	int buflen = sizeof(buf);
+	int mysock = 0;
+	MQTTString topicString = MQTTString_initializer;
+	char* payload = "mypayload";
+	int payloadlen = strlen(payload);
+	int len = 0;
+	MQTTProperties properties = MQTTProperties_initializer;
+	MQTTProperty props[10];
+	MQTTProperty one;
+	int msgid = 0;
+	char* test_topic = "MQTTV5/test/test3_topic";
+	int i = 0;
+
+	mysock = transport_open(options.host, options.port);
+	if(mysock < 0)
+		return mysock;
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"MQTTV5_scenario\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 1 - simple MQTT V5 scenario");
+
+	MyLog(LOGA_INFO, "Sending to hostname %s port %d", options.host, options.port);
+
+	data.clientID.cstring = "mqtt5_test3_test1";
+	data.keepAliveInterval = 20;
+	data.cleanstart = 1;
+	data.username.cstring = "testuser";
+	data.password.cstring = "testpassword";
+	data.MQTTVersion = 5;
+
+	properties.max_count = 10;
+	properties.array = props;
+
+	one.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	one.value.integer4 = 45;
+	rc = MQTTProperties_add(&properties, &one);
+	assert("add properties rc should be 0",  rc == 0, "rc was different %d\n", rc);
+
+	one.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	one.value.string_pair.key.data = "user property name";
+	one.value.string_pair.key.len = strlen(one.value.string_pair.key.data);
+	one.value.string_pair.val.data = "user property value";
+	one.value.string_pair.val.len = strlen(one.value.string_pair.val.data);
+	rc = MQTTProperties_add(&properties, &one);
+	assert("add properties rc should be 0",  rc == 0, "rc was different %d\n", rc);
+
+	len = MQTTV5Serialize_connect((unsigned char *)buf, buflen, &data, &properties);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	/* wait for connack */
+	rc = MQTTPacket_read(buf, buflen, transport_getdata);
+	assert("Should receive connack", rc == CONNACK, "did not get connack %d\n", rc);
+	if (rc == CONNACK)
+	{
+		unsigned char sessionPresent, reasonCode;
+
+		rc = MQTTV5Deserialize_connack(&properties, &sessionPresent, &reasonCode, buf, buflen);
+
+		assert("rc should be 1", rc == 1, "rc was not 1 %d\n", rc);
+		assert("reasonCode should be 0", reasonCode == 0, "Unable to connect, return code %d\n", reasonCode);
+		assert("sessionPresent should be 0", sessionPresent == 0, "Session present was not 0 %d\n", sessionPresent);
+	}
+
+	/* subscribe */
+	properties.length = properties.count = 0; /* remove existing properties */
+	topicString.cstring = test_topic;
+	MQTTSubscribe_options opts = {0, 0, 0};
+	opts.noLocal = 0;
+	opts.retainAsPublished = 1;
+	opts.retainHandling = 2;
+	unsigned char req_qos = 2;
+
+	len = MQTTV5Serialize_subscribe(buf, buflen, 0, ++msgid, &properties, 1, &topicString, &req_qos, &opts);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for suback */
+	assert("Should receive suback", rc == SUBACK, "did not get suback %d\n", rc);
+	if (rc == SUBACK)
+	{
+		unsigned short submsgid = -1;
+		int subcount = 0;
+		unsigned char reasonCode = -1;
+
+		properties.length = properties.count = 0; /* remove existing properties */
+		rc = MQTTV5Deserialize_suback(&submsgid, &properties, 1, &subcount, &reasonCode, buf, buflen);
+
+		assert("rc should be 1", rc == 1, "rc was not 1 %d\n", rc);
+		assert("subcount should be 1", subcount == 1, "subcount was not 1 %d\n", subcount);
+		assert("submsgid should be msgid", submsgid == msgid, "submsgid was not msgid %d\n", submsgid);
+		assert("reasonCode should be req_qos", reasonCode == req_qos, "reasonCode was %d\n", reasonCode);
+	}
+
+	properties.length = properties.count = 0; /* remove existing properties */
+	one.identifier = MQTTPROPERTY_CODE_PAYLOAD_FORMAT_INDICATOR;
+	one.value.byte = 3;
+	rc = MQTTProperties_add(&properties, &one);
+
+	topicString.cstring = test_topic;
+	len = MQTTV5Serialize_publish(buf, buflen, 0, 0, 0, 0, topicString, &properties, (unsigned char *)payload, payloadlen);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for publish */
+	assert("Should receive publish", rc == PUBLISH, "did not get publish %d\n", rc);
+	if (rc == PUBLISH)
+	{
+		unsigned char* payload2;
+		MQTTString topicString2;
+		int payloadlen2 = 0;
+		unsigned char qos2 = -1;
+		unsigned char retained2 = 0, dup2 = 0;
+		unsigned short msgid2 = 999;
+
+		properties.length = properties.count = 0; /* remove existing properties */
+		rc = MQTTV5Deserialize_publish(&dup2, &qos2, &retained2, &msgid2, &topicString2,
+				&properties, &payload2, &payloadlen2, buf, buflen);
+
+		assert("rc should be 1", rc == 1, "rc was not 1 %d\n", rc);
+		assert("msgid2 should be unchanged", msgid2 == 999, "msgid was not unchanged %d\n", msgid2);
+		assert("retained2 should be 0", retained2 == 0, "retained2 was not 0 %d\n", retained2);
+		assert("topic should be test_topic", memcmp(topicString2.lenstring.data, test_topic, topicString2.lenstring.len) == 0,
+		       "topic was not test_topic %s\n", topicString2.cstring);
+	}
+
+	/* Publish QoS 1 this time */
+	topicString.cstring = test_topic;
+	len = MQTTV5Serialize_publish(buf, buflen, 0, 1, 0, ++msgid, topicString, &properties, (unsigned char *)payload, payloadlen);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+  i = 0;
+	while (i < 2)
+	{
+	  rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for publish and puback */
+		assert("Should receive publish or puback", rc == PUBACK || rc == PUBLISH, "did not get puback or publish %d\n", rc);
+	  if (rc == PUBLISH)
+	  {
+			unsigned char* payload2;
+			MQTTString topicString2;
+			int payloadlen2 = 0;
+			unsigned char qos2 = -1;
+			unsigned char retained2 = 0, dup2 = 0;
+			unsigned short msgid2 = 999;
+			static int pubcount = 0;
+
+			++pubcount;
+			assert("should get only 1 publish",  pubcount == 1, "pubcount %d\n", pubcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			rc = MQTTV5Deserialize_publish(&dup2, &qos2, &retained2, &msgid2, &topicString2,
+					&properties, &payload2, &payloadlen2, buf, buflen);
+
+			assert("qos should be 1", qos2 == 1, "qos was not 1 %d\n", qos2);
+
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Serialize_puback(buf, buflen, msgid2, 0, &properties);
+			rc = transport_sendPacketBuffer(mysock, buf, len);
+			assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+	  }
+	  else
+	  {
+			static int ackcount = 0;
+			unsigned short msgid2 = 999;
+			unsigned char packettype = 99, dup = 8;
+			unsigned char reasonCode;
+
+			ackcount++;
+			assert("should get only 1 puback", ackcount == 1, "ackcount %d\n", ackcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Deserialize_ack(&packettype, &dup, &msgid2, &reasonCode, &properties, buf, buflen);
+			assert("packettype should be PUBACK", packettype == PUBACK, "packettype was %d\n", packettype);
+		  assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+			assert("msgid should be msgid2", msgid == msgid2, "msgid was not msgid2 %d\n", msgid2);
+    }
+		++i;
+	}
+
+	/* Publish QoS 2 this time */
+	topicString.cstring = test_topic;
+	len = MQTTV5Serialize_publish(buf, buflen, 0, 2, 0, ++msgid, topicString, &properties, (unsigned char *)payload, payloadlen);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	i = 0;
+	while (i < 4)
+	{
+		static unsigned short pubmsgid = 999;
+
+		rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for publish, pubrel and pubcomp */
+		assert("Should receive publish, pubrec, pubrel or pubcomp", rc == PUBREC || rc == PUBREL || rc == PUBLISH || rc == PUBCOMP,
+		       "did not get pubrec, pubrel, pubcomp or publish %d\n", rc);
+		if (rc == PUBLISH)
+		{
+			unsigned char* payload2;
+			MQTTString topicString2;
+			int payloadlen2 = 0;
+			unsigned char qos2 = -1;
+			unsigned char retained2 = 0, dup2 = 0;
+			static int pubcount = 0;
+
+			++pubcount;
+			assert("should get only 1 publish",  pubcount == 1, "pubcount %d\n", pubcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			rc = MQTTV5Deserialize_publish(&dup2, &qos2, &retained2, &pubmsgid, &topicString2,
+					&properties, &payload2, &payloadlen2, buf, buflen);
+			assert("qos should be 2", qos2 == 2, "qos was not 2 %d\n", qos2);
+
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Serialize_pubrec(buf, buflen, pubmsgid, 0, &properties);
+			rc = transport_sendPacketBuffer(mysock, buf, len);
+			assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+		}
+		else if (rc == PUBREL)
+		{
+			unsigned char* payload2;
+			MQTTString topicString2;
+			unsigned char reasonCode = -1;
+			unsigned char dup2 = 0;
+			unsigned char packettype = 99;
+			unsigned short msgid2 = 999;
+			static int pubrelcount = 0;
+
+			++pubrelcount;
+			assert("should get only 1 pubrel",  pubrelcount == 1, "pubrelcount %d\n", pubrelcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Deserialize_ack(&packettype, &dup2, &msgid2, &reasonCode, &properties, buf, buflen);
+			assert("packettype should be PUBREL", packettype == PUBREL, "packettype was %d\n", packettype);
+			assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+			assert("pubmsgid should be msgid2", pubmsgid == msgid2, "pubmsgid was not msgid2 %d\n", msgid2);
+
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Serialize_pubcomp(buf, buflen, msgid2, 0, &properties);
+			rc = transport_sendPacketBuffer(mysock, buf, len);
+			assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+		}
+		else if (rc == PUBREC)
+		{
+			unsigned char* payload2;
+			MQTTString topicString2;
+			unsigned char reasonCode = -1;
+			unsigned char dup2 = 0;
+			unsigned short msgid2 = 999;
+			unsigned char packettype = 99;
+			static int pubreccount = 0;
+
+			++pubreccount;
+			assert("should get only 1 pubrec",  pubreccount == 1, "pubreccount %d\n", pubreccount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Deserialize_ack(&packettype, &dup2, &msgid2, &reasonCode, &properties, buf, buflen);
+			assert("packettype should be PUBREC", packettype == PUBREC, "packettype was %d\n", packettype);
+			assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+			assert("msgid should be msgid2", msgid == msgid2, "msgid was not msgid2 %d\n", msgid2);
+
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Serialize_pubrel(buf, buflen, 0, msgid2, 0, &properties);
+			rc = transport_sendPacketBuffer(mysock, buf, len);
+			assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+		}
+		else
+		{
+			static int pubcompcount = 0;
+			unsigned short msgid2 = 999;
+			unsigned char packettype = 99, dup = 8;
+			unsigned char reasonCode;
+
+			pubcompcount++;
+			assert("should get only 1 puback", pubcompcount == 1, "pubcompcount %d\n", pubcompcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Deserialize_ack(&packettype, &dup, &msgid2, &reasonCode, &properties, buf, buflen);
+			assert("packettype should be PUBCOMP", packettype == PUBCOMP, "packettype was %d\n", packettype);
+			assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+			assert("msgid should be msgid2", msgid == msgid2, "msgid was not msgid2 %d\n", msgid2);
+		}
+		++i;
+	}
+
+	/* unsubscribe */
+	properties.length = properties.count = 0; /* remove existing properties */
+	topicString.cstring = test_topic;
+	len = MQTTV5Serialize_unsubscribe(buf, buflen, 0, ++msgid, &properties, 1, &topicString);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for unsuback */
+	assert("Should receive unsuback", rc == UNSUBACK, "did not get unsuback %d\n", rc);
+	if (rc == UNSUBACK)
+	{
+		unsigned short unsubmsgid = 9999;
+		int unsubcount = 0;
+		unsigned char reasonCode = -1;
+
+		properties.length = properties.count = 0; /* remove existing properties */
+		rc = MQTTV5Deserialize_unsuback(&unsubmsgid, &properties, 1, &unsubcount, &reasonCode, buf, buflen);
+
+		assert("rc should be 1", rc == 1, "rc was not 1 %d\n", rc);
+		assert("unsubcount should be 1", unsubcount == 1, "unsubcount was not 1 %d\n", unsubcount);
+		assert("unsubmsgid should be msgid", unsubmsgid == msgid, "unsubmsgid was not msgid %d\n", unsubmsgid);
+		assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+	}
+
+	len = MQTTV5Serialize_disconnect(buf, buflen, 0, &properties);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+exit:
+	transport_close(mysock);
+
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;    
+
+    return 0;
+}
+
+int test_v5(struct Options options) 
+{
+	MQTTPacket_connectData data = MQTTPacket_connectData_initializer;
+	int rc = 0;
+	unsigned char buf[200];
+	int buflen = sizeof(buf);
+	int mysock = 0;
+	MQTTString topicString = MQTTString_initializer;
+	char* payload = "mypayload";
+	int payloadlen = strlen(payload);
+	int len = 0;
+	MQTTProperties properties = MQTTProperties_initializer;
+	MQTTProperty props[10];
+	MQTTProperty one;
+	int msgid = 0;
+	char* test_topic = "MQTTV5/test/test35_topic";
+	int i = 0;
+
+	mysock = transport_open(options.host, options.port);
+	if(mysock < 0)
+		return mysock;
+
+	fprintf(xml, "<testcase classname=\"test_v5\" name=\"MQTTV5_scenario\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 2 - simple MQTT V5 scenario");
+
+	MyLog(LOGA_INFO, "Sending to hostname %s port %d", options.host, options.port);
+
+	data.clientID.cstring = "mqtt5_test35_test_v5";
+	data.keepAliveInterval = 20;
+	data.cleanstart = 1;
+	data.username.cstring = "testuser";
+	data.password.cstring = "testpassword";
+	data.MQTTVersion = 5;
+
+	properties.max_count = 10;
+	properties.array = props;
+
+	one.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	one.value.integer4 = 45;
+	rc = MQTTProperties_add(&properties, &one);
+	assert("add properties rc should be 0",  rc == 0, "rc was different %d\n", rc);
+
+	one.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	one.value.string_pair.key.data = "user property name";
+	one.value.string_pair.key.len = strlen(one.value.string_pair.key.data);
+	one.value.string_pair.val.data = "user property value";
+	one.value.string_pair.val.len = strlen(one.value.string_pair.val.data);
+	rc = MQTTProperties_add(&properties, &one);
+	assert("add properties rc should be 0",  rc == 0, "rc was different %d\n", rc);
+
+	len = MQTTV5Serialize_connect((unsigned char *)buf, buflen, &data, &properties);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	/* wait for connack */
+	rc = MQTTPacket_read(buf, buflen, transport_getdata);
+	assert("Should receive connack", rc == CONNACK, "did not get connack %d\n", rc);
+	if (rc == CONNACK)
+	{
+		unsigned char sessionPresent, reasonCode;
+
+		rc = MQTTV5Deserialize_connack(&properties, &sessionPresent, &reasonCode, buf, buflen);
+
+		assert("rc should be 1", rc == 1, "rc was not 1 %d\n", rc);
+		assert("reasonCode should be 0", reasonCode == 0, "Unable to connect, return code %d\n", reasonCode);
+		assert("sessionPresent should be 0", sessionPresent == 0, "Session present was not 0 %d\n", sessionPresent);
+	}
+
+	/* subscribe */
+	properties.length = properties.count = 0; /* remove existing properties */
+	topicString.cstring = test_topic;
+	MQTTSubscribe_options opts = {0, 0, 0};
+	opts.noLocal = 0;
+	opts.retainAsPublished = 1;
+	opts.retainHandling = 2;
+	unsigned char req_qos = 2;
+
+	len = MQTTV5Serialize_subscribe(buf, buflen, 0, ++msgid, &properties, 1, &topicString, &req_qos, &opts);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for suback */
+	assert("Should receive suback", rc == SUBACK, "did not get suback %d\n", rc);
+	if (rc == SUBACK)
+	{
+		unsigned short submsgid = -1;
+		int subcount = 0;
+		unsigned char reasonCode = -1;
+
+		properties.length = properties.count = 0; /* remove existing properties */
+		rc = MQTTV5Deserialize_suback(&submsgid, &properties, 1, &subcount, &reasonCode, buf, buflen);
+
+		assert("rc should be 1", rc == 1, "rc was not 1 %d\n", rc);
+		assert("subcount should be 1", subcount == 1, "subcount was not 1 %d\n", subcount);
+		assert("submsgid should be msgid", submsgid == msgid, "submsgid was not msgid %d\n", submsgid);
+		assert("reasonCode should be req_qos", reasonCode == req_qos, "reasonCode was %d\n", reasonCode);
+	}
+
+	properties.length = properties.count = 0; /* remove existing properties */
+	one.identifier = MQTTPROPERTY_CODE_PAYLOAD_FORMAT_INDICATOR;
+	one.value.byte = 3;
+	rc = MQTTProperties_add(&properties, &one);
+
+	topicString.cstring = test_topic;
+	len = MQTTV5Serialize_publish(buf, buflen, 0, 0, 0, 0, topicString, &properties, (unsigned char *)payload, payloadlen);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for publish */
+	assert("Should receive publish", rc == PUBLISH, "did not get publish %d\n", rc);
+	if (rc == PUBLISH)
+	{
+		unsigned char* payload2;
+		MQTTString topicString2;
+		int payloadlen2 = 0;
+		unsigned char qos2 = -1;
+		unsigned char retained2 = 0, dup2 = 0;
+		unsigned short msgid2 = 999;
+
+		properties.length = properties.count = 0; /* remove existing properties */
+		rc = MQTTV5Deserialize_publish(&dup2, &qos2, &retained2, &msgid2, &topicString2,
+				&properties, &payload2, &payloadlen2, buf, buflen);
+
+		assert("rc should be 1", rc == 1, "rc was not 1 %d\n", rc);
+		assert("msgid2 should be unchanged", msgid2 == 999, "msgid was not unchanged %d\n", msgid2);
+		assert("retained2 should be 0", retained2 == 0, "retained2 was not 0 %d\n", retained2);
+		assert("topic should be test_topic", memcmp(topicString2.lenstring.data, test_topic, topicString2.lenstring.len) == 0,
+		       "topic was not test_topic %s\n", topicString2.cstring);
+	}
+
+	/* Publish QoS 1 this time */
+	topicString.cstring = test_topic;
+	len = MQTTV5Serialize_publish(buf, buflen, 0, 1, 0, ++msgid, topicString, &properties, (unsigned char *)payload, payloadlen);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+  i = 0;
+	while (i < 2)
+	{
+	  rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for publish and puback */
+		assert("Should receive publish or puback", rc == PUBACK || rc == PUBLISH, "did not get puback or publish %d\n", rc);
+	  if (rc == PUBLISH)
+	  {
+			unsigned char* payload2;
+			MQTTString topicString2;
+			int payloadlen2 = 0;
+			unsigned char qos2 = -1;
+			unsigned char retained2 = 0, dup2 = 0;
+			unsigned short msgid2 = 999;
+			static int pubcount = 0;
+
+			++pubcount;
+			assert("should get only 1 publish",  pubcount == 1, "pubcount %d\n", pubcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			rc = MQTTV5Deserialize_publish(&dup2, &qos2, &retained2, &msgid2, &topicString2,
+					&properties, &payload2, &payloadlen2, buf, buflen);
+
+			assert("qos should be 1", qos2 == 1, "qos was not 1 %d\n", qos2);
+
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Serialize_puback(buf, buflen, msgid2, 0, &properties);
+			rc = transport_sendPacketBuffer(mysock, buf, len);
+			assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+	  }
+	  else
+	  {
+			static int ackcount = 0;
+			unsigned short msgid2 = 999;
+			unsigned char packettype = 99, dup = 8;
+			unsigned char reasonCode;
+
+			ackcount++;
+			assert("should get only 1 puback", ackcount == 1, "ackcount %d\n", ackcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Deserialize_ack(&packettype, &dup, &msgid2, &reasonCode, &properties, buf, buflen);
+			assert("packettype should be PUBACK", packettype == PUBACK, "packettype was %d\n", packettype);
+		  assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+			assert("msgid should be msgid2", msgid == msgid2, "msgid was not msgid2 %d\n", msgid2);
+    }
+		++i;
+	}
+
+	/* Publish QoS 2 this time */
+	topicString.cstring = test_topic;
+	len = MQTTV5Serialize_publish(buf, buflen, 0, 2, 0, ++msgid, topicString, &properties, (unsigned char *)payload, payloadlen);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	i = 0;
+	while (i < 4)
+	{
+		static unsigned short pubmsgid = 999;
+
+		rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for publish, pubrel and pubcomp */
+		assert("Should receive publish, pubrec, pubrel or pubcomp", rc == PUBREC || rc == PUBREL || rc == PUBLISH || rc == PUBCOMP,
+		       "did not get pubrec, pubrel, pubcomp or publish %d\n", rc);
+		if (rc == PUBLISH)
+		{
+			unsigned char* payload2;
+			MQTTString topicString2;
+			int payloadlen2 = 0;
+			unsigned char qos2 = -1;
+			unsigned char retained2 = 0, dup2 = 0;
+			static int pubcount = 0;
+
+			++pubcount;
+			assert("should get only 1 publish",  pubcount == 1, "pubcount %d\n", pubcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			rc = MQTTV5Deserialize_publish(&dup2, &qos2, &retained2, &pubmsgid, &topicString2,
+					&properties, &payload2, &payloadlen2, buf, buflen);
+			assert("qos should be 2", qos2 == 2, "qos was not 2 %d\n", qos2);
+
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Serialize_pubrec(buf, buflen, pubmsgid, 0, &properties);
+			rc = transport_sendPacketBuffer(mysock, buf, len);
+			assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+		}
+		else if (rc == PUBREL)
+		{
+			unsigned char* payload2;
+			MQTTString topicString2;
+			unsigned char reasonCode = -1;
+			unsigned char dup2 = 0;
+			unsigned char packettype = 99;
+			unsigned short msgid2 = 999;
+			static int pubrelcount = 0;
+
+			++pubrelcount;
+			assert("should get only 1 pubrel",  pubrelcount == 1, "pubrelcount %d\n", pubrelcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Deserialize_ack(&packettype, &dup2, &msgid2, &reasonCode, &properties, buf, buflen);
+			assert("packettype should be PUBREL", packettype == PUBREL, "packettype was %d\n", packettype);
+			assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+			assert("pubmsgid should be msgid2", pubmsgid == msgid2, "pubmsgid was not msgid2 %d\n", msgid2);
+
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Serialize_pubcomp(buf, buflen, msgid2, 0, &properties);
+			rc = transport_sendPacketBuffer(mysock, buf, len);
+			assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+		}
+		else if (rc == PUBREC)
+		{
+			unsigned char* payload2;
+			MQTTString topicString2;
+			unsigned char reasonCode = -1;
+			unsigned char dup2 = 0;
+			unsigned short msgid2 = 999;
+			unsigned char packettype = 99;
+			static int pubreccount = 0;
+
+			++pubreccount;
+			assert("should get only 1 pubrec",  pubreccount == 1, "pubreccount %d\n", pubreccount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Deserialize_ack(&packettype, &dup2, &msgid2, &reasonCode, &properties, buf, buflen);
+			assert("packettype should be PUBREC", packettype == PUBREC, "packettype was %d\n", packettype);
+			assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+			assert("msgid should be msgid2", msgid == msgid2, "msgid was not msgid2 %d\n", msgid2);
+
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Serialize_pubrel(buf, buflen, 0, msgid2, 0, &properties);
+			rc = transport_sendPacketBuffer(mysock, buf, len);
+			assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+		}
+		else
+		{
+			static int pubcompcount = 0;
+			unsigned short msgid2 = 999;
+			unsigned char packettype = 99, dup = 8;
+			unsigned char reasonCode;
+
+			pubcompcount++;
+			assert("should get only 1 puback", pubcompcount == 1, "pubcompcount %d\n", pubcompcount);
+			properties.length = properties.count = 0; /* remove existing properties */
+			len = MQTTV5Deserialize_ack(&packettype, &dup, &msgid2, &reasonCode, &properties, buf, buflen);
+			assert("packettype should be PUBCOMP", packettype == PUBCOMP, "packettype was %d\n", packettype);
+			assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+			assert("msgid should be msgid2", msgid == msgid2, "msgid was not msgid2 %d\n", msgid2);
+		}
+		++i;
+	}
+
+	/* unsubscribe */
+	properties.length = properties.count = 0; /* remove existing properties */
+	topicString.cstring = test_topic;
+	len = MQTTV5Serialize_unsubscribe(buf, buflen, 0, ++msgid, &properties, 1, &topicString);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+	rc = MQTTPacket_read(buf, buflen, transport_getdata); /* wait for unsuback */
+	assert("Should receive unsuback", rc == UNSUBACK, "did not get unsuback %d\n", rc);
+	if (rc == UNSUBACK)
+	{
+		unsigned short unsubmsgid = 9999;
+		int unsubcount = 0;
+		unsigned char reasonCode = -1;
+
+		properties.length = properties.count = 0; /* remove existing properties */
+		rc = MQTTV5Deserialize_unsuback(&unsubmsgid, &properties, 1, &unsubcount, &reasonCode, buf, buflen);
+
+		assert("rc should be 1", rc == 1, "rc was not 1 %d\n", rc);
+		assert("unsubcount should be 1", unsubcount == 1, "unsubcount was not 1 %d\n", unsubcount);
+		assert("unsubmsgid should be msgid", unsubmsgid == msgid, "unsubmsgid was not msgid %d\n", unsubmsgid);
+		assert("reasonCode should be 0", reasonCode == 0, "reasonCode was %d\n", reasonCode);
+	}
+
+	len = MQTTV5Serialize_disconnect(buf, buflen, 0, &properties);
+	rc = transport_sendPacketBuffer(mysock, buf, len);
+	assert("rc and len should be the same",  rc == len, "rc was different %d\n", rc);
+
+exit:
+	transport_close(mysock);
+
+	MyLog(LOGA_INFO, "TEST1: 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[])(struct Options) = {NULL, test_v5};
+
+	xml = fopen("TEST-test35.xml", "w");
+	fprintf(xml, "<testsuite name=\"test35\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	getopts(argc, argv);
+
+ 	if (options.test_no == 0)
+	{ /* run all the tests */
+ 	   	for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+			rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+	}
+	else
+ 	   	rc = tests[options.test_no](options); /* run just the selected test */
+
+ 	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+	return rc;
+}