Merge branch 'fix-backoff' of git:https://github.com/abiliojr/mosquitto int…

…o abiliojr-fix-backoff
eclipse · Mar 11, 2021 · 4b0a4c5 · 4b0a4c5
2 parents c11a2d5 + 2a38b71
commit 4b0a4c5
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/bridge.c b/src/bridge.c
@@ -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;
 }