samples: net: mdns_responder: 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/mdns_responder/CMakeLists.txt

@@ -6,6 +6,5 @@ project(mdns_responder)
 
 target_sources(app PRIVATE src/main.c)
 target_sources(app PRIVATE src/service.c)
-target_sources_ifdef(CONFIG_NET_VLAN app PRIVATE src/vlan.c)
 
 include(${ZEPHYR_BASE}/samples/net/common/common.cmake)

samples/net/mdns_responder/Kconfig

@@ -5,52 +5,5 @@
 
 mainmenu "Networking mDNS responder sample application"
 
-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_MY_IPV4_NETMASK
-	string "My IPv4 netmask 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_MY_IPV4_NETMASK
-	string "My IPv4 netmask 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/mdns_responder/overlay-vlan.conf

@@ -11,21 +11,11 @@ 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"
-CONFIG_NET_SAMPLE_IFACE2_MY_IPV4_NETMASK="255.255.255.0"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE2_VLAN_TAG=100
+# Second 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"
-CONFIG_NET_SAMPLE_IFACE3_MY_IPV4_NETMASK="255.255.255.0"
-# VLAN tag for the second interface
-CONFIG_NET_SAMPLE_IFACE3_VLAN_TAG=200
+# Third VLAN interface will have these settings
+CONFIG_NET_SAMPLE_COMMON_VLAN_SETUP_2="200;2001:db8:200::1/64,203.0.113.1/24"
 
 # Each interface needs at least 2 context. So if we have three
 # interfaces we need minimum 6 context but allocate more so that

samples/net/mdns_responder/src/main.c

@@ -16,15 +16,6 @@ LOG_MODULE_REGISTER(net_mdns_responder_sample, LOG_LEVEL_DBG);
 
 extern void service(void);
 
-#if defined(CONFIG_NET_VLAN)
-int init_vlan(void);
-#else
-static inline int init_vlan(void)
-{
-	return 0;
-}
-#endif /* CONFIG_NET_VLAN */
-
 /*
  * Note that mDNS support requires no application interaction with zephyr,
  * beyond optional runtime hostname configuration calls and setting