Changeset 59219 in vbox

Timestamp:

Dec 24, 2015 10:45:49 PM (9 years ago)

Author:

vboxsync

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

104847

Message:

NAT: Improve dns mapping in host resolver - pattern match should
ignore case; make literal match take priority over pattern match if
both are applicable.

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (3 diffs)
• slirp/hostres.c (modified) (3 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (3 diffs)
• slirp/slirp_state.h (modified) (2 diffs)

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -1205 +1205 @@
                                     N_("Unknown configuration in dns mapping"));
         char szHostNameOrPattern[255];
-        bool fMatch = false;    /* false used for equal matching, and true if wildcard pattern is used. */
+        bool fPattern = false;
         RT_ZERO(szHostNameOrPattern);
         GET_STRING(rc, pThis, pNode, "HostName", szHostNameOrPattern[0], sizeof(szHostNameOrPattern));
@@ -1219 +1219 @@
                 continue;
             }
-            fMatch = true;
+            fPattern = true;
         }
         struct in_addr HostIP;
@@ -1228 +1228 @@
             continue;
         }
-        slirp_add_host_resolver_mapping(pThis->pNATState, fMatch ? NULL : szHostNameOrPattern, fMatch ? szHostNameOrPattern : NULL, HostIP.s_addr);
+        slirp_add_host_resolver_mapping(pThis->pNATState, szHostNameOrPattern, fPattern, HostIP.s_addr);
     }
     LogFlowFunc(("LEAVE: %Rrc\n", rc));

trunk/src/VBox/Devices/Network/slirp/hostres.c

@@ -133 +133 @@
 
 #ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-static void alterHostentWithDataFromDNSMap(PNATState pData, struct hostent *pHostent);
+static void alterHostentWithDataFromDNSMap(PNATState pData, struct hostent *h);
 #endif
 
@@ -477 +477 @@
     }
 
+    if (h->h_length != sizeof(RTNETADDRIPV4))
+    {
+        /* Log: what kind of address did we get?! */
+        goto out;
+    }
+
+    if (   h->h_addr_list == NULL
+        || h->h_addr_list[0] == NULL)
+    {
+        /* Log: shouldn't happen */
+        goto out;
+    }
+
 #ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-    if (!LIST_EMPTY(&pData->DNSMapHead))
-        alterHostentWithDataFromDNSMap(pData, h);
+    alterHostentWithDataFromDNSMap(pData, h);
 #endif
 
@@ -1187 +1199 @@
 
 #ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-static bool isDnsMappingEntryMatchOrEqual2Str(const PDNSMAPPINGENTRY pDNSMapingEntry, const char *pcszString)
