fix: GSMConnectionHandler stuck in ERROR state if connection lost (out of range)

eigen-value · eigen-value · commit 13f5954daa7f · 2026-03-23T19:12:59.000+01:00
diff --git a/src/CatM1ConnectionHandler.cpp b/src/CatM1ConnectionHandler.cpp
@@ -153,4 +153,8 @@ NetworkConnectionState CatM1ConnectionHandler::update_handleDisconnected()
   }
 }
 
+NetworkConnectionState CatM1ConnectionHandler::update_handleError() {
+  return NetworkConnectionState::ERROR;
+}
+
 #endif /* #ifdef BOARD_HAS_CATM1_NBIOT  */
diff --git a/src/CatM1ConnectionHandler.h b/src/CatM1ConnectionHandler.h
@@ -51,6 +51,7 @@ class CatM1ConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState update_handleConnected    () override;
     virtual NetworkConnectionState update_handleDisconnecting() override;
     virtual NetworkConnectionState update_handleDisconnected () override;
+    virtual NetworkConnectionState update_handleError        () override;
 
 
   private:
diff --git a/src/CellularConnectionHandler.cpp b/src/CellularConnectionHandler.cpp
@@ -123,4 +123,8 @@ NetworkConnectionState CellularConnectionHandler::update_handleDisconnected()
   return NetworkConnectionState::CLOSED;
 }
 
+NetworkConnectionState CellularConnectionHandler::update_handleError() {
+  return NetworkConnectionState::ERROR;
+}
+
 #endif /* #ifdef BOARD_HAS_CELLULAR  */
diff --git a/src/CellularConnectionHandler.h b/src/CellularConnectionHandler.h
@@ -51,6 +51,7 @@ class CellularConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState update_handleConnected    () override;
     virtual NetworkConnectionState update_handleDisconnecting() override;
     virtual NetworkConnectionState update_handleDisconnected () override;
+    virtual NetworkConnectionState update_handleError        () override;
 
 
   private:
diff --git a/src/ConnectionHandlerInterface.cpp b/src/ConnectionHandlerInterface.cpp
@@ -78,7 +78,7 @@ NetworkConnectionState ConnectionHandler::updateConnectionState() {
     case NetworkConnectionState::CONNECTED:     next_net_connection_state = update_handleConnected    (); break;
     case NetworkConnectionState::DISCONNECTING: next_net_connection_state = update_handleDisconnecting(); break;
     case NetworkConnectionState::DISCONNECTED:  next_net_connection_state = update_handleDisconnected (); break;
-    case NetworkConnectionState::ERROR:                                                                   break;
+    case NetworkConnectionState::ERROR:         next_net_connection_state = update_handleError        (); break;
     case NetworkConnectionState::CLOSED:                                                                  break;
   }
 
diff --git a/src/ConnectionHandlerInterface.h b/src/ConnectionHandlerInterface.h
@@ -124,6 +124,7 @@ class ConnectionHandler {
     virtual NetworkConnectionState update_handleConnected    () = 0;
     virtual NetworkConnectionState update_handleDisconnecting() = 0;
     virtual NetworkConnectionState update_handleDisconnected () = 0;
+    virtual NetworkConnectionState update_handleError        () = 0;
 
     models::NetworkSetting _settings;
 
diff --git a/src/EthernetConnectionHandler.cpp b/src/EthernetConnectionHandler.cpp
@@ -186,4 +186,8 @@ NetworkConnectionState EthernetConnectionHandler::update_handleDisconnected()
   }
 }
 
+NetworkConnectionState EthernetConnectionHandler::update_handleError() {
+  return NetworkConnectionState::ERROR;
+}
+
 #endif /* #ifdef BOARD_HAS_ETHERNET */
diff --git a/src/EthernetConnectionHandler.h b/src/EthernetConnectionHandler.h
@@ -69,6 +69,7 @@ class EthernetConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState update_handleConnected    () override;
     virtual NetworkConnectionState update_handleDisconnecting() override;
     virtual NetworkConnectionState update_handleDisconnected () override;
+    virtual NetworkConnectionState update_handleError        () override;
 
   private:
 
diff --git a/src/GSMConnectionHandler.cpp b/src/GSMConnectionHandler.cpp
@@ -160,4 +160,14 @@ NetworkConnectionState GSMConnectionHandler::update_handleDisconnected()
   }
 }
 
+NetworkConnectionState GSMConnectionHandler::update_handleError()
+{
+  if (_keep_alive)  {
+    return NetworkConnectionState::INIT;
+  }
+
+  return NetworkConnectionState::ERROR;
+
+}
+
 #endif /* #ifdef BOARD_HAS_GSM  */
diff --git a/src/GSMConnectionHandler.h b/src/GSMConnectionHandler.h
@@ -50,6 +50,7 @@ class GSMConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState update_handleConnected    () override;
     virtual NetworkConnectionState update_handleDisconnecting() override;
     virtual NetworkConnectionState update_handleDisconnected () override;
+    virtual NetworkConnectionState update_handleError        () override;
 
 
   private:
diff --git a/src/GenericConnectionHandler.cpp b/src/GenericConnectionHandler.cpp
@@ -180,3 +180,7 @@ NetworkConnectionState GenericConnectionHandler::update_handleDisconnecting() {
 NetworkConnectionState GenericConnectionHandler::update_handleDisconnected() {
     return _ch != nullptr ? _ch->update_handleDisconnected() : NetworkConnectionState::INIT;
 }
+
+NetworkConnectionState GenericConnectionHandler::update_handleError() {
+    return _ch != nullptr ? _ch->update_handleError() : NetworkConnectionState::INIT;
+}
diff --git a/src/GenericConnectionHandler.h b/src/GenericConnectionHandler.h
@@ -69,6 +69,7 @@ class GenericConnectionHandler : public ConnectionHandler
     NetworkConnectionState update_handleConnected    () override;
     NetworkConnectionState update_handleDisconnecting() override;
     NetworkConnectionState update_handleDisconnected () override;
+    NetworkConnectionState update_handleError        () override;
 
   private:
 
diff --git a/src/LoRaConnectionHandler.cpp b/src/LoRaConnectionHandler.cpp
@@ -184,4 +184,9 @@ NetworkConnectionState LoRaConnectionHandler::update_handleDisconnected()
   }
 }
 
