Fixing up NTP random port usage code (enabled by default, disable via AIoTC_Config.h)

Author: aentinger

src/AIoTC_Config.h

@@ -26,6 +26,10 @@
   #define OTA_STORAGE_SFU         (0)
 #endif
 
+#ifndef NTP_USE_RANDOM_PORT
+  #define NTP_USE_RANDOM_PORT     (1)
+#endif
+
 #ifndef DBG_ERROR
   #define DBG_ERROR(fmt, ...) Debug.print(DBG_ERROR, fmt, ## __VA_ARGS__)
 #endif

src/utility/time/NTPUtils.cpp

@@ -35,9 +35,11 @@
 
 unsigned long NTPUtils::getTime(UDP & udp)
 {
-  NTPUtils randomPort;
-  int _randomPort = randomPort.setRandomPort(MIN_NTP_PORT, MAX_NTP_PORT);
-  udp.begin(_randomPort);
+#ifdef NTP_USE_RANDOM_PORT
+  udp.begin(NTPUtils::getRandomPort(MIN_NTP_PORT, MAX_NTP_PORT));
+#else
+  udp.begin(NTP_LOCAL_PORT);
+#endif
 
   sendNTPpacket(udp);
 
@@ -88,13 +90,13 @@ void NTPUtils::sendNTPpacket(UDP & udp)
   udp.endPacket();
 }
 
-int NTPUtils::setRandomPort(int minValue, int maxValue)
+int NTPUtils::getRandomPort(int const min_port, int const max_port)
 {
 #ifdef BOARD_HAS_ECCX08
-  return ECCX08.random(minValue, maxValue);
+  return ECCX08.random(min_port, max_port);
 #else
   randomSeed(analogRead(0));
-  return random(minValue, maxValue);
+  return random(min_port, max_port);
 #endif
 }
 

src/utility/time/NTPUtils.h

@@ -37,22 +37,22 @@
  * CLASS DECLARATION
  **************************************************************************************/
 
-#define NTP_DEFAULT_LOCAL_PORT 8888
-extern const int  MIN_NTP_PORT;
-extern const int  MAX_NTP_PORT;
-
 class NTPUtils
 {
 public:
 
   static unsigned long getTime(UDP & udp);
-  int setRandomPort(int minValue, int maxValue);
+  static int getRandomPort(int const min_port, int const max_port);
 
 private:
 
   static size_t        const NTP_PACKET_SIZE      = 48;
   static int           const NTP_TIME_SERVER_PORT = 123;
-  static int           const NTP_LOCAL_PORT       = NTP_DEFAULT_LOCAL_PORT;
+  static int           const NTP_LOCAL_PORT       = 8888;
+#if NTP_USE_RANDOM_PORT
+  static int           const MIN_NTP_PORT         = 49152;
+  static int           const MAX_NTP_PORT         = 65535;
+#endif
   static unsigned long const NTP_TIMEOUT_MS       = 1000;
   static char constexpr *    NTP_TIME_SERVER      = "time.arduino.cc";