Skip to content

P
paho.mqtt.c
Commit 3c693508 authored by Ryan Pendleton's avatar Ryan Pendleton
Browse files
Options

rearrange timeout checks, fixes issue #145 

Signed-off-by: 's avatarRyan Pendleton <me@ryanp.me>
parent 83cc318c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
src/MQTTAsync.c
View file @ 3c693508
...@@ -1322,8 +1322,11 @@ void MQTTAsync_checkTimeouts() ...@@ -1322,8 +1322,11 @@ void MQTTAsync_checkTimeouts()
MQTTAsyncs* m = (MQTTAsyncs*)(current->content); MQTTAsyncs* m = (MQTTAsyncs*)(current->content);
/* check disconnect timeout */
if (m->c->connect_state == -2)
MQTTAsync_checkDisconnect(m, &m->disconnect);
/* check connect timeout */ /* check connect timeout */
if (m->c->connect_state != 0 && MQTTAsync_elapsed(m->connect.start_time) > (m->connectTimeout * 1000)) else if (m->c->connect_state != 0 && MQTTAsync_elapsed(m->connect.start_time) > (m->connectTimeout * 1000))
{ {
if (MQTTAsync_checkConn(&m->connect, m)) if (MQTTAsync_checkConn(&m->connect, m))
{ {
...@@ -1356,10 +1359,6 @@ void MQTTAsync_checkTimeouts() ...@@ -1356,10 +1359,6 @@ void MQTTAsync_checkTimeouts()
continue; continue;
} }
/* check disconnect timeout */
if (m->c->connect_state == -2)
MQTTAsync_checkDisconnect(m, &m->disconnect);
timed_out_count = 0; timed_out_count = 0;
/* check response timeouts */ /* check response timeouts */
while (ListNextElement(m->responses, &cur_response)) while (ListNextElement(m->responses, &cur_response))
......
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