Merge branch 'fix-backoff' of git://github.com/abiliojr/mosquitto into abiliojr-fix-backoff

This commit is contained in:
Roger A. Light 2021-03-11 14:01:47 +00:00
commit 4b0a4c5c08

View File

@ -314,10 +314,8 @@ int bridge__connect_step3(struct mosquitto *context)
rc = send__connect(context, context->keepalive, context->clean_start, NULL);
if(rc == MOSQ_ERR_SUCCESS){
bridge__backoff_reset(context);
return MOSQ_ERR_SUCCESS;
}else if(rc == MOSQ_ERR_ERRNO && errno == ENOTCONN){
bridge__backoff_reset(context);
return MOSQ_ERR_SUCCESS;
}else{
if(rc == MOSQ_ERR_TLS){
@ -455,10 +453,8 @@ int bridge__connect(struct mosquitto *context)
rc2 = send__connect(context, context->keepalive, context->clean_start, NULL);
if(rc2 == MOSQ_ERR_SUCCESS){
bridge__backoff_reset(context);
return rc;
}else if(rc2 == MOSQ_ERR_ERRNO && errno == ENOTCONN){
bridge__backoff_reset(context);
return MOSQ_ERR_SUCCESS;
}else{
if(rc2 == MOSQ_ERR_TLS){
@ -563,6 +559,8 @@ int bridge__on_connect(struct mosquitto *context)
}
}
bridge__backoff_reset(context);
return MOSQ_ERR_SUCCESS;
}