Fixes for clients that disconnect very quickly.

11 years ago · 1257fd49eb
parent fd9496433c
commit 1257fd49eb
2 changed files with 4 additions and 2 deletions
--- a/lib/mosquitto.c
+++ b/lib/mosquitto.c
@ -936,7 +936,7 @@ int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
 			if (reconnects !=0 && rc == MOSQ_ERR_SUCCESS){
 				reconnects = 0;
 			}
-		}while(rc == MOSQ_ERR_SUCCESS);
+		}while(run && rc == MOSQ_ERR_SUCCESS);
 		if(errno == EPROTO){
 			return rc;
 		}
--- a/lib/read_handle_client.c
+++ b/lib/read_handle_client.c
@ -43,7 +43,9 @@ int _mosquitto_handle_connack(struct mosquitto *mosq)
 	pthread_mutex_unlock(&mosq->callback_mutex);
 	switch(result){
 		case 0:
-			mosq->state = mosq_cs_connected;
+			if(mosq->state != mosq_cs_disconnecting){
+				mosq->state = mosq_cs_connected;
+			}
 			return MOSQ_ERR_SUCCESS;
 		case 1:
 		case 2: