net: enable SLIP only on QEMU targets

In many networking tests we had to configure SLIP in the prj.conf
leaving those configurations Qemu specific. This change enables SLIP for
QEMU targets automatically and allows reuse of prj.conf for multiple
boards.

Additionally, the TUN options is removed. This option was not used
anywhere.

To enable self-contained networking tests that do not depend on SLIP, we
introduce the new option NET_TEST which disables TAP and allows testing
in QEMU without the need for a host interface.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>

samples/net/coaps_client/prj_qemu_x86.conf

@@ -4,7 +4,6 @@ CONFIG_NET_UDP=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_NET_BUF_LOG=y
 CONFIG_NET_LOG=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_INIT_STACKS=y
 CONFIG_PRINTK=y

samples/net/coaps_server/prj_qemu_x86.conf

@@ -4,7 +4,6 @@ CONFIG_NET_IPV4=n
 CONFIG_NET_UDP=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_NET_LOG=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_INIT_STACKS=y
 CONFIG_PRINTK=y

samples/net/dhcpv4_client/prj_qemu_x86.conf

@@ -4,7 +4,6 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_ARP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_DHCPV4=y
-CONFIG_NET_SLIP_TAP=y
 
 CONFIG_NET_PKT_RX_COUNT=4
 CONFIG_NET_PKT_TX_COUNT=4

samples/net/dns_resolve/prj_qemu_x86.conf

@@ -2,7 +2,6 @@ CONFIG_NETWORKING=y
 CONFIG_NET_UDP=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_INIT_STACKS=y
 CONFIG_NET_PKT_RX_COUNT=4
 CONFIG_NET_PKT_TX_COUNT=4

samples/net/echo_client/prj_qemu_cortex_m3.conf

@@ -5,7 +5,6 @@ CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_NET_LOG=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_INIT_STACKS=y
 CONFIG_PRINTK=y

samples/net/echo_client/prj_qemu_x86.conf

@@ -8,7 +8,6 @@ CONFIG_NET_BUF_LOG=y
 CONFIG_SYS_LOG_NET_BUF_LEVEL=2
 CONFIG_NET_LOG=y
 CONFIG_SYS_LOG_NET_LEVEL=2
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_INIT_STACKS=y
 CONFIG_PRINTK=y

samples/net/echo_client/prj_qemu_x86_tls.conf

@@ -8,7 +8,6 @@ CONFIG_NET_BUF_LOG=y
 CONFIG_SYS_LOG_NET_BUF_LEVEL=2
 CONFIG_NET_LOG=y
 CONFIG_SYS_LOG_NET_LEVEL=2
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_INIT_STACKS=y
 CONFIG_PRINTK=y

samples/net/echo_server/prj_qemu_cortex_m3.conf

@@ -6,7 +6,6 @@ CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_NET_LOG=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_INIT_STACKS=y
 CONFIG_PRINTK=y

samples/net/echo_server/prj_qemu_x86.conf

@@ -15,7 +15,6 @@ CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_NET_STATISTICS=y
 CONFIG_PRINTK=y
 
-CONFIG_NET_SLIP_TAP=y
 
 CONFIG_NET_PKT_RX_COUNT=10
 CONFIG_NET_PKT_TX_COUNT=10

samples/net/echo_server/prj_qemu_x86_tls.conf

@@ -10,7 +10,6 @@ CONFIG_SYS_LOG_NET_BUF_LEVEL=2
 CONFIG_NET_LOG=y
 CONFIG_SYS_LOG_NET_LEVEL=2
 CONFIG_NET_DEBUG_NET_PKT=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_INIT_STACKS=y
 CONFIG_PRINTK=y

samples/net/http_client/prj_qemu_x86.conf

@@ -3,7 +3,6 @@ CONFIG_NET_TCP=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_NET_LOG=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_INIT_STACKS=y
 
 CONFIG_NET_PKT_RX_COUNT=64

samples/net/http_server/prj_qemu_x86.conf

@@ -3,7 +3,6 @@ CONFIG_NET_TCP=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_NET_LOG=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_INIT_STACKS=y
 
 CONFIG_NET_PKT_RX_COUNT=16

samples/net/https_client/prj_qemu_x86.conf

@@ -3,7 +3,6 @@ CONFIG_NET_TCP=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_NET_LOG=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_INIT_STACKS=y
 
 CONFIG_NET_PKT_RX_COUNT=64

samples/net/irc_bot/prj_qemu_x86.conf

@@ -14,7 +14,6 @@ CONFIG_NET_BUF_TX_COUNT=30
 CONFIG_NET_PKT_RX_COUNT=14
 CONFIG_NET_PKT_TX_COUNT=14
 CONFIG_NET_SHELL=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NETWORKING=y

