Changeset 48417 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 10, 2013 3:58:39 PM (11 years ago)

Author:

vboxsync

Message:

Main/NATNetworkImpl: accept hint for address selection returning default value or assigning available.

Location:

trunk/src/VBox/Main

Files:

• include/NATNetworkImpl.h (modified) (2 diffs)
• src-server/NATNetworkImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/NATNetworkImpl.h

@@ -40 +40 @@
 # define NATSR_EXECUTABLE_NAME "VBoxNetNAT"
 #endif
+
+enum ADDRESSLOOKUPTYPE
+{
+    ADDR_GATEWAY,
+    ADDR_DHCP,
+    ADDR_DHCPLOWERIP,
+    ADDR_ANY
+};
 
 class NATNetworkServiceRunner: public NetworkServiceRunner
@@ -128 +136 @@
 private:
     int recalculateIpv4AddressAssignments();
-    int findFirstAvailableOffset(uint32_t *);
+    int findFirstAvailableOffset(ADDRESSLOOKUPTYPE, uint32_t *);
 
     typedef std::map<Utf8Str, settings::NATRule> NATRuleMap;

trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp

@@ -904 +904 @@
 
 
-int NATNetwork::findFirstAvailableOffset(uint32_t *poff)
+int NATNetwork::findFirstAvailableOffset(ADDRESSLOOKUPTYPE addrType, uint32_t *poff)
 {
     RTNETADDRIPV4 network, netmask;
@@ -918 +918 @@
     {
 
-        if (off == m->offGateway)
-            continue;
-
-        if (off == m->offDhcp)
-            continue;
-        
         bool skip = false;
         for (it = m->llNATLoopbackOffsetList.begin();
@@ -937 +931 @@
         }
         
+        if (skip)
+            continue;
+
+        if (off == m->offGateway)
+        {
+            if (addrType == ADDR_GATEWAY)
+                break;
+            else
+                continue;
+        }
+
+        if (off == m->offDhcp)
+        {
+            if (addrType == ADDR_DHCP)
+                break;
+            else
+                continue;
+        }
+
         if (!skip)
             break;
@@ -955 +968 @@
     AssertRCReturn(rc, rc);
 
-    findFirstAvailableOffset(&m->offGateway);
+    findFirstAvailableOffset(ADDR_GATEWAY, &m->offGateway);
     if (m->fNeedDhcpServer)
-        findFirstAvailableOffset(&m->offDhcp);
+        findFirstAvailableOffset(ADDR_DHCP, &m->offDhcp);
 
     /* I don't remember the reason CIDR calculated on the host. */
@@ -975 +988 @@
         RTNETADDRIPV4 dhcplowerip = network;
         uint32_t offDhcpLowerIp;
-        findFirstAvailableOffset(&offDhcpLowerIp);
+        findFirstAvailableOffset(ADDR_DHCPLOWERIP, &offDhcpLowerIp);
         dhcplowerip.u = RT_H2N_U32(dhcplowerip.u + offDhcpLowerIp);