fix: MQTT timeout logic

Seeed-Studio · Nov 14, 2023 · b8d8b03 · b8d8b03
1 parent 91da055
commit b8d8b03
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 12 deletions.
diff --git a/sscma/callback/mqtt.hpp b/sscma/callback/mqtt.hpp
@@ -120,7 +120,7 @@ void set_mqtt_server(const std::vector<std::string>& argv, bool has_reply = true
             goto Reply;
     }
 
-    // if the MQTT server is connected, disconnect it
+    // // if the MQTT server is connected, disconnect it
     // while (--conn_retry && static_resource->network->status() == NETWORK_CONNECTED) {
     //     // TODO: driver add disconnect API
     //     ret = static_resource->network->disconnect();
@@ -130,11 +130,13 @@ void set_mqtt_server(const std::vector<std::string>& argv, bool has_reply = true
     //     }
     //     while (--poll_retry && static_resource->network->status() == NETWORK_CONNECTED)
     //         el_sleep(SSCMA_MQTT_CONN_DELAY_MS);
+    //     if (poll_retry <= 0) [[unlikely]] {
+    //         ret = EL_ETIMOUT;
+    //         goto Reply;
+    //     }
     //     break;
     // }
-
-    // check if the MQTT server is disconnected again, if not, return IO error
-    // ret = static_resource->network->status() == NETWORK_JOINED ? EL_OK : EL_EIO;
+    // ret = conn_retry >= 0 ? EL_OK : EL_ETIMOUT;
     // if (ret != EL_OK) [[unlikely]]
     //     goto Reply;
 
@@ -157,8 +159,15 @@ void set_mqtt_server(const std::vector<std::string>& argv, bool has_reply = true
         // wait for the MQTT server to be connected
         while (--poll_retry && static_resource->network->status() != NETWORK_CONNECTED)
             el_sleep(SSCMA_MQTT_CONN_DELAY_MS);
-        break;
+        if (poll_retry <= 0) [[unlikely]] {
+            ret = EL_ETIMOUT;
+            goto Reply;
+        }
+        break;  // break if the MQTT server is connected
     }
+    ret = conn_retry >= 0 ? EL_OK : EL_ETIMOUT;
+    if (ret != EL_OK) [[unlikely]]
+        goto Reply;
 
     // chain setup MQTT server publish and subscribe topic (skip checking if the MQTT server is connected)
     {

diff --git a/sscma/callback/network.hpp b/sscma/callback/network.hpp
@@ -35,8 +35,8 @@ void set_wireless_network(const std::vector<std::string>& argv, bool has_reply =
     // check if the network is idle (or ready to connect)
     while (--conn_retry && static_resource->network->status() != NETWORK_IDLE) {
         // check if the network is connected
-        while (static_resource->network->status() == NETWORK_JOINED ||
-               static_resource->network->status() == NETWORK_CONNECTED) {
+        while (--conn_retry && (static_resource->network->status() == NETWORK_JOINED ||
+                                static_resource->network->status() == NETWORK_CONNECTED)) {
             // disconnect the network if joined or connected (an unsubscribe all API is needed)
             ret = static_resource->network->quit();
             if (ret != EL_OK) [[unlikely]] {
@@ -48,6 +48,10 @@ void set_wireless_network(const std::vector<std::string>& argv, bool has_reply =
             while (--poll_retry && (static_resource->network->status() == NETWORK_JOINED ||
                                     static_resource->network->status() == NETWORK_CONNECTED))
                 el_sleep(SSCMA_WIRELESS_NETWORK_CONN_DELAY_MS);
+            if (poll_retry <= 0) [[unlikely]] {
+                ret = EL_ETIMOUT;
+                goto Reply;
+            }
             break;  // break if the network is disconnected
         }
 
@@ -57,6 +61,9 @@ void set_wireless_network(const std::vector<std::string>& argv, bool has_reply =
             el_sleep(SSCMA_WIRELESS_NETWORK_CONN_DELAY_MS);
         }
     }
+    ret = conn_retry >= 0 ? EL_OK : EL_ETIMOUT;
+    if (ret != EL_OK) [[unlikely]]
+        goto Reply;
 
     // check if the network is idle again, if not, return IO error
     ret = static_resource->network->status() == NETWORK_IDLE ? EL_OK : EL_EIO;
@@ -82,8 +89,15 @@ void set_wireless_network(const std::vector<std::string>& argv, bool has_reply =
         // wait for the network to be joined
         while (--poll_retry && static_resource->network->status() != NETWORK_JOINED)
             el_sleep(SSCMA_WIRELESS_NETWORK_CONN_DELAY_MS);
-        break;
+        if (poll_retry <= 0) [[unlikely]] {
+            ret = EL_ETIMOUT;
+            goto Reply;
+        }
+        break;  // break if the network is joined
     }
+    ret = conn_retry >= 0 ? EL_OK : EL_ETIMOUT;
+    if (ret != EL_OK) [[unlikely]]
+        goto Reply;
 
     // chain setup MQTT server (skip checking if the network is joined)
     {

diff --git a/sscma/definations.hpp b/sscma/definations.hpp
@@ -35,12 +35,12 @@
 
 #define SSCMA_WIRELESS_NETWORK_NAME_LEN      32
 #define SSCMA_WIRELESS_NETWORK_PASSWD_LEN    64
-#define SSCMA_WIRELESS_NETWORK_CONN_RETRY    5
-#define SSCMA_WIRELESS_NETWORK_POLL_RERTY    5
+#define SSCMA_WIRELESS_NETWORK_CONN_RETRY    10
+#define SSCMA_WIRELESS_NETWORK_POLL_RERTY    10
 #define SSCMA_WIRELESS_NETWORK_CONN_DELAY_MS 100
 
-#define SSCMA_MQTT_CONN_RETRY                5
-#define SSCMA_MQTT_POLL_RETRY                5
+#define SSCMA_MQTT_CONN_RETRY                10
+#define SSCMA_MQTT_POLL_RETRY                10
 #define SSCMA_MQTT_CONN_DELAY_MS             100
 #define SSCMA_MQTT_CLIENT_ID_LEN             32
 #define SSCMA_MQTT_ADDRESS_LEN               128