From d6f2c883c5db8f6e46bbb62174798891635ee758 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Sun, 3 Apr 2022 19:25:22 +0200 Subject: [PATCH] examples/telnet_server: add support for LWIP --- examples/telnet_server/Makefile | 24 +++++++++++++++++------- examples/telnet_server/main.c | 3 +-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/examples/telnet_server/Makefile b/examples/telnet_server/Makefile index 78de41dbbdc6..07d26641254e 100644 --- a/examples/telnet_server/Makefile +++ b/examples/telnet_server/Makefile @@ -10,13 +10,23 @@ RIOTBASE ?= $(CURDIR)/../.. # Include packages that pull up and auto-init the link layer. # NOTE: 6LoWPAN will be included if IEEE802.15.4 devices are present USEMODULE += netdev_default -USEMODULE += auto_init_gnrc_netif -# Activate ICMPv6 error messages -USEMODULE += gnrc_icmpv6_error -# Specify the mandatory networking modules for IPv6 -USEMODULE += gnrc_ipv6_default -# Additional networking modules that can be dropped if not needed -USEMODULE += gnrc_icmpv6_echo + +# use GNRC by default +LWIP ?= 0 + +ifeq (0,$(LWIP)) + USEMODULE += auto_init_gnrc_netif + # Activate ICMPv6 error messages + USEMODULE += gnrc_icmpv6_error + # Specify the mandatory networking modules for IPv6 + USEMODULE += gnrc_ipv6_default + # Additional networking modules that can be dropped if not needed + USEMODULE += gnrc_icmpv6_echo +else + USEMODULE += lwip_ipv6 + USEMODULE += lwip_netdev +endif + USEMODULE += netutils # Add also the shell, some shell commands USEMODULE += shell diff --git a/examples/telnet_server/main.c b/examples/telnet_server/main.c index 7cfa348591f6..419568335789 100644 --- a/examples/telnet_server/main.c +++ b/examples/telnet_server/main.c @@ -21,8 +21,7 @@ #include #include "net/ipv6/addr.h" -#include "net/gnrc.h" -#include "net/gnrc/netif.h" +#include "net/netif.h" #include "net/telnet.h" #include "shell.h" #include "msg.h"