Make sure packets are retried on reconnect

Bug: 442400

src/MQTTAsync.c

@@ -1428,7 +1428,6 @@ int MQTTAsync_completeConnection(MQTTAsyncs* m, MQTTPacket* pack)
 				rc = MQTTAsync_cleanSession(m->c);
 			if (m->c->outboundMsgs->count > 0)
 			{
-				time_t now;
 				ListElement* outcurrent = NULL;
 
 				while (ListNextElement(m->c->outboundMsgs, &outcurrent))
@@ -1436,8 +1435,7 @@ int MQTTAsync_completeConnection(MQTTAsyncs* m, MQTTPacket* pack)
 					Messages* m = (Messages*)(outcurrent->content);
 					m->lastTouch = 0;
 				}
-				time(&(now));
-				MQTTProtocol_retry(now, 1);
+				MQTTProtocol_retry((time_t)0, 1);
 				if (m->c->connected != 1)
 					rc = MQTTASYNC_DISCONNECTED;
 			}

src/MQTTClient.c

@@ -896,7 +896,6 @@ int MQTTClient_connectURIVersion(MQTTClient handle, MQTTClient_connectOptions* o
 					rc = MQTTClient_cleanSession(m->c);
 				if (m->c->outboundMsgs->count > 0)
 				{
-					time_t now;
 					ListElement* outcurrent = NULL;
 
 					while (ListNextElement(m->c->outboundMsgs, &outcurrent))
@@ -904,8 +903,7 @@ int MQTTClient_connectURIVersion(MQTTClient handle, MQTTClient_connectOptions* o
 						Messages* m = (Messages*)(outcurrent->content);
 						m->lastTouch = 0;
 					}
-					time(&(now));
-					MQTTProtocol_retry(now, 1);
+					MQTTProtocol_retry((time_t)0, 1);
 					if (m->c->connected != 1)
 						rc = MQTTCLIENT_DISCONNECTED;
 				}

src/MQTTProtocolClient.c

@@ -556,7 +556,7 @@ void MQTTProtocol_retries(time_t now, Clients* client)
 
 	FUNC_ENTRY;
 
-	if (client->retryInterval <= 0) /* 0 or -ive retryInterval turns off retry */
+	if (now > (time_t)0 && client->retryInterval <= 0) /* 0 or -ive retryInterval turns off retry except on reconnect */
 		goto exit;
 
 	while (client && ListNextElement(client->outboundMsgs, &outcurrent) &&