Merge pull request #30 from CHERIoT-Platform/hlefeuvre/fix-sntp-issues

Make SNTP connection failure (more) reliable.

Author: hlef

examples/01.SNTP/sntp.cc

@@ -19,6 +19,7 @@ void __cheri_compartment("sntp_example") example()
 	{
 		Debug::log("Failed to update NTP time");
 		Timeout oneSecond{MS_TO_TICKS(1000)};
+		t = Timeout{MS_TO_TICKS(5000)};
 	}
 	Debug::log("Updating NTP took {} ticks", t.elapsed);
 	t = UnlimitedTimeout;

examples/03.HTTPS/https.cc

@@ -32,6 +32,7 @@ void __cheri_compartment("https_example") example()
 	{
 		Debug::log("Failed to update NTP time");
 		Timeout oneSecond{MS_TO_TICKS(1000)};
+		t = Timeout{MS_TO_TICKS(5000)};
 	}
 	Debug::log("Updating NTP took {} ticks", t.elapsed);
 	t = UnlimitedTimeout;

examples/04.MQTT/mqtt.cc

@@ -96,6 +96,7 @@ void __cheri_compartment("mqtt_example") example()
 	{
 		Debug::log("Failed to update NTP time");
 		Timeout oneSecond{MS_TO_TICKS(1000)};
+		t = Timeout{MS_TO_TICKS(5000)};
 	}
 	Debug::log("Updating NTP took {} ticks", t.elapsed);
 	t = UnlimitedTimeout;

lib/sntp/sntp.cc

@@ -410,6 +410,7 @@ namespace
 				SntpStatus_t lastStatus = SntpSuccess;
 				do
 				{
+					// `timeout` is updated through `context`.
 					status = Sntp_ReceiveTimeResponse(&context, 0);
 					if (status != lastStatus)
 					{
@@ -423,8 +424,21 @@ namespace
 						thread_sleep(&t);
 						timeout->elapse(t.elapsed);
 					}
-				} while (status == SntpNoResponseReceived);
-				Debug::log("Received new time fron NTP!");
+				} while (status == SntpNoResponseReceived &&
+				         timeout->may_block());
+
+				if (status != SntpSuccess)
+				{
+					Debug::log("Failed to receive SNTP time response: {}",
+					           status);
+					Timeout t{UnlimitedTimeout};
+					network_socket_close(
+					  &t, MALLOC_CAPABILITY, udpContext.socket);
+					timeout->elapse(t.elapsed);
+					return ntp_error_to_errno(status);
+				}
+
+				Debug::log("Received new time from NTP!");
 			}
 			else
 			{