samples: net: cloud: aws_iot_mqtt: use auto init

use auto init for networking, dhcp and sntp.
This simplifys the code of this sample by using the
auto init feature of the networking stack.

Signed-off-by: Fin Maaß <[email protected]>

Author: maass-hamburg

samples/net/cloud/aws_iot_mqtt/CMakeLists.txt

@@ -21,4 +21,3 @@ else()
 endif()
 
 target_sources(app PRIVATE "src/main.c" ${creds})
-target_sources_ifdef(CONFIG_NET_DHCPV4 app PRIVATE "src/dhcp.c")

samples/net/cloud/aws_iot_mqtt/boards/nucleo_f429zi.conf

@@ -1,4 +1 @@
 CONFIG_ENTROPY_DEVICE_RANDOM_GENERATOR=y
-
-CONFIG_NET_DHCPV4=y
-CONFIG_NET_DHCPV4_INITIAL_DELAY_MAX=2

samples/net/cloud/aws_iot_mqtt/boards/qemu_x86.conf

@@ -1,11 +1,10 @@
 CONFIG_QEMU_ICOUNT=n
 
 # QEMU networking configuration
-CONFIG_NET_CONFIG_SETTINGS=y
 CONFIG_NET_CONFIG_NEED_IPV6=y
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
-CONFIG_NET_CONFIG_NEED_IPV4=y
+CONFIG_NET_DHCPV4=n
 CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 CONFIG_NET_CONFIG_MY_IPV4_GW="192.0.2.2"

samples/net/cloud/aws_iot_mqtt/prj.conf

@@ -11,7 +11,6 @@ CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_INIT_STACKS=y
 CONFIG_HW_STACK_PROTECTION=y
 CONFIG_REQUIRES_FULL_LIBC=y
-CONFIG_SNTP=y
 CONFIG_JSON_LIBRARY=y
 CONFIG_POSIX_API=y
 
@@ -33,6 +32,17 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
 
+# Network configuration
+CONFIG_NET_CONFIG_SETTINGS=y
+CONFIG_NET_CONFIG_NEED_IPV4=y
+CONFIG_NET_DHCPV4=y
+
+# SNTP
+CONFIG_SNTP=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_NET_CONFIG_CLOCK_SNTP_INIT=y
+CONFIG_NET_CONFIG_SNTP_INIT_SERVER="0.pool.ntp.org"
+
 # Logging
 CONFIG_LOG=y
 

samples/net/cloud/aws_iot_mqtt/src/dhcp.c

@@ -5,7 +5,6 @@
  */
 
 #include "creds/creds.h"
-#include "dhcp.h"
 
 #include <errno.h>
 #include <stdio.h>
@@ -14,11 +13,9 @@
 #include <zephyr/net/socket.h>
 #include <zephyr/net/dns_resolve.h>
 #include <zephyr/net/mqtt.h>
-#include <zephyr/net/sntp.h>
 #include <zephyr/net/tls_credentials.h>
 #include <zephyr/data/json.h>
 #include <zephyr/random/random.h>
-#include <zephyr/posix/time.h>
 #include <zephyr/logging/log.h>
 
 
@@ -421,26 +418,6 @@ void aws_client_loop(void)
 	fds.fd = -1;
 }
 
-int sntp_sync_time(void)
-{
-	int rc;
-	struct sntp_time now;
-	struct timespec tspec;
-
-	rc = sntp_simple(SNTP_SERVER, SYS_FOREVER_MS, &now);
-	if (rc == 0) {
-		tspec.tv_sec = now.seconds;
-		tspec.tv_nsec = ((uint64_t)now.fraction * (1000lu * 1000lu * 1000lu)) >> 32;
-
-		clock_settime(CLOCK_REALTIME, &tspec);
-
-		LOG_DBG("Acquired time from NTP server: %u", (uint32_t)tspec.tv_sec);
-	} else {
-		LOG_ERR("Failed to acquire SNTP, code %d\n", rc);
-	}
-	return rc;
-}
-
 static int resolve_broker_addr(struct sockaddr_in *broker)
 {
 	int ret;
@@ -473,12 +450,6 @@ static int resolve_broker_addr(struct sockaddr_in *broker)
 
 int main(void)
 {
-#if defined(CONFIG_NET_DHCPV4)
-	app_dhcpv4_startup();
-#endif
-
-	sntp_sync_time();
-
 	setup_credentials();
 
 	for (;;) {