-{
-    return (    (   pDNSMapingEntry->pszCName
-                 && !strcmp(pDNSMapingEntry->pszCName, pcszString))
-            || (   pDNSMapingEntry->pszPattern
-                && RTStrSimplePatternMultiMatch(pDNSMapingEntry->pszPattern, RTSTR_MAX, pcszString, RTSTR_MAX, NULL)));
-}
-
-static void alterHostentWithDataFromDNSMap(PNATState pData, struct hostent *pHostent)
+void
+slirp_add_host_resolver_mapping(PNATState pData,
+                                const char *pszHostName, bool fPattern,
+                                uint32_t u32HostIP)
+{
+    LogRel(("ENTER: pszHostName:%s%s, u32HostIP:%RTnaipv4\n",
+                 pszHostName ? pszHostName : "(null)",
+                 fPattern ? " (pattern)" : "",
+                 u32HostIP));
+
+    if (   pszHostName != NULL
+        && u32HostIP != INADDR_ANY
+        && u32HostIP != INADDR_BROADCAST)
+    {
+        PDNSMAPPINGENTRY pDnsMapping = RTMemAllocZ(sizeof(DNSMAPPINGENTRY));
+        if (!pDnsMapping)
+        {
+            LogFunc(("Can't allocate DNSMAPPINGENTRY\n"));
+            LogFlowFuncLeave();
+            return;
+        }
+
+        pDnsMapping->u32IpAddress = u32HostIP;
+        pDnsMapping->fPattern = fPattern;
+        pDnsMapping->pszName = RTStrDup(pszHostName);
+
+        if (pDnsMapping->pszName == NULL)
+        {
+            LogFunc(("Can't allocate enough room for host name\n"));
+            RTMemFree(pDnsMapping);
+            LogFlowFuncLeave();
+            return;
+        }
+
+        if (fPattern) /* there's no case-insensitive pattern-match function */
+            RTStrToLower(pDnsMapping->pszName);
+
+        STAILQ_INSERT_TAIL(fPattern ? &pData->DNSMapPatterns : &pData->DNSMapNames,
+                           pDnsMapping, MapList);
+
+        LogRel(("NAT: User-defined mapping %s%s = %RTnaipv4 is registered\n",
+                pDnsMapping->pszName,
+                pDnsMapping->fPattern ? " (pattern)" : "",
+                pDnsMapping->u32IpAddress));
+    }
+    LogFlowFuncLeave();
+}
+
+
+static void
+alterHostentWithDataFromDNSMap(PNATState pData, struct hostent *h)
 {
     PDNSMAPPINGENTRY pDNSMapingEntry = NULL;
-    bool fMatch = false;
-    LIST_FOREACH(pDNSMapingEntry, &pData->DNSMapHead, MapList)
-    {
-        char **pszAlias = NULL;
-        if (isDnsMappingEntryMatchOrEqual2Str(pDNSMapingEntry, pHostent->h_name))
-        {
-            fMatch = true;
-            break;
-        }
-
-        for (pszAlias = pHostent->h_aliases; *pszAlias && !fMatch; pszAlias++)
-        {
-            if (isDnsMappingEntryMatchOrEqual2Str(pDNSMapingEntry, *pszAlias))
-            {
-
-                PDNSMAPPINGENTRY pDnsMapping = RTMemAllocZ(sizeof(DNSMAPPINGENTRY));
-                fMatch = true;
-                if (!pDnsMapping)
-                {
-                    LogFunc(("Can't allocate DNSMAPPINGENTRY\n"));
-                    LogFlowFuncLeave();
-                    return;
-                }
-                pDnsMapping->u32IpAddress = pDNSMapingEntry->u32IpAddress;
-                pDnsMapping->pszCName = RTStrDup(pHostent->h_name);
-                if (!pDnsMapping->pszCName)
-                {
-                    LogFunc(("Can't allocate enough room for %s\n", pHostent->h_name));
-                    RTMemFree(pDnsMapping);
-                    LogFlowFuncLeave();
-                    return;
-                }
-                LIST_INSERT_HEAD(&pData->DNSMapHead, pDnsMapping, MapList);
-                LogRel(("NAT: User-defined mapping %s: %RTnaipv4 is registered\n",
-                        pDnsMapping->pszCName ? pDnsMapping->pszCName : pDnsMapping->pszPattern,
-                        pDnsMapping->u32IpAddress));
-            }
-        }
-        if (fMatch)
-            break;
-    }
-
-    /* h_lenght is lenght of h_addr_list in bytes, so we check that we have enough space for IPv4 address */
-    if (   fMatch
-        && pHostent->h_length >= sizeof(uint32_t)
-        && pDNSMapingEntry)
-    {
-        pHostent->h_length = 1;
-        *(uint32_t *)pHostent->h_addr_list[0] = pDNSMapingEntry->u32IpAddress;
-    }
-
+    char **pszAlias;
+
+    STAILQ_FOREACH(pDNSMapingEntry, &pData->DNSMapNames, MapList)
+    {
+        Assert(!pDNSMapingEntry->fPattern);
+
+        if (RTStrICmp(pDNSMapingEntry->pszName, h->h_name) == 0)
+            goto done;
+
+        for (pszAlias = h->h_aliases; *pszAlias != NULL; ++pszAlias)
+        {
+            if (RTStrICmp(pDNSMapingEntry->pszName, *pszAlias) == 0)
+                goto done;
+        }
+    }
+
+
+#   define MATCH(_pattern, _string) \
+        (RTStrSimplePatternMultiMatch((_pattern), RTSTR_MAX, (_string), RTSTR_MAX, NULL))
+
+    STAILQ_FOREACH(pDNSMapingEntry, &pData->DNSMapPatterns, MapList)
+    {
+        RTStrToLower(h->h_name);
+        if (MATCH(pDNSMapingEntry->pszName, h->h_name))
+            goto done;
+
+        for (pszAlias = h->h_aliases; *pszAlias != NULL; ++pszAlias)
+        {
+            RTStrToLower(*pszAlias);
+            if (MATCH(pDNSMapingEntry->pszName, h->h_name))
+                goto done;
+        }
+    }
+
+  done:
+    if (pDNSMapingEntry != NULL)
+    {
+        *(uint32_t *)h->h_addr_list[0] = pDNSMapingEntry->u32IpAddress;
+        h->h_addr_list[1] = NULL;
+    }
 }
 #endif

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -171 +171 @@
 
 #ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-void  slirp_add_host_resolver_mapping(PNATState pData, const char *pszHostName, const char *pszHostNamePattern, uint32_t u32HostIP);
+void slirp_add_host_resolver_mapping(PNATState pData,
+                                     const char *pszHostName, bool fPattern,
+                                     uint32_t u32HostIP);
 #endif
 

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -419 +419 @@
 #endif
 
+#ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
+    STAILQ_INIT(&pData->DNSMapNames);
+    STAILQ_INIT(&pData->DNSMapPatterns);
+#endif
+
     slirp_link_up(pData);
     return VINF_SUCCESS;
@@ -519 +524 @@
     ftp_alias_unload(pData);
     nbt_alias_unload(pData);
