Skip to content

P
paho.mqtt.c
Commit 24057319 authored by Ian Craggs's avatar Ian Craggs
Browse files
Options

Fix for bug 472250, https://github.com/eclipse/paho.mqtt.c/issues/29 

Bug: 472250
parent c251a201
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 3 deletions
src/MQTTAsync.c
View file @ 24057319
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
* Ian Craggs - fix for bug 444103 - success/failure callbacks not invoked * Ian Craggs - fix for bug 444103 - success/failure callbacks not invoked
* Ian Craggs - fix for bug 484363 - segfault in getReadySocket * Ian Craggs - fix for bug 484363 - segfault in getReadySocket
* Ian Craggs - automatic reconnect and offline buffering (send while disconnected) * Ian Craggs - automatic reconnect and offline buffering (send while disconnected)
* Ian Craggs - fix for bug 472250
*******************************************************************************/ *******************************************************************************/
/** /**
...@@ -1322,8 +1323,13 @@ void MQTTAsync_checkTimeouts() ...@@ -1322,8 +1323,13 @@ void MQTTAsync_checkTimeouts()
MQTTAsync_freeConnect(m->connect); MQTTAsync_freeConnect(m->connect);
if (m->connect.onFailure) if (m->connect.onFailure)
{ {
MQTTAsync_failureData data;
data.token = 0;
data.code = MQTTASYNC_FAILURE;
data.message = "TCP connect timeout";
Log(TRACE_MIN, -1, "Calling connect failure for client %s", m->c->clientID); Log(TRACE_MIN, -1, "Calling connect failure for client %s", m->c->clientID);
(*(m->connect.onFailure))(m->connect.context, NULL); (*(m->connect.onFailure))(m->connect.context, &data);
} }
MQTTAsync_startConnectRetry(m); MQTTAsync_startConnectRetry(m);
} }
...@@ -2739,8 +2745,13 @@ exit: ...@@ -2739,8 +2745,13 @@ exit:
MQTTAsync_freeConnect(m->connect); MQTTAsync_freeConnect(m->connect);
if (m->connect.onFailure) if (m->connect.onFailure)
{ {
MQTTAsync_failureData data;
data.token = 0;
data.code = MQTTASYNC_FAILURE;
data.message = "TCP/TLS connect failure";
Log(TRACE_MIN, -1, "Calling connect failure for client %s", m->c->clientID); Log(TRACE_MIN, -1, "Calling connect failure for client %s", m->c->clientID);
(*(m->connect.onFailure))(m->connect.context, NULL); (*(m->connect.onFailure))(m->connect.context, &data);
} }
MQTTAsync_startConnectRetry(m); MQTTAsync_startConnectRetry(m);
} }
...@@ -2810,8 +2821,13 @@ MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc) ...@@ -2810,8 +2821,13 @@ MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc)
MQTTAsync_freeConnect(m->connect); MQTTAsync_freeConnect(m->connect);
if (m->connect.onFailure) if (m->connect.onFailure)
{ {
MQTTAsync_failureData data;
data.token = 0;
data.code = MQTTASYNC_FAILURE;
data.message = "TCP connect completion failure";
Log(TRACE_MIN, -1, "Calling connect failure for client %s", m->c->clientID); Log(TRACE_MIN, -1, "Calling connect failure for client %s", m->c->clientID);
(*(m->connect.onFailure))(m->connect.context, NULL); (*(m->connect.onFailure))(m->connect.context, &data);
} }
MQTTAsync_startConnectRetry(m); MQTTAsync_startConnectRetry(m);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment