Changeset 76007 in vbox for trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp

Timestamp:

Dec 6, 2018 9:51:03 AM (6 years ago)

Author:

vboxsync

Message:

Main/DHCPServer: (bugref:9288) Fixed regression causing DHCP server start failure with NAT network.

File:

• trunk/src/VBox/NetworkServices/Dhcpd/Config.cpp (modified) (2 diffs)

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

@@ -637 +637 @@
     setNetwork(strNetworkName.c_str());
 
-    RTCString strTrunk;
-    if (!server->getAttributeValue("trunkName", &strTrunk))
-        throw ConfigFileError("DHCPServer/@trunkName missing");
-    m_strTrunk = strTrunk.c_str();
-
     RTCString strTrunkType;
     if (!server->getAttributeValue("trunkType", &strTrunkType))
@@ -656 +651 @@
         throw ConfigFileError(RTCStringFmt("Invalid DHCPServer/@trunkType value: %s", strTrunkType.c_str()));
 
+    if (   m_enmTrunkType == kIntNetTrunkType_NetFlt
+        || m_enmTrunkType == kIntNetTrunkType_NetAdp)
+    {
+        RTCString strTrunk;
+        if (!server->getAttributeValue("trunkName", &strTrunk))
+            throw ConfigFileError("DHCPServer/@trunkName missing");
+        m_strTrunk = strTrunk.c_str();
+    }
+    else
+        m_strTrunk = "";
+
     getIPv4AddrAttribute(server, "IPAddress", &m_IPv4Address);
     getIPv4AddrAttribute(server, "networkMask", &m_IPv4Netmask);