[nrf fromtree] samples: net: Add Wi-Fi snippet support for networking samples

Make use of wifi-ipv4 snippet in several networking samples.

Signed-off-by: Robert Lubos <[email protected]>
(cherry picked from commit fd2fa54)

Author: rlubos

samples/net/common/common.cmake

@@ -1,3 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Common routines used in net samples
+
+target_include_directories(app PRIVATE ${ZEPHYR_BASE}/samples/net/common/)
+target_sources(app PRIVATE $ENV{ZEPHYR_BASE}/samples/net/common/net_sample_common.c)

samples/net/common/net_sample_common.c

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2024 Nordic Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/logging/log.h>
+LOG_MODULE_REGISTER(net_samples_common, LOG_LEVEL_DBG);
+
+#include <zephyr/net/conn_mgr_connectivity.h>
+
+#if defined(CONFIG_NET_CONNECTION_MANAGER)
+#define L4_EVENT_MASK (NET_EVENT_L4_CONNECTED | NET_EVENT_L4_DISCONNECTED)
+
+static struct net_mgmt_event_callback l4_cb;
+static K_SEM_DEFINE(network_connected, 0, 1);
+
+static void l4_event_handler(struct net_mgmt_event_callback *cb, uint32_t event,
+			     struct net_if *iface)
+{
+	switch (event) {
+	case NET_EVENT_L4_CONNECTED:
+		LOG_INF("Network connectivity established and IP address assigned");
+		k_sem_give(&network_connected);
+		break;
+	case NET_EVENT_L4_DISCONNECTED:
+		break;
+	default:
+		break;
+	}
+}
+
+void wait_for_network(void)
+{
+	net_mgmt_init_event_callback(&l4_cb, l4_event_handler, L4_EVENT_MASK);
+	net_mgmt_add_event_callback(&l4_cb);
+
+	LOG_INF("Waiting for network...");
+
+	k_sem_take(&network_connected, K_FOREVER);
+}
+#endif /* CONFIG_NET_CONNECTION_MANAGER */

samples/net/common/net_sample_common.h

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2024 Nordic Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#if defined(CONFIG_NET_CONNECTION_MANAGER)
+void wait_for_network(void);
+#else
+static inline void wait_for_network(void) { }
+#endif /* CONFIG_NET_CONNECTION_MANAGER */

samples/net/dns_resolve/CMakeLists.txt

@@ -6,3 +6,5 @@ project(dns_resolve)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)

samples/net/dns_resolve/README.rst

@@ -155,3 +155,9 @@ Open a terminal window and type:
 Use 'dmesg' to find the right USB device.
 
 Once the binary is loaded into the FRDM board, press the RESET button.
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.

samples/net/dns_resolve/sample.yaml

@@ -23,3 +23,9 @@ tests:
       - CONFIG_LLMNR_RESOLVER=y
       - CONFIG_NET_DHCPV4=y
     tags: llmnr
+  sample.net.dns_resolve.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp

samples/net/dns_resolve/src/main.c

@@ -17,6 +17,8 @@ LOG_MODULE_REGISTER(net_dns_resolve_client_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/net_mgmt.h>
 #include <zephyr/net/dns_resolve.h>
 
+#include "net_sample_common.h"
+
 #if defined(CONFIG_MDNS_RESOLVER)
 #if defined(CONFIG_NET_IPV4)
 static struct k_work_delayable mdns_ipv4_timer;
@@ -395,6 +397,8 @@ int main(void)
 
 	LOG_INF("Starting DNS resolve sample");
 
+	wait_for_network();
+
 	setup_ipv4(iface);
 
 	setup_dhcpv4(iface);

samples/net/ipv4_autoconf/CMakeLists.txt

@@ -6,3 +6,5 @@ project(ipv4_autoconf)
 
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)

samples/net/ipv4_autoconf/README.rst

@@ -69,3 +69,9 @@ type:
 .. code-block:: console
 
    $ ping -I eth1 169.254.218.128
+
+Wi-Fi
+=====
+
+The IPv4 Wi-Fi support can be enabled in the sample with
+:ref:`Wi-Fi snippet <snippet-wifi-ipv4>`.

samples/net/ipv4_autoconf/sample.yaml

@@ -1,17 +1,23 @@
 common:
   harness: net
+  depends_on: netif
   tags:
     - net
     - ipv4_autoconf
-  platform_allow:
-    - qemu_x86
-    - native_sim
-    - native_sim/native/64
-  integration_platforms:
-    - native_sim
 sample:
   description: Test IPv4 autoconf functionality
   name: IPv4 autoconf sample app
 tests:
   sample.net.ipv4_autoconf:
-    depends_on: netif
+    platform_allow:
+      - qemu_x86
+      - native_sim
+      - native_sim/native/64
+    integration_platforms:
+      - native_sim
+  sample.net.ipv4_autoconf.wifi.nrf70dk:
+    extra_args:
+      - SNIPPET=wifi-ipv4
+      - CONFIG_NRF_WIFI_BUILD_ONLY_MODE=y
+    platform_allow:
+      - nrf7002dk/nrf5340/cpuapp