Commit eabca5bf authored by Ian Craggs's avatar Ian Craggs

Merge branch 'regression-check-vs-uncover-issue' of…

Merge branch 'regression-check-vs-uncover-issue' of https://github.com/JuergenKosel/paho.mqtt.c into fixes
parents d9c36aa8 45409c00
...@@ -1380,6 +1380,7 @@ static void MQTTAsync_checkTimeouts(void) ...@@ -1380,6 +1380,7 @@ static void MQTTAsync_checkTimeouts(void)
else else
{ {
MQTTAsync_closeSession(m->c); MQTTAsync_closeSession(m->c);
Log(TRACE_MIN, -1, "Connect failed with timeout, no to try");
if (m->connect.onFailure) if (m->connect.onFailure)
{ {
MQTTAsync_failureData data; MQTTAsync_failureData data;
...@@ -2027,11 +2028,11 @@ static void MQTTAsync_closeOnly(Clients* client) ...@@ -2027,11 +2028,11 @@ static void MQTTAsync_closeOnly(Clients* client)
SSLSocket_close(&client->net); SSLSocket_close(&client->net);
#endif #endif
Socket_close(client->net.socket); Socket_close(client->net.socket);
Thread_unlock_mutex(socket_mutex);
client->net.socket = 0; client->net.socket = 0;
#if defined(OPENSSL) #if defined(OPENSSL)
client->net.ssl = NULL; client->net.ssl = NULL;
#endif #endif
Thread_unlock_mutex(socket_mutex);
} }
client->connected = 0; client->connected = 0;
client->connect_state = 0; client->connect_state = 0;
...@@ -2913,6 +2914,7 @@ static MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc) ...@@ -2913,6 +2914,7 @@ static MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc)
m = (MQTTAsync)(handles->current->content); m = (MQTTAsync)(handles->current->content);
if (m != NULL) if (m != NULL)
{ {
Log(TRACE_MINIMUM, -1, "m->c->connect_state = %d",m->c->connect_state);
if (m->c->connect_state == 1 || m->c->connect_state == 2) if (m->c->connect_state == 1 || m->c->connect_state == 2)
*rc = MQTTAsync_connecting(m); *rc = MQTTAsync_connecting(m);
else else
...@@ -2949,6 +2951,11 @@ static MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc) ...@@ -2949,6 +2951,11 @@ static MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc)
MQTTAsync_startConnectRetry(m); MQTTAsync_startConnectRetry(m);
} }
} }
else
{
Log(TRACE_MINIMUM, -1, "m->c->connect_state = %d",m->c->connect_state);
Log(TRACE_MINIMUM, -1, "CONNECT sent, *rc is %d",*rc);
}
} }
if (pack) if (pack)
{ {
......
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