Changeset 109265 in vbox

Timestamp:

May 14, 2025 4:29:37 PM (6 days ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168862

Message:

Config.kmk,libs/lwip-2.2.1: Add special lwip library variant for the DHCP service which has TCP disabled and accepts DHCP requests from broadcast addresses, bugref:10899

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/lwip-2.2.1/Makefile.kmk (modified) (1 diff)
• src/libs/lwip-2.2.1/vbox/include/lwipopts.h (modified) (4 diffs)

trunk/Config.kmk

@@ -5289 +5289 @@
  SDK_VBoxLwip_INCS             ?= $(SDK_VBoxLwip_DEFAULT_INCS)
  SDK_VBoxLwip_LIBS             ?= $(PATH_STAGE_LIB)/VBox-lwip$(VBOX_SUFF_LIB)
+
+ SDK_VBoxLwipDhcp              := Special lwip for the DHCP service.
+ SDK_VBoxLwipDhcp_EXTENDS      := VBoxLwip
+ SDK_VBoxLwipDhcp_LIBS         ?= $(PATH_STAGE_LIB)/VBox-lwip-dhcp$(VBOX_SUFF_LIB)
 endif
 

trunk/src/libs/lwip-2.2.1/Makefile.kmk

@@ -95 +95 @@
         vbox/VBoxLwipCore.cpp
 
+LIBRARIES += VBox-lwip-dhcp
+VBox-lwip-dhcp_EXTENDS := VBox-lwip
+VBox-lwip-dhcp_DEFS += VBOX_LWIP_DHCP
+
 include $(FILE_KBUILD_SUB_FOOTER)

trunk/src/libs/lwip-2.2.1/vbox/include/lwipopts.h

@@ -124 +124 @@
 #define LWIP_TCPIP_CORE_LOCKING_INPUT 0
 #define LWIP_TCPIP_CORE_LOCKING 0
-#define LWIP_TCP 1
 #define LWIP_SOCKET 1
 #define LWIP_ARP 1
@@ -132 +131 @@
 #define LWIP_COMPAT_MUTEX 1
 
+#define LWIP_IPV4 1
 #define LWIP_IPV6 1
 #define LWIP_IPV6_FORWARD 0
@@ -150 +150 @@
 #define LWIP_RAW                        1
 
-/**
- * aka Slirp mode.
- */
-#define LWIP_CONNECTION_PROXY 0
 #define IP_FORWARD            0
 
@@ -184 +180 @@
 #define IPV6_FRAG_COPYHEADER 1
 
+#ifdef VBOX_LWIP_DHCP
+/* accept any->broadcast */
+# define LWIP_IP_ACCEPT_UDP_PORT(port) ((port) == PP_NTOHS(/*DHCP_SERVER_PORT*/ 67))
+#else
+# define LWIP_TCP 1
+#endif
+
 #include "lwip-namespace.h"