+NetworkConnectionState LoRaConnectionHandler::update_handleError()
+{
+  return NetworkConnectionState::ERROR;
+}
+
 #endif
diff --git a/src/LoRaConnectionHandler.h b/src/LoRaConnectionHandler.h
@@ -62,6 +62,7 @@ class LoRaConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState update_handleConnected    () override;
     virtual NetworkConnectionState update_handleDisconnecting() override;
     virtual NetworkConnectionState update_handleDisconnected () override;
+    virtual NetworkConnectionState update_handleError        () override;
 
 
   private:
diff --git a/src/NBConnectionHandler.cpp b/src/NBConnectionHandler.cpp
@@ -160,4 +160,9 @@ NetworkConnectionState NBConnectionHandler::update_handleDisconnected()
   }
 }
 
+NetworkConnectionState NBConnectionHandler::update_handleError()
+{
+  return NetworkConnectionState::ERROR;
+}
+
 #endif /* #ifdef BOARD_HAS_NB  */
diff --git a/src/NBConnectionHandler.h b/src/NBConnectionHandler.h
@@ -52,6 +52,7 @@ class NBConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState update_handleConnected    () override;
     virtual NetworkConnectionState update_handleDisconnecting() override;
     virtual NetworkConnectionState update_handleDisconnected () override;
+    virtual NetworkConnectionState update_handleError        () override;
 
 
   private:
diff --git a/src/WiFiConnectionHandler.cpp b/src/WiFiConnectionHandler.cpp
@@ -213,4 +213,9 @@ NetworkConnectionState WiFiConnectionHandler::update_handleDisconnected()
   }
 }
 
+NetworkConnectionState WiFiConnectionHandler::update_handleError()
+{
+  return NetworkConnectionState::ERROR;
+}
+
 #endif /* #ifdef BOARD_HAS_WIFI */
diff --git a/src/WiFiConnectionHandler.h b/src/WiFiConnectionHandler.h
@@ -73,6 +73,7 @@ class WiFiConnectionHandler : public ConnectionHandler
     virtual NetworkConnectionState update_handleConnected    () override;
     virtual NetworkConnectionState update_handleDisconnecting() override;
     virtual NetworkConnectionState update_handleDisconnected () override;
+    virtual NetworkConnectionState update_handleError        () override;
 
   private:
     WiFiUDP _wifi_udp;

Original file line number	Diff line number	Diff line change
`@@ -153,4 +153,8 @@ NetworkConnectionState CatM1ConnectionHandler::update_handleDisconnected()`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
	`156`	`+NetworkConnectionState CatM1ConnectionHandler::update_handleError() {`
	`157`	`+ return NetworkConnectionState::ERROR;`
	`158`	`+}`
	`159`	`+`
`156`	`160`	`#endif /* #ifdef BOARD_HAS_CATM1_NBIOT */`
Original file line number	Diff line number	Diff line change
`@@ -123,4 +123,8 @@ NetworkConnectionState CellularConnectionHandler::update_handleDisconnected()`
`123`	`123`	`return NetworkConnectionState::CLOSED;`
`124`	`124`	`}`
`125`	`125`
	`126`	`+NetworkConnectionState CellularConnectionHandler::update_handleError() {`
	`127`	`+ return NetworkConnectionState::ERROR;`
	`128`	`+}`
	`129`	`+`
`126`	`130`	`#endif /* #ifdef BOARD_HAS_CELLULAR */`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ NetworkConnectionState ConnectionHandler::updateConnectionState() {`
`78`	`78`	`case NetworkConnectionState::CONNECTED: next_net_connection_state = update_handleConnected (); break;`
`79`	`79`	`case NetworkConnectionState::DISCONNECTING: next_net_connection_state = update_handleDisconnecting(); break;`
`80`	`80`	`case NetworkConnectionState::DISCONNECTED: next_net_connection_state = update_handleDisconnected (); break;`
`81`		`- case NetworkConnectionState::ERROR: break;`
	`81`	`+ case NetworkConnectionState::ERROR: next_net_connection_state = update_handleError (); break;`
`82`	`82`	`case NetworkConnectionState::CLOSED: break;`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -186,4 +186,8 @@ NetworkConnectionState EthernetConnectionHandler::update_handleDisconnected()`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
	`189`	`+NetworkConnectionState EthernetConnectionHandler::update_handleError() {`
	`190`	`+ return NetworkConnectionState::ERROR;`
	`191`	`+}`
	`192`	`+`
`189`	`193`	`#endif /* #ifdef BOARD_HAS_ETHERNET */`
Original file line number	Diff line number	Diff line change
`@@ -160,4 +160,14 @@ NetworkConnectionState GSMConnectionHandler::update_handleDisconnected()`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
	`163`	`+NetworkConnectionState GSMConnectionHandler::update_handleError()`
	`164`	`+{`
	`165`	`+ if (_keep_alive) {`
	`166`	`+ return NetworkConnectionState::INIT;`
	`167`	`+ }`
	`168`	`+`
	`169`	`+ return NetworkConnectionState::ERROR;`
	`170`	`+`
	`171`	`+}`
	`172`	`+`
`163`	`173`	`#endif /* #ifdef BOARD_HAS_GSM */`