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

Timestamp:

Sep 9, 2013 6:44:47 AM (11 years ago)

Author:

vboxsync

Message:

vbox-lwip-nat: DHCP maps 127/8 to registered loopbacks or ignore them.

File:

• trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp (modified) (2 diffs)

trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp

@@ -384 +384 @@
         confManager->addToAddressList(RTNET_DHCP_OPT_ROUTERS, gateway);
 
+        unsigned int i;
+        int count_strs;
+        com::SafeArray<BSTR> strs;
+        std::map<RTNETADDRIPV4, uint32_t> MapIp4Addr2Off;
+
+        hrc = m_NATNetwork->COMGETTER(LocalMappings)(ComSafeArrayAsOutParam(strs));
+        if (   SUCCEEDED(hrc) 
+            && (count_strs = strs.size()))
+        {
+            char aszAddr[17];
+            RTNETADDRIPV4 ip4addr;
+            char *pszTerm;
+            uint32_t u32Off;
+            const char *pszLo2Off = com::Utf8Str(strs[i]).c_str();
+        
+            RT_ZERO(aszAddr);
+                
+            pszTerm = RTStrStr(pszLo2Off, ";");
+
+            if (   pszTerm
+                && (pszTerm - pszLo2Off) >= 17)
+            {
+                
+                memcpy(aszAddr, pszLo2Off, (pszTerm - pszLo2Off));
+                int rc = RTNetStrToIPv4Addr(aszAddr, &ip4addr);
+                if (RT_SUCCESS(rc))
+                {
+
+                    u32Off = RTStrToUInt32(pszTerm + 1);
+                    if (u32Off != 0)
+                        MapIp4Addr2Off.insert(
+                          std::map<RTNETADDRIPV4,uint32_t>::value_type(ip4addr, u32Off));
+                }
+            }
+        }
+
+        strs.setNull();
         ComPtr<IHost> host;
         if (SUCCEEDED(virtualbox->COMGETTER(Host)(host.asOutParam())))
         {
-            int i;
-            com::SafeArray<BSTR> strs;
             if (SUCCEEDED(host->COMGETTER(NameServers)(ComSafeArrayAsOutParam(strs))))
             {
@@ -398 +433 @@
                     rc = RTNetStrToIPv4Addr(com::Utf8Str(strs[i]).c_str(), &addr);
                     if (RT_SUCCESS(rc))
+                    {
+                        if (addr.au8[0] == 127)
+                        {
+                            if (MapIp4Addr2Off[addr] != 0)
+                            {
+                                addr.u = RT_H2N_U32(RT_N2H_U32(m_Ipv4Address.u & m_Ipv4Netmask.u) 
+                                                    + MapIp4Addr2Off[addr]);
+                            }
+                            else
+                                continue;
+                        }
+                        
                         confManager->addToAddressList(RTNET_DHCP_OPT_DNS, addr);
+                    }
                 }
             }