Changeset 75512 in vbox for trunk/src/VBox/NetworkServices/Dhcpd

Timestamp:

Nov 16, 2018 11:33:38 AM (6 years ago)

Author:

vboxsync

Message:

Main/DHCPD: bugref:9288 Use new implementation of DHCP server.

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

• Db.cpp (modified) (1 diff)
• Defs.h (modified) (2 diffs)
• DhcpOptions.cpp (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• VBoxNetDhcpd.cpp (modified) (3 diffs)

trunk/src/VBox/NetworkServices/Dhcpd/Db.cpp

@@ -291 +291 @@
      */
     const xml::ElementNode *ndTime = ndLease->findChildElement("Time");
-    if (time == NULL)
+    if (ndTime == NULL)
         return NULL;
 

trunk/src/VBox/NetworkServices/Dhcpd/Defs.h

@@ -27 +27 @@
 #include <vector>
 
+#ifdef _MSC_VER
+# define __func__ __FUNCTION__
+#endif
+
 typedef std::vector<uint8_t> octets_t;
 
@@ -32 +36 @@
 
 class DhcpOption;
-typedef std::map<uint8_t, std::shared_ptr<DhcpOption>> optmap_t;
+typedef std::map<uint8_t, std::shared_ptr<DhcpOption> > optmap_t;
 
 inline bool operator==(const RTMAC &l, const RTMAC &r)

trunk/src/VBox/NetworkServices/Dhcpd/DhcpOptions.cpp

@@ -36 +36 @@
 optmap_t &operator<<(optmap_t &optmap, const std::shared_ptr<DhcpOption> &option)
 {
-    if (option == NULL)
+    if (option == nullptr)
         return optmap;
 

trunk/src/VBox/NetworkServices/Dhcpd/Makefile.kmk

@@ -29 +29 @@
  ifdef VBOX_WITH_HARDENING
   PROGRAMS += VBoxNetDhcpdHardened
-  VBoxNetDhcpdHardened_TEMPLATE = VBOXR3HARDENEDEXE
-  VBoxNetDhcpdHardened_NAME     = VBoxNetDhcpd
-  VBoxNetDhcpdHardened_DEFS     = SERVICE_NAME=\"VBoxNetDhcpd\"
-  VBoxNetDhcpdHardened_SOURCES  = VBoxNetDhcpdHardened.cpp
-  VBoxNetDhcpdHardened_SOURCES.win = $(VBoxNetLwipNAT_0_OUTDIR)/VBoxNetDhcpd-icon.rc
-  VBoxNetDhcpdHardened_LDFLAGS.win = /SUBSYSTEM:windows
+  DLLS += VBoxNetDhcpd
  else
   PROGRAMS += VBoxNetDhcpd
  endif
 
- VBoxNetDhcpd_TEMPLATE := $(if-expr defined(VBOX_WITH_HARDENING),VBOXMAINDLL,VBOXMAINCLIENTEXE)
- VBoxNetDhcpd_NAME     := VBoxNetDhcpd
+ VBoxNetDhcpdHardened_TEMPLATE = VBOXR3HARDENEDEXE
+ VBoxNetDhcpdHardened_NAME     = VBoxNetDHCP
+ VBoxNetDhcpdHardened_DEFS     = SERVICE_NAME=\"VBoxNetDhcpd\"
+ VBoxNetDhcpdHardened_SOURCES  = VBoxNetDhcpdHardened.cpp
+ VBoxNetDhcpdHardened_SOURCES.win = $(VBoxNetDhcpd_0_OUTDIR)/VBoxNetDhcpd-icon.rc
+ VBoxNetDhcpdHardened_LDFLAGS.win = /SUBSYSTEM:windows
+
+ if1of ($(KBUILD_TARGET),win linux solaris)
+  VBoxNetDhcpd_TEMPLATE := $(if-expr defined(VBOX_WITH_HARDENING),VBoxR3DllDhcpd,VBoxR3ExeDhcpd)
+ else
+  VBoxNetDhcpd_TEMPLATE := $(if-expr defined(VBOX_WITH_HARDENING),VBoxR3Dll,VBOXR3EXE)
+ endif
+ VBoxNetDhcpd_NAME      = VBoxNetDHCP
  # VBoxNetDhcpd_DEFS      = IPv6
- # VBoxNetLwipNAT_DEFS.linux = WITH_VALGRIND
- VBoxNetDhcpd_DEFS.win  = VBOX_COM_OUTOFPROC_MODULE _WIN32_WINNT=0x501 # Windows XP
+ # VBoxNetDhcpd_DEFS.linux = WITH_VALGRIND
+ #VBoxNetDhcpd_DEFS.win  = VBOX_COM_OUTOFPROC_MODULE _WIN32_WINNT=0x501 # Windows XP
 
  # (current dir is for for lwipopts.h)
  VBoxNetDhcpd_INCS += . $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_INCS))
 
