Changeset 39775 in vbox for trunk/src/VBox

Timestamp:

Jan 17, 2012 11:03:12 AM (13 years ago)

Author:

vboxsync

Message:

NAT: introduces CFGM value .../HostResolverMappings/HostNamePattern which used for specifying
range of host names user expects to return .../HostResolverMappings/HostIP on DNS requests from HostResolver mode.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libalias/alias_dns.c (modified) (3 diffs)
• libslirp.h (modified) (1 diff)
• slirp.c (modified) (2 diffs)
• slirp_state.h (modified) (1 diff)

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

@@ -377 +377 @@
 
 #ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
+static bool isDnsMappingEntryMatchOrEqual2Str(const PDNSMAPPINGENTRY pDNSMapingEntry, const char *pcszString)
+{
+    return (    (   pDNSMapingEntry->pszCName
+                 && !strcmp(pDNSMapingEntry->pszCName, pcszString))
+            || (   pDNSMapingEntry->pszPattern
+                && RTStrSimplePatternMatch(pDNSMapingEntry->pszPattern, pcszString)));
+}
+
 static void alterHostentWithDataFromDNSMap(PNATState pData, struct hostent *pHostent)
 {
@@ -384 +392 @@
     {
         char **pszAlias = NULL;
-        if (!strcmp(pDNSMapingEntry->pszCName, pHostent->h_name))
+        if (isDnsMappingEntryMatchOrEqual2Str(pDNSMapingEntry, pHostent->h_name))
         {
             fMatch = true;
@@ -392 +400 @@
         for (pszAlias = pHostent->h_aliases; *pszAlias && !fMatch; pszAlias++)
         {
-            if (!strcmp(pDNSMapingEntry->pszCName, *pszAlias))
+            if (isDnsMappingEntryMatchOrEqual2Str(pDNSMapingEntry, *pszAlias))
             {
 

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

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

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

@@ -2159 +2159 @@
 }
 #ifdef VBOX_WITH_DNSMAPPING_IN_HOSTRESOLVER
-void  slirp_add_host_resolver_mapping(PNATState pData, const char *pszHostName, uint32_t u32HostIP)
-{
-    LogFlowFunc(("ENTER: pszHostName:%s, u32HostIP:%RTnaipv4\n", pszHostName, u32HostIP));
-    if (   pszHostName
-        || u32HostIP != INADDR_ANY
-        || u32HostIP != INADDR_BROADCAST)
+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));
@@ -2174 +2178 @@
         }
         pDnsMapping->u32IpAddress = u32HostIP;
-        pDnsMapping->pszCName = RTStrDup(pszHostName);
-        if (!pDnsMapping->pszCName)
-        {
-            LogFunc(("Can't allocate enough room for %s\n", pszHostName));
+        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();

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

@@ -69 +69 @@
 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 of hostnames to map to specifaied IP */
+    char        *pszPattern;
     uint32_t    u32IpAddress;
     LIST_ENTRY(DNSMAPPINGENTRY) MapList;