Rename lwip library to lwip_legacy

Rename LwIP library in preparation for removal of LwIP libc plugin. The
current LwIP library will be replaced with a new version stripped of its
synchronous socket support. The next version will be incompatible with
the current, so removing 'lwip.lib.so' completely for a period makes it
easy to identify legacy users.

Fix #2797

repos/dde_linux/run/usb_net.run

@@ -93,7 +93,7 @@ install_config $config
 # generic modules
 set boot_modules {
 	core ld.lib.so init timer usb_drv
-	libc.lib.so vfs.lib.so libm.lib.so lwip.lib.so posix.lib.so test-lwip_httpsrv
+	libc.lib.so vfs.lib.so libm.lib.so lwip_legacy.lib.so posix.lib.so test-lwip_httpsrv
 }
 
 append_platform_drv_boot_modules

repos/dde_linux/run/usb_rndis.run

@@ -100,7 +100,7 @@ install_config $config
 # generic modules
 set boot_modules {
 	core ld.lib.so init timer usb_drv
-	libc.lib.so vfs.lib.so libc_pipe.lib.so lwip.lib.so pthread.lib.so
+	libc.lib.so vfs.lib.so libc_pipe.lib.so lwip_legacy.lib.so pthread.lib.so
 	tcp_terminal
 	test-terminal_echo
 }

repos/dde_linux/run/wifi.run

@@ -142,7 +142,7 @@ set boot_modules {
 	wifi.lib.so
 	wifi_drv
 
-	test-lwip_httpsrv lwip.lib.so
+	test-lwip_httpsrv lwip_legacy.lib.so
 }
 
 append boot_modules $firmware_modules

repos/gems/run/http_blk.run

@@ -180,7 +180,7 @@ catch { exec dd if=/dev/zero of=bin/index.bin bs=512 count=400 }
 set boot_modules {
 	core ld.lib.so init timer
 	libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
-	lwip.lib.so zlib.lib.so
+	lwip_legacy.lib.so zlib.lib.so
 	lighttpd nic_bridge http_blk index.bin test-rom_blk
 }
 

repos/gems/run/tcp_terminal.run

@@ -86,7 +86,7 @@ install_config $config
 set boot_modules {
 	core ld.lib.so init timer
 	nic_drv
-	libc.lib.so vfs.lib.so pthread.lib.so lwip.lib.so libc_pipe.lib.so
+	libc.lib.so vfs.lib.so pthread.lib.so lwip_legacy.lib.so libc_pipe.lib.so
 	tcp_terminal
 	test-terminal_echo
 }

repos/gems/src/server/http_blk/http.cc

@@ -14,7 +14,7 @@
 #include <base/child.h>
 #include <base/log.h>
 #include <base/sleep.h>
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 #include <nic/packet_allocator.h>
 
 #include <sys/socket.h>

repos/libports/lib/import/import-lwip.mk

@@ -1,2 +0,0 @@
-INC_DIR += $(call select_from_ports,lwip)/include/lwip
-INC_DIR += $(call select_from_repositories,include/lwip)

repos/libports/lib/import/import-lwip_legacy.mk

@@ -0,0 +1,2 @@
+INC_DIR += $(call select_from_ports,lwip_legacy)/include/lwip_legacy
+INC_DIR += $(call select_from_repositories,include/lwip_legacy)

repos/libports/lib/mk/libc_lwip.mk

@@ -2,6 +2,6 @@ SRC_CC = init.cc plugin.cc
 
 vpath %.cc $(REP_DIR)/src/lib/libc_lwip
 
-LIBS += lwip libc
+LIBS += lwip_legacy libc
 
 CC_CXX_WARN_STRICT =

repos/libports/lib/mk/libc_lwip_loopback.mk

@@ -2,6 +2,6 @@ SRC_CC = init.cc
 
 vpath %.cc $(REP_DIR)/src/lib/libc_lwip_loopback
 
-LIBS += lwip libc libc_lwip
+LIBS += lwip_legacy libc libc_lwip
 
 CC_CXX_WARN_STRICT =

repos/libports/lib/mk/libc_lwip_nic_dhcp.mk

@@ -2,6 +2,6 @@ SRC_CC = plugin.cc
 
 vpath %.cc $(REP_DIR)/src/lib/libc_lwip_nic_dhcp
 
