From eab1a71db2d10a4fc00eb4b2af6fd15ba4df04ef Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed, 27 Aug 2014 11:29:37 +0100
Subject: [PATCH] Keepalive timer fix Bug: 442683

---
 src/Clients.h            | 3 ++-
 src/MQTTAsync.c          | 9 +++++++--
 src/MQTTClient.c         | 6 ++++--
 src/MQTTPacket.c         | 6 ++++--
 src/MQTTProtocolClient.c | 6 ++++--
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/Clients.h b/src/Clients.h
index 853a7352..1b887b0b 100644
--- a/src/Clients.h
+++ b/src/Clients.h
@@ -149,7 +149,8 @@ BE*/
 typedef struct
 {
 	int socket;
-	time_t lastContact;
+	time_t lastSent;
+	time_t lastReceived;
 #if defined(OPENSSL)
 	SSL* ssl;
 	SSL_CTX* ctx;
diff --git a/src/MQTTAsync.c b/src/MQTTAsync.c
index 9e01d58c..eaeb86e6 100644
--- a/src/MQTTAsync.c
+++ b/src/MQTTAsync.c
@@ -886,7 +886,7 @@ void MQTTAsync_writeComplete(int socket)
 	{
 		MQTTAsyncs* m = (MQTTAsyncs*)(found->content);
 		
-		time(&(m->c->net.lastContact));
+		time(&(m->c->net.lastSent));
 				
 		/* see if there is a pending write flagged */
 		if (m->pending_write)
@@ -1428,13 +1428,16 @@ 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))
 				{
 					Messages* m = (Messages*)(outcurrent->content);
 					m->lastTouch = 0;
 				}
-				MQTTProtocol_retry(m->c->net.lastContact, 1);
+				time(&(now));
+				MQTTProtocol_retry(now, 1);
 				if (m->c->connected != 1)
 					rc = MQTTASYNC_DISCONNECTED;
 			}
@@ -2533,11 +2536,13 @@ MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc)
 		if (!tostop && *sock == 0 && (tp.tv_sec > 0L || tp.tv_usec > 0L))
 		{
 			MQTTAsync_sleep(100L);
+#if 0
 			if (s.clientsds->count == 0)
 			{
 				if (++nosockets_count == 50) /* 5 seconds with no sockets */
 					tostop = 1;
 			}
+#endif
 		}
 		else
 			nosockets_count = 0;
diff --git a/src/MQTTClient.c b/src/MQTTClient.c
index 2d00c2ba..db76347e 100644
--- a/src/MQTTClient.c
+++ b/src/MQTTClient.c
@@ -896,6 +896,7 @@ 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))
@@ -903,7 +904,8 @@ int MQTTClient_connectURIVersion(MQTTClient handle, MQTTClient_connectOptions* o
 						Messages* m = (Messages*)(outcurrent->content);
 						m->lastTouch = 0;
 					}
-					MQTTProtocol_retry(m->c->net.lastContact, 1);
+					time(&(now));
+					MQTTProtocol_retry(now, 1);
 					if (m->c->connected != 1)
 						rc = MQTTCLIENT_DISCONNECTED;
 				}
@@ -1957,7 +1959,7 @@ void MQTTClient_writeComplete(int socket)
 	{
 		MQTTClients* m = (MQTTClients*)(found->content);
 		
-		time(&(m->c->net.lastContact));			
+		time(&(m->c->net.lastSent));
 	}
 	FUNC_EXIT;
 }
diff --git a/src/MQTTPacket.c b/src/MQTTPacket.c
index cc500566..be8f80fb 100644
--- a/src/MQTTPacket.c
+++ b/src/MQTTPacket.c
@@ -156,6 +156,8 @@ void* MQTTPacket_Factory(networkHandles* net, int* error)
 #endif
 		}
 	}
+	if (pack)
+		time(&(net->lastReceived));
 exit:
 	FUNC_EXIT_RC(*error);
 	return pack;
@@ -197,7 +199,7 @@ int MQTTPacket_send(networkHandles* net, Header header, char* buffer, size_t buf
 		rc = Socket_putdatas(net->socket, buf, buf0len, 1, &buffer, &buflen, &free);
 		
 	if (rc == TCPSOCKET_COMPLETE)
-		time(&(net->lastContact));
+		time(&(net->lastSent));
 	
 	if (rc != TCPSOCKET_INTERRUPTED)
 	  free(buf);
@@ -244,7 +246,7 @@ int MQTTPacket_sends(networkHandles* net, Header header, int count, char** buffe
 		rc = Socket_putdatas(net->socket, buf, buf0len, count, buffers, buflens, frees);
 		
 	if (rc == TCPSOCKET_COMPLETE)
-		time(&(net->lastContact));
+		time(&(net->lastSent));
 	
 	if (rc != TCPSOCKET_INTERRUPTED)
 	  free(buf);
diff --git a/src/MQTTProtocolClient.c b/src/MQTTProtocolClient.c
index bc9f9aa6..1e4bc77e 100644
--- a/src/MQTTProtocolClient.c
+++ b/src/MQTTProtocolClient.c
@@ -514,7 +514,9 @@ void MQTTProtocol_keepalive(time_t now)
 	{
 		Clients* client =	(Clients*)(current->content);
 		ListNextElement(bstate->clients, &current); 
-		if (client->connected && client->keepAliveInterval > 0 && (difftime(now, client->net.lastContact) >= client->keepAliveInterval))
+		if (client->connected && client->keepAliveInterval > 0 &&
+			(difftime(now, client->net.lastSent) >= client->keepAliveInterval ||
+					difftime(now, client->net.lastReceived) >= client->keepAliveInterval))
 		{
 			if (client->ping_outstanding == 0)
 			{
@@ -527,7 +529,7 @@ void MQTTProtocol_keepalive(time_t now)
 					}
 					else
 					{
-						client->net.lastContact = now;
+						client->net.lastSent = now;
 						client->ping_outstanding = 1;
 					}
 				}