samples: net: txtime: Refactor VLAN support

Move the common VLAN setup code to samples/net/common directory
so that other network samples can utilize that too.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

samples/net/sockets/txtime/CMakeLists.txt

@@ -6,4 +6,5 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(sockets_txtime)
 
 target_sources(app PRIVATE src/main.c)
-target_sources_ifdef(CONFIG_NET_VLAN app PRIVATE src/vlan.c)
+
+include(${ZEPHYR_BASE}/samples/net/common/common.cmake)

samples/net/sockets/txtime/Kconfig

@@ -63,42 +63,5 @@ config NET_SAMPLE_PACKET_TXTIME
 	  but for purpose of this sample application, we set the time in
 	  microseconds in this config option.
 
-config NET_SAMPLE_IFACE2_MY_IPV6_ADDR
-	string "My IPv6 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_MY_IPV4_ADDR
-	string "My IPv4 address for second interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE2_VLAN_TAG
-	int "VLAN tag for second interface"
-	default 100
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
-config NET_SAMPLE_IFACE3_MY_IPV6_ADDR
-	string "My IPv6 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_MY_IPV4_ADDR
-	string "My IPv4 address for third interface"
-	help
-	  The value depends on your network setup.
-
-config NET_SAMPLE_IFACE3_VLAN_TAG
-	int "VLAN tag for third interface"
-	default 200
-	range 0 4094
-	depends on NET_VLAN
-	help
-	  Set VLAN (virtual LAN) tag (id) that is used in the sample
-	  application.
-
+source "samples/net/common/Kconfig"
 source "Kconfig.zephyr"

samples/net/sockets/txtime/overlay-vlan.conf

@@ -11,16 +11,8 @@ CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
 CONFIG_NET_CONFIG_MY_IPV4_ADDR="192.0.2.1"
 CONFIG_NET_CONFIG_PEER_IPV4_ADDR="192.0.2.2"
 
-# Second ethernet interface will have these settings
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV6_ADDR="2001:db8:100::1"
-# TEST-NET-2 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_ADDR="198.51.100.1"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG=100
+# First VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_1="100;2001:db8:100::1/64,198.51.100.1/24"
 
-# Settings for the third network interface
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV6_ADDR="2001:db8:200::1"
-# TEST-NET-3 from RFC 5737
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_ADDR="203.0.113.1"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG=200
+# Second VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_2="200;2001:db8:200::1/64,203.0.113.1/24"

samples/net/sockets/txtime/src/main.c

@@ -22,6 +22,8 @@ LOG_MODULE_REGISTER(net_txtime_sample, LOG_LEVEL_DBG);
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/ethernet_mgmt.h>
 
+#include "net_sample_common.h"
+
 #define APP_BANNER "Run SO_TXTIME client"
 
 #define DHCPV4_MASK (NET_EVENT_IPV4_DHCP_BOUND | \
@@ -63,8 +65,6 @@ K_SEM_DEFINE(run_app, 0, 1);
 static bool want_to_quit;
 static bool connected;
 
-extern int init_vlan(void);
-
 static void quit(void)
 {
 	k_sem_give(&quit_lock);