samples/net/leds_demo/prj.conf

@@ -3,7 +3,6 @@ CONFIG_NETWORKING=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_LOG=y
 CONFIG_NET_UDP=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_RANDOM_GENERATOR=y

samples/net/mbedtls_dtlsclient/prj_qemu_x86.conf

@@ -3,7 +3,6 @@ CONFIG_NET_IPV6=n
 CONFIG_NET_IPV4=y
 CONFIG_NET_UDP=y
 CONFIG_NET_LOG=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 

samples/net/mbedtls_dtlsserver/prj_qemu_x86.conf

@@ -4,7 +4,6 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_UDP=y
 CONFIG_NET_LOG=y
 CONFIG_NET_SLIP=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 

samples/net/mqtt_publisher/prj_qemu_x86.conf

@@ -3,7 +3,6 @@ CONFIG_NET_TCP=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_NET_LOG=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_INIT_STACKS=y
 
 CONFIG_NET_PKT_RX_COUNT=16

samples/net/nats/prj_qemu_x86.conf

@@ -11,7 +11,6 @@ CONFIG_NET_MAX_CONTEXTS=10
 CONFIG_NET_PKT_RX_COUNT=14
 CONFIG_NET_PKT_TX_COUNT=14
 CONFIG_NET_SHELL=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NETWORKING=y

samples/net/sockets/echo/prj_qemu_x86.conf

@@ -10,7 +10,6 @@ CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_POSIX_NAMES=y
 
 # Network driver config
-CONFIG_NET_SLIP_TAP=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 
 # Without CONFIG_NET_BUF_LOG printf() doesn't work

samples/net/sockets/echo_async/prj_qemu_x86.conf

@@ -10,7 +10,6 @@ CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_POSIX_NAMES=y
 
 # Network driver config
-CONFIG_NET_SLIP_TAP=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 
 # Without CONFIG_NET_BUF_LOG printf() doesn't work

samples/net/telnet/prj_qemu_x86.conf

@@ -6,7 +6,6 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_ARP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
-CONFIG_NET_SLIP_TAP=y
 
 CONFIG_NET_DHCPV4=n
 CONFIG_NET_MGMT=n

samples/net/telnet/prj_qemu_x86_iamcu.conf

@@ -6,7 +6,6 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_ARP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
-CONFIG_NET_SLIP_TAP=y
 
 CONFIG_NET_DHCPV4=n
 CONFIG_NET_MGMT=n

samples/net/zoap_client/prj.conf

@@ -3,7 +3,6 @@ CONFIG_NET_IPV4=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_LOG=y
 CONFIG_NET_UDP=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_RANDOM_GENERATOR=y

samples/net/zoap_server/prj.conf

@@ -2,7 +2,6 @@ CONFIG_NETWORKING=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_LOG=y
 CONFIG_NET_UDP=y
-CONFIG_NET_SLIP_TAP=y
 CONFIG_SYS_LOG=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 CONFIG_RANDOM_GENERATOR=y

samples/net/zperf/prj_qemu_x86.conf

@@ -22,7 +22,6 @@ CONFIG_INIT_STACKS=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 CONFIG_SYS_LOG_SHOW_COLOR=y
 
-CONFIG_NET_SLIP_TAP=y
 CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_SHELL=y
 

subsys/net/ip/Kconfig

@@ -239,31 +239,12 @@ config NET_CONTEXT_CHECK
 	If you know that the options passed to net_context...() functions
 	are ok, then you can disable the checks to save some memory.
 
-choice
+config NET_TEST
-	prompt "Use SLIP connectivity with QEMU"
+	bool "Network Testing"
-	optional
+	default n
-	default NET_SLIP_TUN
 	help
-	  The SLIP support is only used when the application is run inside QEMU
+	  Used for self-contained networking tests that do not require a
-	  and the network peer is run in your host. The host needs to have
+	  network device.
-	  tunslip running in order to receive and send network packets via the
-	  SLIP driver.  The SLIP driver Kconfig options can be tweaked in drivers
-	  section.
-
-	  Options are provided to communicate with QEMU via a TUN driver, the
-	  default, as it requires less configuration in the host side, or via a
-	  TAP driver.
-
-config NET_SLIP_TUN
-	bool "TUN SLIP driver"
-	select SLIP
-	select UART_PIPE
-	select UART_INTERRUPT_DRIVEN
-	select NET_L2_DUMMY
-	help
-	  The host needs to have tunslip running in order
-	  to receive and send network packets via the SLIP driver.
-	  Choose this if unsure.
 
 config NET_SLIP_TAP
 	bool "TAP SLIP driver"
