Changeset 79509 in vbox for trunk/src/VBox

Timestamp:

Jul 3, 2019 3:41:17 PM (6 years ago)

Author:

vboxsync

Message:

Dhcpd: Ditched std:vector<char> + catch with wrong slash non-sense in VBoxNetDhcpd::vmmInit(). Misc cleanups.

Location:

trunk/src/VBox/NetworkServices/Dhcpd

Files:

• Config.cpp (modified) (6 diffs)
• Db.cpp (modified) (2 diffs)
• Makefile.kmk (modified) (2 diffs)
• VBoxNetDhcpd.cpp (modified) (6 diffs)

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

@@ -74 +74 @@
 int Config::homeInit()
 {
-    int rc;
-
     /* pathname of ~/.VirtualBox or equivalent */
     char szHome[RTPATH_MAX];
-    rc = com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome), false);
+    int rc = com::GetVBoxUserHomeDirectory(szHome, sizeof(szHome), false);
     if (RT_FAILURE(rc))
     {
@@ -596 +594 @@
     parseServer(root);
 
-    /** @todo r=bird: Visual C++ 2010 does not grok this use of 'auto'. */
     // XXX: debug
     for (optmap_t::const_iterator it = m_GlobalOptions.begin(); it != m_GlobalOptions.end(); ++it) {
@@ -721 +718 @@
 
 
-/*
+/**
  * VM Config entries are generated automatically from VirtualBox.xml
  * with the MAC fetched from the VM config.  The client id is nowhere
@@ -787 +784 @@
 
 
-/*
+/**
  * Parse <Option/> element and add the option to the specified optmap.
  */
@@ -845 +842 @@
 
 
-/*
+/**
  * Set m_strBaseName to sanitized version of m_strNetwork that can be
  * used in a path component.
@@ -861 +858 @@
         return;
 
-    for (char *p = szBaseName; *p != '\0'; ++p)
-    {
-        if (RTPATH_IS_SEP(*p))
-        {
+    char ch;
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+    static const char s_szIllegals[] = "/\\\"*:<>?|\t\v\n\r\f\a\b"; /** @todo all control chars... */
+    for (char *p = szBaseName; (ch = *p) != '\0'; ++p)
+        if (strchr(s_szIllegals, ch))
             *p = '_';
-        }
-    }
+#else
+    for (char *p = szBaseName; (ch = *p) != '\0'; ++p)
+        if (RTPATH_IS_SEP(ch))
+            *p = '_';
+#endif
 
     m_strBaseName.assign(szBaseName);

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

@@ -473 +473 @@
             return addrBinding;
         }
-        else
-        {
-            LogDHCP(("> .... cannot reuse %s binding for this address\n",
-                     addrBinding->stateName()));
-        }
+        LogDHCP(("> .... cannot reuse %s binding for this address\n",
+                 addrBinding->stateName()));
     }
 
@@ -544 +541 @@
     Assert(b->id() == id);
 
-    /*
+    /** @todo
      * XXX: handle requests for specific lease time!
      * XXX: old lease might not have expired yet?

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

@@ -50 +50 @@
  VBoxNetDhcpd_INCS += . $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_INCS))
 
- VBoxNetDhcpd_DEFS    = KBUILD_TYPE=\"$(KBUILD_TYPE)\"
+ VBoxNetDhcpd_DEFS       = KBUILD_TYPE=\"$(KBUILD_TYPE)\"
  ifneq ($(KBUILD_TARGET),win)
   VBoxNetDhcpd_DEFS     += VBOX_WITH_XPCOM
@@ -59 +59 @@
   endif
  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))
+ VBoxNetDhcpd_SOURCES = \
+        ClientId.cpp \
+        Config.cpp \
+        DHCPD.cpp \
+        Db.cpp \
+        DhcpMessage.cpp \
+        DhcpOptions.cpp \
+        IPv4Pool.cpp \
+        TimeStamp.cpp \
+        VBoxNetDhcpd.cpp \
+        ../../Main/glue/VBoxLogRelCreate.cpp \
+        ../../Main/glue/GetVBoxUserHomeDirectory.cpp \
+        $(addprefix ../../Devices/Network/lwip-new/,$(LWIP_SOURCES))
 
  VBoxNetDhcpd_LIBS = $(LIB_RUNTIME)
-
  VBoxNetDhcpd_LIBS.solaris += socket nsl
  VBoxNetDhcpd_LDFLAGS.win = /SUBSYSTEM:windows

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

@@ -244 +244 @@
 int VBoxNetDhcpd::vmmInit()
 {
-    int rc;
-    try {
-        std::vector<char> vExecDir(RTPATH_MAX);
-        rc = RTPathExecDir(&vExecDir.front(), vExecDir.size());
-        if (RT_FAILURE(rc))
-            return rc;
-        std::string strPath(&vExecDir.front());
-        strPath.append("/VMMR0.r0");
-
-        rc = SUPR3LoadVMM(strPath.c_str());
-        if (RT_FAILURE(rc))
-            return rc;
-
-        rc = VINF_SUCCESS;
-    }
-    catch (...)
-    {
-        rc = VERR_GENERAL_FAILURE;
-    }
-
+    char szPathVMMR0[RTPATH_MAX];
+    int rc = RTPathExecDir(szPathVMMR0, sizeof(szPathVMMR0));
+    if (RT_SUCCESS(rc))
+        rc = RTPathAppend(szPathVMMR0, sizeof(szPathVMMR0), "VMMR0.r0");
+    if (RT_SUCCESS(rc))
+        rc = SUPR3LoadVMM(szPathVMMR0);
     return rc;
 }
@@ -316 +302 @@
 
     OpenReq.fFlags = 0;
-    OpenReq.cbSend = 128 * _1K;
-    OpenReq.cbRecv = 256 * _1K;
+    OpenReq.cbSend = _128K;
+    OpenReq.cbRecv = _256K;
 
     OpenReq.hIf = INTNET_HANDLE_INVALID;
@@ -471 +457 @@
 
 
-/*
+/**
  * Got a frame from the internal network, feed it to the lwIP stack.
  */
@@ -495 +481 @@
      */
     struct pbuf *q = p;
-    uint8_t *pu8Chunk = (uint8_t *)pvFrame;
+    uint8_t *pbChunk = (uint8_t *)pvFrame;
     do {
         uint8_t *payload = (uint8_t *)q->payload;
@@ -507 +493 @@
         }
 #endif
-        memcpy(payload, pu8Chunk, len);
-        pu8Chunk += len;
+        memcpy(payload, pbChunk, len);
+        pbChunk += len;
         q = q->next;
     } while (RT_UNLIKELY(q != NULL));
@@ -517 +503 @@
 
 
-/*
+/**
  * Got a frame from the lwIP stack, feed it to the internal network.
  */