set connected state after checking internet availability

fabik111 · fabik111 · commit 379adfbd1d89 · 2025-04-08T11:44:53.000+02:00
diff --git a/src/CatM1ConnectionHandler.cpp b/src/CatM1ConnectionHandler.cpp
@@ -64,11 +64,7 @@ NetworkConnectionState CatM1ConnectionHandler::update_handleInit()
   pinMode(ON_MKR2, OUTPUT);
   digitalWrite(ON_MKR2, HIGH);
 #endif
-  return NetworkConnectionState::CONNECTING;
-}
 
-NetworkConnectionState CatM1ConnectionHandler::update_handleConnecting()
-{
   if(!GSM.begin(
     _settings.catm1.pin,
     _settings.catm1.apn,
@@ -80,7 +76,25 @@ NetworkConnectionState CatM1ConnectionHandler::update_handleConnecting()
     Debug.print(DBG_ERROR, F("The board was not able to register to the network..."));
     return NetworkConnectionState::ERROR;
   }
-  Debug.print(DBG_INFO, F("Connected to Network"));
+  
+  
+  return NetworkConnectionState::CONNECTING;
+}
+
+NetworkConnectionState CatM1ConnectionHandler::update_handleConnecting()
+{
+  if (!GSM.isConnected())
+  {
+    return NetworkConnectionState::INIT;
+  }
+
+  if(getTime() == 0){
+    Debug.print(DBG_ERROR, F("Internet check failed"));
+    Debug.print(DBG_INFO, F("Retrying in  \"%d\" milliseconds"), CHECK_INTERVAL_TABLE[static_cast<unsigned int>(NetworkConnectionState::CONNECTING)]);
+    return NetworkConnectionState::CONNECTING;
+  }
+
+  Debug.print(DBG_INFO, F("Connected to Internet"));
   return NetworkConnectionState::CONNECTED;
 }
 
diff --git a/src/CellularConnectionHandler.cpp b/src/CellularConnectionHandler.cpp
@@ -62,16 +62,27 @@ NetworkConnectionState CellularConnectionHandler::update_handleInit()
     Debug.print(DBG_ERROR, F("SIM not present or wrong PIN"));
     return NetworkConnectionState::ERROR;
   }
-  return NetworkConnectionState::CONNECTING;
-}
 
-NetworkConnectionState CellularConnectionHandler::update_handleConnecting()
-{
   if (!_cellular.connect(String(_settings.cell.apn), String(_settings.cell.login), String(_settings.cell.pass))) {
     Debug.print(DBG_ERROR, F("The board was not able to register to the network..."));
     return NetworkConnectionState::ERROR;
   }
   Debug.print(DBG_INFO, F("Connected to Network"));
+  return NetworkConnectionState::CONNECTING;
+}
+
+NetworkConnectionState CellularConnectionHandler::update_handleConnecting()
+{
+  if (!_cellular.isConnectedToInternet()) {
+    return NetworkConnectionState::INIT;
+  }
+
+  if(getTime() == 0){
+    Debug.print(DBG_ERROR, F("Internet check failed"));
+    Debug.print(DBG_INFO, F("Retrying in  \"%d\" milliseconds"), CHECK_INTERVAL_TABLE[static_cast<unsigned int>(NetworkConnectionState::CONNECTING)]);
+    return NetworkConnectionState::CONNECTING;
+  }
+
   return NetworkConnectionState::CONNECTED;
 }
 
diff --git a/src/EthernetConnectionHandler.cpp b/src/EthernetConnectionHandler.cpp
@@ -20,6 +20,7 @@
 
 #ifdef BOARD_HAS_ETHERNET /* Only compile if the board has ethernet */
 #include "EthernetConnectionHandler.h"
