Changeset 87710 in vbox for trunk/src/VBox/NetworkServices/NetLib

Timestamp:

Feb 11, 2021 2:14:40 AM (4 years ago)

Author:

vboxsync

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

142754

Message:

NAT/Net: Call Loopback mapping initialization (forgotten in previous).
Do initialization locally instead of using an intermediary. Do a bit
more checking and logging. bugref:9929.

Location:

trunk/src/VBox/NetworkServices/NetLib

Files:

• ComHostUtils.cpp (modified) (1 diff)
• utils.h (modified) (1 diff)

trunk/src/VBox/NetworkServices/NetLib/ComHostUtils.cpp

@@ -73 +73 @@
 
 VBOX_LISTENER_DECLARE(NATNetworkListenerImpl)
-
-
-int localMappings(const ComNatPtr& nat, AddressToOffsetMapping& mapping)
-{
-    mapping.clear();
-
-    ComBstrArray strs;
-    size_t cStrs;
-    HRESULT hrc = nat->COMGETTER(LocalMappings)(ComSafeArrayAsOutParam(strs));
-    if (   SUCCEEDED(hrc)
-        && (cStrs = strs.size()))
-    {
-        for (size_t i = 0; i < cStrs; ++i)
-        {
-            char szAddr[17];
-            RTNETADDRIPV4 ip4addr;
-            char *pszTerm;
-            uint32_t u32Off;
-            com::Utf8Str strLo2Off(strs[i]);
-            const char *pszLo2Off = strLo2Off.c_str();
-
-            RT_ZERO(szAddr);
-
-            pszTerm = RTStrStr(pszLo2Off, "=");
-
-            if (   pszTerm
-                   && (pszTerm - pszLo2Off) <= INET_ADDRSTRLEN)
-            {
-                memcpy(szAddr, pszLo2Off, (pszTerm - pszLo2Off));
-                int rc = RTNetStrToIPv4Addr(szAddr, &ip4addr);
-                if (RT_SUCCESS(rc))
-                {
-                    u32Off = RTStrToUInt32(pszTerm + 1);
-                    if (u32Off != 0)
-                        mapping.insert(
-                          AddressToOffsetMapping::value_type(ip4addr, u32Off));
-                }
-            }
-        }
-    }
-    else
-        return VERR_NOT_FOUND;
-
-    return VINF_SUCCESS;
-}
 
 

trunk/src/VBox/NetworkServices/NetLib/utils.h

@@ -34 +34 @@
 typedef ComPtr<INATNetwork> ComNatPtr;
 typedef com::SafeArray<BSTR> ComBstrArray;
-
-typedef std::vector<RTNETADDRIPV4> AddressList;
-typedef std::map<RTNETADDRIPV4, int> AddressToOffsetMapping;
-
-
-int localMappings(const ComNatPtr&, AddressToOffsetMapping&);