fix(server): Fix infinite loop when the discovery server cannot be re…

…ached
jpfr · Nov 14, 2023 · 8147cbd · 8147cbd
1 parent 9073ee2
commit 8147cbd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/server/ua_discovery.c b/src/server/ua_discovery.c
@@ -351,10 +351,12 @@ discoveryClientStateCallback(UA_Client *client,
 
         /* Connection fully closed */
         if(channelState == UA_SECURECHANNELSTATE_CLOSED) {
-            if(ar->shutdown)
+            if(!ar->connectSuccess || ar->shutdown) {
                 asyncRegisterRequest_clearAsync(ar); /* Clean up */
-            else
+            } else {
+                ar->connectSuccess = false;
                 __UA_Client_connect(client, true);   /* Reconnect */
+            }
         }
         return;
     }
@@ -363,6 +365,9 @@ discoveryClientStateCallback(UA_Client *client,
     if(channelState != UA_SECURECHANNELSTATE_OPEN)
         return;
 
+    /* We have at least succeeded to connect */
+    ar->connectSuccess = true;
+
     /* Is this the encrypted SecureChannel already? (We might have to wait for
      * the second connection after the FindServers handshake */
     UA_MessageSecurityMode msm = UA_MESSAGESECURITYMODE_INVALID;
@@ -499,6 +504,7 @@ UA_Server_register(UA_Server *server, UA_ClientConfig *cc, UA_Boolean unregister
 
     /* Connect asynchronously. The register service is called once the
      * connection is open. */
+    ar->connectSuccess = false;
     return __UA_Client_connect(ar->client, true);
 }
 

diff --git a/src/server/ua_discovery.h b/src/server/ua_discovery.h
@@ -38,6 +38,7 @@ typedef struct {
 
     UA_Boolean register2;
     UA_Boolean shutdown;
+    UA_Boolean connectSuccess;
 } asyncRegisterRequest;
 #define UA_MAXREGISTERREQUESTS 4