Skip to content

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

Fix for bug #421103

parent 9e44c3eb
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
src/MQTTProtocolClient.c
View file @ 70ddbc7b
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
* Ian Craggs - initial API and implementation and/or initial documentation * Ian Craggs - initial API and implementation and/or initial documentation
* Ian Craggs, Allan Stockdill-Mander - SSL updates * Ian Craggs, Allan Stockdill-Mander - SSL updates
* Ian Craggs - fix for bug 413429 - connectionLost not called * Ian Craggs - fix for bug 413429 - connectionLost not called
* Ian Craggs - fix for bug 421103 - trying to write to same socket, in retry
*******************************************************************************/ *******************************************************************************/
/** /**
...@@ -556,7 +557,9 @@ void MQTTProtocol_retries(time_t now, Clients* client) ...@@ -556,7 +557,9 @@ void MQTTProtocol_retries(time_t now, Clients* client)
if (client->retryInterval <= 0) /* 0 or -ive retryInterval turns off retry */ if (client->retryInterval <= 0) /* 0 or -ive retryInterval turns off retry */
goto exit; goto exit;
while (client && ListNextElement(client->outboundMsgs, &outcurrent)) while (client && ListNextElement(client->outboundMsgs, &outcurrent) &&
client->connected && client->good && /* client is connected and has no errors */
Socket_noPendingWrites(client->net.socket)) /* there aren't any previous packets still stacked up on the socket */
{ {
Messages* m = (Messages*)(outcurrent->content); Messages* m = (Messages*)(outcurrent->content);
if (difftime(now, m->lastTouch) > max(client->retryInterval, 10)) if (difftime(now, m->lastTouch) > max(client->retryInterval, 10))
......
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