+#include <Udp.h>
 
 /******************************************************************************
    CTOR/DTOR
@@ -72,11 +73,6 @@ NetworkConnectionState EthernetConnectionHandler::update_handleInit()
     Debug.print(DBG_ERROR, F("Error, ethernet shield was not found."));
     return NetworkConnectionState::ERROR;
   }
-  return NetworkConnectionState::CONNECTING;
-}
-
-NetworkConnectionState EthernetConnectionHandler::update_handleConnecting()
-{
   IPAddress ip(_settings.eth.ip.type, _settings.eth.ip.bytes);
 
   // An ip address is provided -> static ip configuration
@@ -91,7 +87,7 @@ NetworkConnectionState EthernetConnectionHandler::update_handleConnecting()
       Debug.print(DBG_ERROR, F("Failed to configure Ethernet, check cable connection"));
       Debug.print(DBG_VERBOSE, "timeout: %d, response timeout: %d",
         _settings.eth.timeout, _settings.eth.response_timeout);
-      return NetworkConnectionState::CONNECTING;
+      return NetworkConnectionState::INIT;
     }
   // An ip address is not provided -> dhcp configuration
   } else {
@@ -100,10 +96,53 @@ NetworkConnectionState EthernetConnectionHandler::update_handleConnecting()
       Debug.print(DBG_VERBOSE, "timeout: %d, response timeout: %d",
         _settings.eth.timeout, _settings.eth.response_timeout);
 
-      return NetworkConnectionState::CONNECTING;
+      return NetworkConnectionState::INIT;
     }
   }
 
+  return NetworkConnectionState::CONNECTING;
+}
+
+NetworkConnectionState EthernetConnectionHandler::update_handleConnecting()
+{
+  if (Ethernet.linkStatus() == LinkOFF) {
+    return NetworkConnectionState::INIT;
+  }
+  // Request time from NTP server for testing internet connection
+  UDP &udp = getUDP();
+  udp.begin(4001);
+  uint8_t ntp_packet_buf[48] = {0};
+  
+  ntp_packet_buf[0]  = 0b11100011;
+  ntp_packet_buf[1]  = 0;
+  ntp_packet_buf[2]  = 6;
+  ntp_packet_buf[3]  = 0xEC;
+  ntp_packet_buf[12] = 49;
+  ntp_packet_buf[13] = 0x4E;
+  ntp_packet_buf[14] = 49;
+  ntp_packet_buf[15] = 52;
+  
+  udp.beginPacket("time.arduino.cc", 123);
+  udp.write(ntp_packet_buf, 48);
+  udp.endPacket();
+
+  bool is_timeout = false;
+  unsigned long const start = millis();
+  do
+  {
+    is_timeout = (millis() - start) >= 1000;
+  } while(!is_timeout && !udp.parsePacket());
+
+  if(is_timeout) {
+    udp.stop();
+    Debug.print(DBG_ERROR, F("Internet check failed"));
+    Debug.print(DBG_INFO, F("Retrying in  \"%d\" milliseconds"), CHECK_INTERVAL_TABLE[static_cast<unsigned int>(NetworkConnectionState::CONNECTING)]);
+    return NetworkConnectionState::CONNECTING;
+  }
+  
+  udp.read(ntp_packet_buf, 48);
+  udp.stop();
+  Debug.print(DBG_INFO, F("Connected to Internet"));
   return NetworkConnectionState::CONNECTED;
 }
 
diff --git a/src/NBConnectionHandler.cpp b/src/NBConnectionHandler.cpp
@@ -102,10 +102,6 @@ NetworkConnectionState NBConnectionHandler::update_handleInit()
     Debug.print(DBG_ERROR, F("SIM not present or wrong PIN"));
     return NetworkConnectionState::ERROR;
   }
-}
-
-NetworkConnectionState NBConnectionHandler::update_handleConnecting()
-{
   NB_NetworkStatus_t const network_status = _nb_gprs.attachGPRS(true);
   Debug.print(DBG_DEBUG, F("GPRS.attachGPRS(): %d"), network_status);
   if (network_status == NB_NetworkStatus_t::NB_ERROR)
@@ -116,8 +112,24 @@ NetworkConnectionState NBConnectionHandler::update_handleConnecting()
   else
   {
     Debug.print(DBG_INFO, F("Connected to GPRS Network"));
-    return NetworkConnectionState::CONNECTED;
+    return NetworkConnectionState::CONNECTING;
   }
+
+}
+
+NetworkConnectionState NBConnectionHandler::update_handleConnecting()
+{
+  if(_nb.isAccessAlive() != 1){
+    return NetworkConnectionState::INIT;
+  }
+
+  if(getTime() == 0){
+    Debug.print(DBG_ERROR, F("Internet check failed"));
+    Debug.print(DBG_INFO, F("Retrying in  \"%d\" milliseconds"), CHECK_INTERVAL_TABLE[static_cast<unsigned int>(NetworkConnectionState::CONNECTING)]);
+    return NetworkConnectionState::CONNECTING;
+  }
+
+  return NetworkConnectionState::CONNECTED;
 }
 
 NetworkConnectionState NBConnectionHandler::update_handleConnected()
diff --git a/src/WiFiConnectionHandler.cpp b/src/WiFiConnectionHandler.cpp
@@ -96,11 +96,7 @@ NetworkConnectionState WiFiConnectionHandler::update_handleInit()
 #else
   WiFi.mode(WIFI_STA);
 #endif /* #if !defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ARCH_ESP32) */
