Changeset 75568 in vbox for trunk/src/VBox/NetworkServices

Timestamp:

Nov 19, 2018 11:52:10 AM (6 years ago)

Author:

vboxsync

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

126727

Message:

Main/DHCPD: bugref:9288 Use new implementation of DHCP server (VCC 10 and older GCC support).

Location:

trunk/src/VBox/NetworkServices

Files:

• Dhcpd/ClientId.h (modified) (1 diff)
• Dhcpd/Config.cpp (modified) (7 diffs)
• Dhcpd/Db.cpp (modified) (1 diff)
• Dhcpd/Db.h (modified) (3 diffs)
• Dhcpd/Defs.h (modified) (2 diffs)
• Dhcpd/DhcpMessage.cpp (modified) (2 diffs)
• Dhcpd/DhcpOptions.cpp (modified) (1 diff)
• Dhcpd/Makefile.kmk (modified) (1 diff)
• Dhcpd/VBoxNetDhcpd.cpp (modified) (3 diffs)
• Dhcpd/VBoxNetDhcpd.rc (added)
• Dhcpd/VBoxNetDhcpdHardened.cpp (added)
• Makefile.kmk (modified) (1 diff)

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

@@ -35 +35 @@
     ClientId()
       : m_mac(), m_id() {}
-    ClientId(const RTMAC &mac, const OptClientId &id)
-      : m_mac(mac), m_id(id) {}
+    ClientId(const RTMAC &macParam, const OptClientId &idParam)
+      : m_mac(macParam), m_id(idParam) {}
 
     const RTMAC &mac() const { return m_mac; }

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

@@ -589 +589 @@
     /** @todo r=bird: Visual C++ 2010 does not grok this use of 'auto'. */
     // XXX: debug
-    for (auto it: m_GlobalOptions) {
-        std::shared_ptr<DhcpOption> opt(it.second);
+    for (optmap_t::iterator it = m_GlobalOptions.begin(); it != m_GlobalOptions.end(); ++it) {
+        std::shared_ptr<DhcpOption> opt(it->second);
 
         octets_t data;
@@ -596 +596 @@
 
         bool space = false;
-        for (auto c: data) {
+        for (octets_t::iterator c = data.begin(); c != data.end(); ++c) {
             if (space)
                 std::cout << " ";
             else
                 space = true;
-            std::cout << (int)c;
+            std::cout << (int)*c;
         }
         std::cout << std::endl;
@@ -854 +854 @@
     optmap << new OptSubnetMask(m_IPv4Netmask);
 
-    for (auto optreq: reqOpts.value())
-    {
-        std::cout << ">>> requested option " << (int)optreq << std::endl;
-
-        if (optreq == OptSubnetMask::optcode)
+    const OptParameterRequest::value_t& reqValue = reqOpts.value();
+    for (octets_t::const_iterator optreq = reqValue.begin(); optreq != reqValue.end(); ++optreq)
+    {
+        std::cout << ">>> requested option " << (int)*optreq << std::endl;
+
+        if (*optreq == OptSubnetMask::optcode)
         {
             std::cout << "... always supplied" << std::endl;
@@ -866 +867 @@
         if (vmopts != NULL)
         {
-            optmap_t::const_iterator it( vmopts->find(optreq) );
+            optmap_t::const_iterator it( vmopts->find(*optreq) );
             if (it != vmopts->end())
             {
@@ -875 +876 @@
         }
 
-        optmap_t::const_iterator it( m_GlobalOptions.find(optreq) );
+        optmap_t::const_iterator it( m_GlobalOptions.find(*optreq) );
         if (it != m_GlobalOptions.end())
         {
@@ -890 +891 @@
     if (vmopts != NULL)
     {
-        for (auto it: *vmopts) {
-            std::shared_ptr<DhcpOption> opt(it.second);
+        for (optmap_t::const_iterator it = vmopts->begin(); it != vmopts->end(); ++it) {
+            std::shared_ptr<DhcpOption> opt(it->second);
             if (optmap.count(opt->optcode()) == 0 && opt->optcode() > 127)
             {
@@ -900 +901 @@
     }
 
-    for (auto it: m_GlobalOptions) {
-        std::shared_ptr<DhcpOption> opt(it.second);
+    for (optmap_t::const_iterator it = m_GlobalOptions.begin(); it != m_GlobalOptions.end(); ++it) {
+        std::shared_ptr<DhcpOption> opt(it->second);
         if (optmap.count(opt->optcode()) == 0 && opt->optcode() > 127)
         {

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/Db.h

@@ -51 +51 @@
     Binding(const Binding &);
 
-    explicit Binding(RTNETADDRIPV4 addr)
-      : m_addr(addr), m_state(FREE),
+    explicit Binding(RTNETADDRIPV4 addrParam)
+      : m_addr(addrParam), m_state(FREE),
         m_issued(), m_secLease() {}
 
-    Binding(RTNETADDRIPV4 addr, const ClientId &id)
-      : m_addr(addr), m_state(FREE), m_id(id),
+    Binding(RTNETADDRIPV4 addrParam, const ClientId &idParam)
+      : m_addr(addrParam), m_state(FREE), m_id(idParam),
         m_issued(), m_secLease() {}
 
@@ -70 +70 @@
     TimeStamp issued() const { return m_issued; }
 
-    Binding &setState(State state)
+    Binding &setState(State stateParam)
     {
-        m_state = state;
+        m_state = stateParam;
         return *this;
     }
@@ -85 +85 @@
     }
 
-    Binding &giveTo(const ClientId &id)
+    Binding &giveTo(const ClientId &idParam)
     {
-        m_id = id;
+        m_id = idParam;
         m_state = FREE;
         return *this;

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/DhcpMessage.cpp

@@ -323 +323 @@
 
 DhcpServerMessage::DhcpServerMessage(const DhcpClientMessage &req,
-                                     uint8_t messageType, RTNETADDRIPV4 serverAddr)
+                                     uint8_t messageTypeParam, RTNETADDRIPV4 serverAddr)
   : DhcpMessage(),
     m_optServerId(serverAddr)
@@ -329 +329 @@
     m_dst.u = 0xffffffff;       /* broadcast */
 
-    m_optMessageType = OptMessageType(messageType);
+    m_optMessageType = OptMessageType(messageTypeParam);
 
     /* copy values from the request (cf. RFC2131 Table 3) */

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
+
+ VBoxNetDhcpd_TEMPLATE := $(if-expr defined(VBOX_WITH_HARDENING),VBoxR3Dll,VBOXR3EXE)
+ 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 += $(VBOX_GCC_std)
+ 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;

trunk/src/VBox/NetworkServices/Makefile.kmk

@@ -22 +22 @@
 ifdef VBOX_WITH_MAIN
  # Include sub-makefiles.
- include $(PATH_SUB_CURRENT)/DHCP/Makefile.kmk
+ ifndef VBOX_WITH_DHCPD
+  include $(PATH_SUB_CURRENT)/DHCP/Makefile.kmk
+ else
+  include $(PATH_SUB_CURRENT)/Dhcpd/Makefile.kmk
+ endif
  ifdef VBOX_WITH_NAT_SERVICE
   include $(PATH_SUB_CURRENT)/NAT/Makefile.kmk