-LIBS += lwip libc libc_lwip
+LIBS += lwip_legacy libc libc_lwip
 
 CC_CXX_WARN_STRICT =

repos/libports/lib/mk/lwip_legacy.mk

@@ -4,8 +4,8 @@
 # The library implementes TCP and UDP as well as DNS and DHCP.
 #
 
-LWIP_PORT_DIR := $(call select_from_ports,lwip)
-LWIP_DIR      := $(LWIP_PORT_DIR)/src/lib/lwip
+LWIP_PORT_DIR := $(call select_from_ports,lwip_legacy)
+LWIP_DIR      := $(LWIP_PORT_DIR)/src/lib/lwip_legacy
 
 # Genode platform files
 SRC_CC   = nic.cc printf.cc sys_arch.cc
@@ -30,17 +30,17 @@ D_OPTS   = ERRNO
 D_OPTS  := $(addprefix -D,$(D_OPTS))
 CC_DEF  += $(D_OPTS)
 
-LD_OPT  += --version-script=$(REP_DIR)/src/lib/lwip/symbol.map
+LD_OPT  += --version-script=$(REP_DIR)/src/lib/lwip_legacy/symbol.map
 
-INC_DIR += $(REP_DIR)/include/lwip \
-           $(LWIP_PORT_DIR)/include/lwip \
+INC_DIR += $(REP_DIR)/include/lwip_legacy \
+           $(LWIP_PORT_DIR)/include/lwip_legacy \
            $(LWIP_DIR)/src/include \
            $(LWIP_DIR)/src/include/ipv4 \
            $(LWIP_DIR)/src/include/api \
            $(LWIP_DIR)/src/include/netif \
-           $(REP_DIR)/src/lib/lwip/include
+           $(REP_DIR)/src/lib/lwip_legacy/include
 
-vpath %.cc $(REP_DIR)/src/lib/lwip/platform
+vpath %.cc $(REP_DIR)/src/lib/lwip_legacy/platform
 vpath %.c  $(LWIP_DIR)/src/core
 vpath %.c  $(LWIP_DIR)/src/core/ipv4
 vpath %.c  $(LWIP_DIR)/src/api

repos/libports/ports/lwip.hash

@@ -1 +0,0 @@
-d84dafd43c71b0c325246801d7f2f5ee8ec7bbd9

repos/libports/ports/lwip_legacy.hash

@@ -0,0 +1 @@
+7f5610426ed8c4c64903136122d9ba58836cdc89

repos/libports/ports/lwip_legacy.port

@@ -4,13 +4,13 @@ DOWNLOADS := lwip.git window_scaling_patch.file
 
 URL(lwip) := git://git.savannah.nongnu.org/lwip.git
 REV(lwip) := fe63f36656bd66b4051bdfab93e351a584337d7c
-DIR(lwip) := src/lib/lwip
+DIR(lwip) := src/lib/lwip_legacy
 
 URL(window_scaling_patch)  := https://savannah.nongnu.org/patch/download.php?file_id=28026
-NAME(window_scaling_patch) := src/lib/lwip/window_scaling.patch
-SHA(window_scaling_patch)  := 5be562adddc05fa00ecead8fbca8d7797e76670e
+NAME(window_scaling_patch) := src/lib/lwip_legacy/window_scaling.patch
+SHA(window_scaling_patch)  := b8dcaa2e0508208222e3e84a42cbe3eba6f6bfc728a5ba62d0d6c4c0c548e46f
 