- VBoxNetDhcpd_SOURCES  =
- VBoxNetDhcpd_SOURCES += ClientId.cpp
- VBoxNetDhcpd_SOURCES += Config.cpp
- VBoxNetDhcpd_SOURCES += DHCPD.cpp
- VBoxNetDhcpd_SOURCES += Db.cpp
- VBoxNetDhcpd_SOURCES += DhcpMessage.cpp
- VBoxNetDhcpd_SOURCES += DhcpOptions.cpp
- VBoxNetDhcpd_SOURCES += IPv4Pool.cpp
- VBoxNetDhcpd_SOURCES += TimeStamp.cpp
- VBoxNetDhcpd_SOURCES += VBoxNetDhcpd.cpp
- VBoxNetDhcpd_SOURCES += $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_SOURCES))
+ VBoxNetDhcpd_DEFS    = KBUILD_TYPE=\"$(KBUILD_TYPE)\"
+ ifneq ($(KBUILD_TARGET),win)
+  VBoxNetDhcpd_DEFS  += VBOX_WITH_XPCOM
+  VBoxNetDhcpd_INCS  += $(VBOX_XPCOM_INCS)
+  VBoxNetDhcpd_CXXFLAGS += -std=c++11
+ endif
+ VBoxNetDhcpd_SOURCES = ../../Main/glue/VBoxLogRelCreate.cpp \
+                        ../../Main/glue/GetVBoxUserHomeDirectory.cpp \
+                        ClientId.cpp \
+                        Config.cpp \
+                        DHCPD.cpp \
+                        Db.cpp \
+                        DhcpMessage.cpp \
+                        DhcpOptions.cpp \
+                        IPv4Pool.cpp \
+                        TimeStamp.cpp \
+                        VBoxNetDhcpd.cpp \
+                        $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_SOURCES))
 
- VBoxNetLwipNAT_LIBS = $(LIB_RUNTIME)
+ VBoxNetDhcpd_LIBS = $(LIB_RUNTIME)
 
- VBoxNetLwipNAT_LIBS.solaris += socket nsl
- VBoxNetLwipNAT_LDFLAGS.win = /SUBSYSTEM:windows
+ VBoxNetDhcpd_LIBS.solaris += socket nsl
+ VBoxNetDhcpd_LDFLAGS.win = /SUBSYSTEM:windows
 
  ifeq ($(KBUILD_TARGET),win)

trunk/src/VBox/NetworkServices/Dhcpd/VBoxNetDhcpd.cpp

@@ -52 +52 @@
 #include <memory>
 
+#ifdef RT_OS_WINDOWS /* WinMain */
+#undef htonl
+#undef ntohl
+# include <iprt/win/windows.h>
+#endif
 
 struct delete_pbuf
@@ -448 +453 @@
                                                      i, cSegs,
                                                      &cbSegFrame);
-                ifInput(pvSegFrame, cbFrame);
+                ifInput(pvSegFrame, (uint32_t)cbFrame);
             }
         }
@@ -738 +743 @@
 
     unique_ptr_pbuf q ( pbuf_alloc(PBUF_RAW, (u16_t)data.size(), PBUF_RAM) );
-    if (q == NULL)
-        return;
-
-    error = pbuf_take(q.get(), &data.front(), data.size());
+    if (q == nullptr)
+        return;
+
+    error = pbuf_take(q.get(), &data.front(), (u16_t)data.size());
     if (error != ERR_OK)
         return;