-  return NetworkConnectionState::CONNECTING;
-}
 
-NetworkConnectionState WiFiConnectionHandler::update_handleConnecting()
-{
   if (WiFi.status() != WL_CONNECTED)
   {
     WiFi.begin(_settings.wifi.ssid, _settings.wifi.pwd);
@@ -120,7 +116,7 @@ NetworkConnectionState WiFiConnectionHandler::update_handleConnecting()
     Debug.print(DBG_ERROR, F("Connection to \"%s\" failed"), _settings.wifi.ssid);
     Debug.print(DBG_INFO, F("Retrying in  \"%d\" milliseconds"), CHECK_INTERVAL_TABLE[static_cast<unsigned int>(NetworkConnectionState::CONNECTING)]);
 #endif
-    return NetworkConnectionState::CONNECTING;
+    return NetworkConnectionState::INIT;
   }
   else
   {
@@ -130,6 +126,66 @@ NetworkConnectionState WiFiConnectionHandler::update_handleConnecting()
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
   configTime(0, 0, "time.arduino.cc", "pool.ntp.org", "time.nist.gov");
 #endif
+    return NetworkConnectionState::CONNECTING;
+  }
+}
+
+NetworkConnectionState WiFiConnectionHandler::update_handleConnecting()
+{
+  if (WiFi.status() != NETWORK_CONNECTED){
+    return NetworkConnectionState::INIT;
+  }
+  bool checkSuccess = false;
+#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M7) || \
+  defined(ARDUINO_NICLA_VISION) || defined(ARDUINO_OPTA) || defined(ARDUINO_GIGA)
+  // Request time from NTP server for testing internet connection
+  UDP &udp = getUDP();
+  udp.begin(4001);
+  uint8_t ntp_packet_buf[48] = {0};
+  
+  ntp_packet_buf[0]  = 0b11100011;
+  ntp_packet_buf[1]  = 0;
+  ntp_packet_buf[2]  = 6;
+  ntp_packet_buf[3]  = 0xEC;
+  ntp_packet_buf[12] = 49;
+  ntp_packet_buf[13] = 0x4E;
+  ntp_packet_buf[14] = 49;
+  ntp_packet_buf[15] = 52;
+  udp.beginPacket("time.arduino.cc", 123);
+  udp.write(ntp_packet_buf, 48);
+  udp.endPacket();
+
+  bool is_timeout = false;
+  unsigned long const start = millis();
+  do
+  {
+    is_timeout = (millis() - start) >= 1000;
+  } while(!is_timeout && !udp.parsePacket());
+  if(is_timeout) {
+    udp.stop();
+  }
+  else
+  {
+    udp.read(ntp_packet_buf, 48);
+    udp.stop();
+    checkSuccess = true;
+  }
+#else
+  int const ping_result = WiFi.ping("time.arduino.cc");
+  Debug.print(DBG_INFO, F("WiFi.ping(): %d"), ping_result);
+  if (ping_result > 0)
+  {
+    checkSuccess = true;
+  }
+#endif
+  if(!checkSuccess){
+    Debug.print(DBG_ERROR, F("Internet check failed"));
+    Debug.print(DBG_INFO, F("Retrying in  \"%d\" milliseconds"), CHECK_INTERVAL_TABLE[static_cast<unsigned int>(NetworkConnectionState::CONNECTING)]);
+    return NetworkConnectionState::CONNECTING;
+  }
+  else
+  {
+    Debug.print(DBG_INFO, F("Connected to Internet"));
     return NetworkConnectionState::CONNECTED;
   }
 }