-PATCHES := $(addprefix src/lib/lwip/,window_scaling.patch \
+PATCHES := $(addprefix src/lib/lwip_legacy/,window_scaling.patch \
                                      errno.patch \
                                      libc_select_notify.patch \
                                      sockets_c_errno.patch \
@@ -19,12 +19,12 @@ PATCHES := $(addprefix src/lib/lwip/,window_scaling.patch \
                                      api_msg.patch \
                                      nonblocking_connect.patch)
 
-PATCH_OPT := -p1 -d src/lib/lwip
+PATCH_OPT := -p1 -d src/lib/lwip_legacy
 
-DIRS := include/lwip/lwip include/lwip/netif
+DIRS := include/lwip_legacy/lwip include/lwip_legacy/netif
 
-DIR_CONTENT(include/lwip/lwip) := src/lib/lwip/src/include/lwip/*.h \
-                                  src/lib/lwip/src/include/ipv4/lwip/*.h \
-                                  src/lib/lwip/src/include/ipv6/lwip/*.h
+DIR_CONTENT(include/lwip_legacy/lwip) := src/lib/lwip_legacy/src/include/lwip/*.h \
+                                  src/lib/lwip_legacy/src/include/ipv4/lwip/*.h \
+                                  src/lib/lwip_legacy/src/include/ipv6/lwip/*.h
 
-DIR_CONTENT(include/lwip/netif) := src/lib/lwip/src/include/netif/*.h
+DIR_CONTENT(include/lwip_legacy/netif) := src/lib/lwip_legacy/src/include/netif/*.h

repos/libports/run/lwip.run

@@ -125,7 +125,7 @@ install_config $config
 # generic modules
 set boot_modules {
 	core init timer
-	ld.lib.so libc.lib.so vfs.lib.so libm.lib.so lwip.lib.so test-lwip_httpsrv posix.lib.so
+	ld.lib.so libc.lib.so vfs.lib.so libm.lib.so lwip_legacy.lib.so test-lwip_httpsrv posix.lib.so
 }
 
 # platform-specific modules

repos/libports/run/lwip_lx.run

@@ -58,7 +58,7 @@ install_config $config
 
 set boot_modules {
 	core init timer linux_nic_drv
-	ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so lwip.lib.so test-lwip_httpsrv
+	ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so lwip_legacy.lib.so test-lwip_httpsrv
 }
 
 build_boot_image $boot_modules

repos/libports/run/nic_bridge.run

@@ -107,7 +107,7 @@ append boot_modules {
 	ld.lib.so
 	libc.lib.so vfs.lib.so
 	libm.lib.so
-	lwip.lib.so
+	lwip_legacy.lib.so
 	test-http_clnt
 	test-lwip_httpsrv_static
 }

repos/libports/run/nic_bridge_lighttpd.run

@@ -140,7 +140,7 @@ append boot_modules {
 	ld.lib.so
 	libc.lib.so vfs.lib.so
 	posix.lib.so
-	lwip.lib.so
+	lwip_legacy.lib.so
 	test-http_clnt
 	libm.lib.so
 	zlib.lib.so

repos/libports/run/nic_router.inc

@@ -61,7 +61,7 @@ proc server_config { name prot ip_addr gateway netmask nic port } {
 
 set boot_modules "
 	core init timer nic_router nic_bridge nic_loopback ld.lib.so
-	libc.lib.so vfs.lib.so lwip.lib.so [client_bin udp] [server_bin udp]
+	libc.lib.so vfs.lib.so lwip_legacy.lib.so [client_bin udp] [server_bin udp]
 	[client_bin http] [server_bin http] [platform_drv_boot_modules]"
 
 append qemu_args "-nographic "

repos/libports/run/test-ping_client.run

@@ -130,7 +130,7 @@ install_config $config
 # generic modules
 set boot_modules {
 	core init timer
-	ld.lib.so libc.lib.so vfs.lib.so lwip.lib.so posix.lib.so
+	ld.lib.so libc.lib.so vfs.lib.so lwip_legacy.lib.so posix.lib.so
 	test-ping_client_libc_lwip
 }
 

repos/libports/run/test-ping_server.run

@@ -104,7 +104,7 @@ install_config $config
 # generic modules
 set boot_modules {
 	core init timer
-	ld.lib.so libc.lib.so vfs.lib.so lwip.lib.so posix.lib.so
+	ld.lib.so libc.lib.so vfs.lib.so lwip_legacy.lib.so posix.lib.so
 	test-ping_server_libc_lwip
 }
 

repos/libports/src/lib/libc_lwip/plugin.cc

@@ -29,7 +29,7 @@
 extern "C" {
 #include <lwip/netdb.h>
 }
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 #include <lwip/sockets.h>
 
 /* lwip and libc have different definitions for the FD_* macros and renaming

repos/libports/src/lib/libc_lwip_loopback/init.cc

@@ -14,7 +14,7 @@
 
 #include <base/log.h>
 
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 
 extern void create_lwip_plugin();
 

repos/libports/src/lib/libc_lwip_nic_dhcp/plugin.cc

@@ -44,7 +44,7 @@
 #include <nic/packet_allocator.h>
 #include <util/string.h>
 
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 
 #undef AF_INET6
 #undef MSG_PEEK

repos/libports/src/lib/lwip_legacy/platform/sys_arch.cc

@@ -20,7 +20,7 @@
 #include <os/timed_semaphore.h>
 
 /* LwIP includes */
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 #include <ring_buffer.h>
 #include <thread.h>
 #include <verbose.h>

repos/libports/src/test/lwip/http_clnt/main.cc

@@ -26,7 +26,7 @@ extern "C" {
 #include <netif/etharp.h>
 }
 
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 
 
 /**

repos/libports/src/test/lwip/http_clnt/target.mk

@@ -1,5 +1,5 @@
 TARGET   = test-http_clnt
-LIBS     = lwip libc
+LIBS     = lwip_legacy libc
 SRC_CC   = main.cc
 
 INC_DIR += $(REP_DIR)/src/lib/lwip/include

repos/libports/src/test/lwip/http_srv/main.cc

@@ -29,7 +29,7 @@ extern "C" {
 #include <lwip/api.h>
 }
 
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 
 
 const static char http_html_hdr[] =

repos/libports/src/test/lwip/http_srv/target.mk

@@ -1,5 +1,5 @@
 TARGET   = test-lwip_httpsrv
-LIBS     = lwip posix
+LIBS     = lwip_legacy posix
 SRC_CC   = main.cc
 
 INC_DIR += $(REP_DIR)/src/lib/lwip/include

repos/libports/src/test/lwip/http_srv_static/main.cc

@@ -30,7 +30,7 @@ extern "C" {
 #include <lwip/api.h>
 }
 
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 
 using Response = Genode::String<1024>;
 

repos/libports/src/test/lwip/http_srv_static/target.mk

@@ -1,5 +1,5 @@
 TARGET   = test-lwip_httpsrv_static
-LIBS     = lwip libc
+LIBS     = lwip_legacy libc
 SRC_CC   = main.cc
 
 INC_DIR += $(REP_DIR)/src/lib/lwip/include

repos/libports/src/test/lwip/loopback/target.mk

@@ -1,5 +1,5 @@
 TARGET = test-lwip_loop
-LIBS   = lwip posix libc_lwip_loopback
+LIBS   = lwip_legacy posix libc_lwip_loopback
 SRC_CC = main.cc
 
 CC_CXX_WARN_STRICT =

repos/libports/src/test/lwip/pingpong/client/libc_lwip/target.mk

@@ -1,5 +1,5 @@
 TARGET   = test-ping_client_libc_lwip
-LIBS     = posix lwip libc_lwip_nic_dhcp
+LIBS     = posix lwip_legacy libc_lwip_nic_dhcp
 SRC_CC   = main.cc pingpong.cc
 
 vpath main.cc     $(PRG_DIR)/..

repos/libports/src/test/lwip/pingpong/client/lwip/target.mk

@@ -1,5 +1,5 @@
 TARGET   = test-ping_client_lwip
-LIBS     = posix lwip
+LIBS     = posix lwip_legacy
 SRC_CC   = main.cc pingpong.cc
 
 INC_DIR += $(REP_DIR)/src/lib/lwip/include

repos/libports/src/test/lwip/pingpong/server/libc_lwip/target.mk

@@ -1,5 +1,5 @@
 TARGET   = test-ping_server_libc_lwip
-LIBS     = posix libc_lwip_nic_dhcp libc_lwip lwip
+LIBS     = posix libc_lwip_nic_dhcp libc_lwip lwip_legacy
 SRC_CC   = main.cc pingpong.cc
 
 vpath main.cc     $(PRG_DIR)/..

repos/libports/src/test/lwip/pingpong/server/lwip/target.mk

@@ -1,5 +1,5 @@
 TARGET   = test-ping_server_lwip
-LIBS     = posix lwip
+LIBS     = posix lwip_legacy
 SRC_CC   = main.cc pingpong.cc
 
 CC_OPT += -DLWIP_NATIVE

repos/libports/src/test/lwip/pingpong/server/main.cc

@@ -17,7 +17,7 @@
 
 #ifdef LWIP_NATIVE
 #include <nic/packet_allocator.h>
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 #endif
 
 #include "../pingpong.h"

repos/libports/src/test/lwip/udp/client/target.mk

@@ -1,5 +1,5 @@
 TARGET   = test-lwip-udp-client
-LIBS     = libc libc_lwip_nic_dhcp libc_lwip lwip
+LIBS     = libc libc_lwip_nic_dhcp libc_lwip lwip_legacy
 SRC_CC   = main.cc
 
 INC_DIR += $(REP_DIR)/src/lib/lwip/include

repos/libports/src/test/lwip/udp/server/target.mk

@@ -1,5 +1,5 @@
 TARGET   = test-lwip-udp-server
-LIBS     = libc libc_lwip_nic_dhcp libc_lwip lwip
+LIBS     = libc libc_lwip_nic_dhcp libc_lwip lwip_legacy
 SRC_CC   = main.cc
 
 INC_DIR += $(REP_DIR)/src/lib/lwip/include

repos/ports/run/dosbox.run

@@ -122,7 +122,7 @@ append boot_modules {
 	core init timer } [audio_drv_binary] {
 	ld.lib.so
 	libc.lib.so vfs.lib.so
-	libm.lib.so lwip.lib.so libpng.lib.so
+	libm.lib.so libpng.lib.so
 	stdcxx.lib.so sdl.lib.so sdl_net.lib.so pthread.lib.so zlib.lib.so
 	dosbox dosbox.tar
 }

repos/ports/run/genode_org.run

@@ -161,7 +161,7 @@ exec tar cfv bin/genode_org.tar -h -C bin/genode_org .
 set boot_modules {
 	core init timer ld.lib.so
 	libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
-	lwip.lib.so zlib.lib.so
+	lwip_legacy.lib.so zlib.lib.so
 	lighttpd genode_org.tar
 }
 

repos/ports/run/lighttpd.run

@@ -109,7 +109,7 @@ install_config $config
 append boot_modules {
 	core init timer ld.lib.so } [nic_drv_binary] {
 	libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
-	lwip.lib.so zlib.lib.so
+	lwip_legacy.lib.so zlib.lib.so
 	lighttpd
 }
 

repos/ports/run/netperf_lwip.inc

@@ -1,4 +1,4 @@
 set netperf_target  app/netperf/lwip
 set netperf_app     netserver_lwip
-set netperf_stack   lwip.lib.so
+set netperf_stack   lwip_legacy.lib.so
 set ip_match_string "got IP address (\[0-9]{1,3}.\[0-9]{1,3}.\[0-9]{1,3}.\[0-9]{1,3}).*\n"

repos/ports/run/noux_net_netcat.run

@@ -175,7 +175,7 @@ install_config $config
 set boot_modules {
 	core init timer tcp_terminal nic_bridge
 	ld.lib.so noux_net libc.lib.so vfs.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so
-	libc_noux.lib.so lwip.lib.so netcat.tar posix.lib.so
+	libc_noux.lib.so lwip_legacy.lib.so netcat.tar posix.lib.so
 }
 
 # platform-specific modules

repos/ports/run/vbox_share.inc

@@ -118,7 +118,7 @@ foreach pkg {bash coreutils} {
 set boot_modules {
 	ram_fs
 	noux libc_noux.lib.so posix.lib.so bash.tar coreutils.tar
-	tcp_terminal lwip.lib.so nic_drv report_rom
+	tcp_terminal lwip_legacy.lib.so nic_drv report_rom
 	input_merger
 	test.bin template.bat
 }

repos/ports/src/app/dosbox/target.mk

@@ -56,6 +56,5 @@ CC_WARN += -Wno-unused-variable -Wno-unused-function -Wno-switch -Wno-unused-val
            -Wno-parentheses
 
 LIBS += libpng libc sdl sdlmain sdl_net stdcxx zlib
-LIBS += libc_lwip_nic_dhcp
 
 CC_CXX_WARN_STRICT =

repos/ports/src/noux/net/net.cc

@@ -16,7 +16,7 @@
 #include <dataspace/client.h>
 #include <base/lock.h>
 
-#include <lwip/genode.h>
+#include <lwip_legacy/genode.h>
 
 /* Noux includes */
 #include <child.h>