@@ -271,11 +252,12 @@ config NET_SLIP_TAP
 	select UART_PIPE
 	select UART_INTERRUPT_DRIVEN
 	select SLIP_TAP
+	default n
+	default y if (QEMU_TARGET && !NET_TEST)
 	help
 	  SLIP TAP support is necessary when testing IPv4/ARP. The host
 	  needs to have tunslip with TAP support running in order to
 	  communicate via the SLIP driver.
-endchoice
 
 config NET_TRICKLE
 	bool "Enable Trickle library"

subsys/net/ip/l2/Kconfig

@@ -9,7 +9,7 @@ menu "Link layer options"
 config NET_L2_DUMMY
 	bool "Enable dummy l2 layer"
 	default n
-	default y if !NET_L2_ETHERNET && NET_SLIP_TUN
+	default y if !NET_L2_ETHERNET && NET_TEST
 	help
 	Add a dummy L2 layer driver, usually in case you need SLIP in
 	TUN mode.

tests/net/6lo/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_L2_DUMMY=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_IPV6_ND=n

tests/net/all/prj.conf

@@ -106,8 +106,6 @@ CONFIG_NET_CONTEXT_SYNC_RECV=y
 CONFIG_NET_CONTEXT_CHECK=y
 
 # SLIP
-CONFIG_NET_SLIP_TUN=n
-CONFIG_NET_SLIP_TAP=y
 
 # Trickle algo
 CONFIG_NET_TRICKLE=y

tests/net/arp/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_ARP=y
 CONFIG_NET_L2_ETHERNET=y
 CONFIG_NET_IPV4=y

tests/net/buf/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NET_BUF=y
+CONFIG_NET_TEST=y
 #CONFIG_NET_BUF_LOG=y
 #CONFIG_SYS_LOG_NET_BUF_LEVEL=4
 CONFIG_ZTEST=y

tests/net/context/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=n

tests/net/dhcpv4/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_L2_DUMMY=y
 CONFIG_NET_UDP=y
 CONFIG_NET_DHCPV4=y

tests/net/icmpv6/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_BUF=y

tests/net/ieee802154/fragment/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_L2_DUMMY=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_IPV6_ND=n

tests/net/ieee802154/l2/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_BUF=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_L2_IEEE802154=y

tests/net/iface/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=n

tests/net/ip-addr/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_IPV6_DAD=n
 CONFIG_NET_IPV6_ND=n

tests/net/ipv6/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=n

tests/net/ipv6_fragment/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=n

tests/net/lib/dns_packet/prj.conf

@@ -1,5 +1,6 @@
 # required for htons
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 
 # native IP stack support
 CONFIG_RANDOM_GENERATOR=y

tests/net/lib/dns_resolve/prj.conf

@@ -1,5 +1,5 @@
 CONFIG_NETWORKING=y
-
+CONFIG_NET_TEST=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 

tests/net/lib/http_header_fields/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_RANDOM_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 

tests/net/lib/mqtt_packet/prj.conf

@@ -1,5 +1,6 @@
 # required for htons
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 
 # native IP stack support
 CONFIG_RANDOM_GENERATOR=y

tests/net/lib/zoap/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NET_BUF_LOG=y
+CONFIG_NET_TEST=y
 CONFIG_SYS_LOG_NET_BUF_LEVEL=2
 CONFIG_NETWORKING=y
 CONFIG_NETWORKING_WITH_IPV6=y

tests/net/mgmt/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_BUF=y
 CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_NET_PKT_RX_COUNT=5

tests/net/mld/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_ZTEST=y
+CONFIG_NET_TEST=y
 CONFIG_NETWORKING=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y

tests/net/neighbor/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_BUF=y
 CONFIG_MAIN_STACK_SIZE=2048

tests/net/net_pkt/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_BUF=y
 CONFIG_NET_BUF_LOG=y

tests/net/route/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=n

tests/net/rpl/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=n

tests/net/socket/udp/prj.conf

@@ -10,7 +10,6 @@ CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_POSIX_NAMES=y
 
 # Network driver config
-CONFIG_NET_SLIP_TAP=y
 CONFIG_TEST_RANDOM_GENERATOR=y
 
 # Network address config

tests/net/tcp/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_L2_DUMMY=y
 CONFIG_NET_TCP=y
 CONFIG_NET_MAX_CONN=64

tests/net/trickle/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=n

tests/net/udp/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_L2_DUMMY=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=n

tests/net/utils/prj.conf

@@ -1,4 +1,5 @@
 CONFIG_NETWORKING=y
+CONFIG_NET_TEST=y
 CONFIG_NET_IPV6=y
 CONFIG_NET_IPV4=y
 CONFIG_NET_BUF=y