Merge pull request #77 from TomsCircuits/master

Fix for the year 2036 problem
gmag11 · Jan 4, 2019 · 83650bc · 83650bc
2 parents fdc04d9 + 767cd04
commit 83650bc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -219,3 +219,5 @@ examples/NTPClient/__vm/
 
 # Visual Studio Code workspace folder
 .vscode/
+*.bak
+**/__vm/**
diff --git a/src/NTPClientLib.cpp b/src/NTPClientLib.cpp
@@ -156,6 +156,7 @@ time_t NTPClient::getTime () {
             DEBUGLOG ("-- Receive NTP Response\n");
             udp->read (ntpPacketBuffer, NTP_PACKET_SIZE);  // read packet into the buffer
             time_t timeValue = decodeNtpMessage (ntpPacketBuffer);
+  if (timeValue != 0) {
             setSyncInterval (getLongInterval ());
             if (!_firstSync) {
                 //    if (timeStatus () == timeSet)
@@ -170,6 +171,15 @@ time_t NTPClient::getTime () {
             if (onSyncEvent)
                 onSyncEvent (timeSyncd);
             return timeValue;
+    }
+			else {
+        DEBUGLOG ("-- No valid NTP data :-(\n");
+					udp->stop ();
+					setSyncInterval (getShortInterval ()); // Retry connection more often
+					if (onSyncEvent)
+						onSyncEvent (noResponse);
+					return 0; // return 0 if unable to get the time
+			}
         }
 #ifdef ARDUINO_ARCH_ESP8266
         ESP.wdtFeed ();
@@ -603,6 +613,12 @@ time_t NTPClient::decodeNtpMessage (uint8_t *messageBuffer) {
     secsSince1900 |= (unsigned long)messageBuffer[42] << 8;
     secsSince1900 |= (unsigned long)messageBuffer[43];
 
+	DEBUGLOG("Secs: %u \n", secsSince1900);
+
+	if(secsSince1900 == 0) {
+		DEBUGLOG ("--Timestamp is Zero\n");
+		return 0;
+	}
 #define SEVENTY_YEARS 2208988800UL
     time_t timeTemp = secsSince1900 - SEVENTY_YEARS + _timeZone * SECS_PER_HOUR + _minutesOffset * SECS_PER_MIN;