Add offline buffering test, and reconnect function

Author: Ian Craggs

Makefile

@@ -96,7 +96,7 @@ SYNC_TESTS = ${addprefix ${blddir}/test/,${TEST_FILES_C}}
 TEST_FILES_CS = test3
 SYNC_SSL_TESTS = ${addprefix ${blddir}/test/,${TEST_FILES_CS}}
 
-TEST_FILES_A = test4 test_mqtt4async
+TEST_FILES_A = test4 test9 test_mqtt4async
 ASYNC_TESTS = ${addprefix ${blddir}/test/,${TEST_FILES_A}}
 
 TEST_FILES_AS = test5

build.xml

@@ -82,14 +82,18 @@
   </target>
 
   <target name="test" >
+    <exec executable="python3" dir="test" spawn="true"> 
+        <arg value="mqttsas.py" />
+        <arg value="${test.hostname}" />
+    </exec>
     <if>
       <os family="windows"/>
     <then>
 		<!-- TODO: build test2 for windows -->
     	<foreach target="runAtest" param="aTest" list="test1,test4"/>
-	</then>
+	  </then>
     <else>
-	    <foreach target="runAtest" param="aTest" list="test1,test2,test4"/>
+	    <foreach target="runAtest" param="aTest" list="test9,test1,test2,test4"/>
     </else>
     </if>
     <foreach target="runSSLtest" param="aTest" list="test3,test5"/>

src/MQTTAsync.c

@@ -858,15 +858,31 @@ int MQTTAsync_reconnect(MQTTAsync handle)
 	FUNC_ENTRY;
 	MQTTAsync_lock_mutex(mqttasync_mutex);
 
-	if (m->automaticReconnect && m->shouldBeConnected)
-	{
-		m->reconnectNow = 1;
-		if (m->retrying == 0)
-		{
-			m->currentInterval = m->minRetryInterval;
-			m->retrying = 1;
+	if (m->automaticReconnect) 
+	{
+    if (m->shouldBeConnected)
+    {
+		  m->reconnectNow = 1;
+	  	if (m->retrying == 0)
+	  	{
+	  		m->currentInterval = m->minRetryInterval;
+	  		m->retrying = 1;
+	  	}
+	  	rc = MQTTASYNC_SUCCESS;
 		}
-		rc = MQTTASYNC_SUCCESS;
+	}
+	else
+	{
+    /* to reconnect, put the connect command to the head of the command queue */
+		MQTTAsync_queuedCommand* conn = malloc(sizeof(MQTTAsync_queuedCommand));
+		memset(conn, '\0', sizeof(MQTTAsync_queuedCommand));
+		conn->client = m;
+		conn->command = m->connect;
+		/* make sure that the version attempts are restarted */
+		if (m->c->MQTTVersion == MQTTVERSION_DEFAULT) 
+  		conn->command.details.conn.MQTTVersion = 0;
+		MQTTAsync_addCommand(conn, sizeof(m->connect));
+  	rc = MQTTASYNC_SUCCESS;
 	}
 
 	MQTTAsync_unlock_mutex(mqttasync_mutex);
@@ -1367,11 +1383,14 @@ void MQTTAsync_checkTimeouts()
 		{
 			if (m->reconnectNow || MQTTAsync_elapsed(m->lastConnectionFailedTime) > (m->currentInterval * 1000))
 			{
-				/* put the connect command to the head of the command queue, using the next serverURI */
+				/* to reconnect put the connect command to the head of the command queue */
 				MQTTAsync_queuedCommand* conn = malloc(sizeof(MQTTAsync_queuedCommand));
 				memset(conn, '\0', sizeof(MQTTAsync_queuedCommand));
 				conn->client = m;
 				conn->command = m->connect;
+  			/* make sure that the version attempts are restarted */
+    		if (m->c->MQTTVersion == MQTTVERSION_DEFAULT) 
+      		conn->command.details.conn.MQTTVersion = 0;
 				Log(TRACE_MIN, -1, "Automatically attempting to reconnect");
 				MQTTAsync_addCommand(conn, sizeof(m->connect));
 				m->reconnectNow = 0;

src/MQTTAsync.h

@@ -465,7 +465,7 @@ DLLExport int MQTTAsync_setCallbacks(MQTTAsync handle, void* context, MQTTAsync_
 DLLExport int MQTTAsync_setConnected(MQTTAsync handle, void* context, MQTTAsync_connected* co);
 
 
-
+DLLExport int MQTTAsync_reconnect(MQTTAsync handle);
 
 
 /**
@@ -755,8 +755,8 @@ typedef struct
 } MQTTAsync_connectOptions;
 
 
-#define MQTTAsync_connectOptions_initializer { {'M', 'Q', 'T', 'C'}, 4, 60, 1, 10, NULL, NULL, NULL, 30, 0, NULL, NULL, NULL, NULL, 0, NULL, 0, \
-	0, 1, 60}
+#define MQTTAsync_connectOptions_initializer { {'M', 'Q', 'T', 'C'}, 4, 60, 1, 10, NULL, NULL, NULL, 30, 0,\
+NULL, NULL, NULL, NULL, 0, NULL, 0, 0, 1, 60}
 
 /**
   * This function attempts to connect a previously-created client (see