-    if (pData->fUseHostResolver)
-    {
+
 #ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-        while (!LIST_EMPTY(&pData->DNSMapHead))
-        {
-            PDNSMAPPINGENTRY pDnsEntry = LIST_FIRST(&pData->DNSMapHead);
-            LIST_REMOVE(pDnsEntry, MapList);
-            RTStrFree(pDnsEntry->pszCName);
-            RTMemFree(pDnsEntry);
-        }
-#endif
-    }
+    {
+        DNSMAPPINGHEAD *heads[2];
+        int i;
+
+        heads[0] = &pData->DNSMapNames;
+        heads[1] = &pData->DNSMapPatterns;
+        for (i = 0; i < RT_ELEMENTS(heads); ++i)
+        {
+            while (!STAILQ_EMPTY(heads[i]))
+            {
+                PDNSMAPPINGENTRY pDnsEntry = STAILQ_FIRST(heads[i]);
+                STAILQ_REMOVE_HEAD(heads[i], MapList);
+                RTStrFree(pDnsEntry->pszName);
+                RTMemFree(pDnsEntry);
+            }
+        }
+    }
+#endif
+
     while (!LIST_EMPTY(&instancehead))
     {
@@ -1855 +1869 @@
     LogFlowFuncLeave();
 }
-#ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-void  slirp_add_host_resolver_mapping(PNATState pData, const char *pszHostName, const char *pszHostNamePattern, uint32_t u32HostIP)
-{
-    LogFlowFunc(("ENTER: pszHostName:%s, pszHostNamePattern:%s u32HostIP:%RTnaipv4\n",
-                pszHostName ? pszHostName : "(null)",
-                pszHostNamePattern ? pszHostNamePattern : "(null)",
-                u32HostIP));
-    if (   (   pszHostName
-            || pszHostNamePattern)
-        && u32HostIP != INADDR_ANY
-        && u32HostIP != INADDR_BROADCAST)
-    {
-        PDNSMAPPINGENTRY pDnsMapping = RTMemAllocZ(sizeof(DNSMAPPINGENTRY));
-        if (!pDnsMapping)
-        {
-            LogFunc(("Can't allocate DNSMAPPINGENTRY\n"));
-            LogFlowFuncLeave();
-            return;
-        }
-        pDnsMapping->u32IpAddress = u32HostIP;
-        if (pszHostName)
-            pDnsMapping->pszCName = RTStrDup(pszHostName);
-        else if (pszHostNamePattern)
-            pDnsMapping->pszPattern = RTStrDup(pszHostNamePattern);
-        if (   !pDnsMapping->pszCName
-            && !pDnsMapping->pszPattern)
-        {
-            LogFunc(("Can't allocate enough room for %s\n", pszHostName ? pszHostName : pszHostNamePattern));
-            RTMemFree(pDnsMapping);
-            LogFlowFuncLeave();
-            return;
-        }
-        LIST_INSERT_HEAD(&pData->DNSMapHead, pDnsMapping, MapList);
-        LogRel(("NAT: User-defined mapping %s: %RTnaipv4 is registered\n",
-                pDnsMapping->pszCName ? pDnsMapping->pszCName : pDnsMapping->pszPattern,
-                pDnsMapping->u32IpAddress));
-    }
-    LogFlowFuncLeave();
-}
-#endif
+
 
 /* updates the arp cache

trunk/src/VBox/Devices/Network/slirp/slirp_state.h

@@ -58 +58 @@
 typedef struct DNSMAPPINGENTRY
 {
-    /** host name to map.
-     * @note If pszCName isn't null pszPattern won't be used (see alias_dns.c for
-     *       details).
-     */
-    char        *pszCName;
-    /** Pattern (simple) of hostnames to map to the specified IP. */
-    char        *pszPattern;
+    /** Literal or pattern. */
+    bool        fPattern;
+    /** Host name or pattern to map. */
+    char        *pszName;
     /** The IP Address. */
     uint32_t    u32IpAddress;
     /** List entry.  */
-    LIST_ENTRY(DNSMAPPINGENTRY) MapList;
+    STAILQ_ENTRY(DNSMAPPINGENTRY) MapList;
 } DNSMAPPINGENTRY, *PDNSMAPPINGENTRY;
-typedef LIST_HEAD(DNSMAPPINGLISTHEAD, DNSMAPPINGENTRY) DNSMAPPINGLISTHEAD;
+typedef STAILQ_HEAD(DNSMAPPINGHEAD, DNSMAPPINGENTRY) DNSMAPPINGHEAD;
 #endif
 
@@ -310 +307 @@
 #endif
 #ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-    DNSMAPPINGLISTHEAD DNSMapHead;
+    DNSMAPPINGHEAD DNSMapNames;
+    DNSMAPPINGHEAD DNSMapPatterns;
 #endif
 } NATState;