Changeset 20959 in vbox for trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

Timestamp:

Jun 26, 2009 7:50:03 AM (16 years ago)

Author:

vboxsync

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

49144

Message:

NAT: remove (and enable) VBOX_WITH_MULTI_DNS and VBOX_WITH_SLIRP_DNS_PROXY ifdefs as both were properly tested with VBox 2.2.x

File:

• trunk/src/VBox/Devices/Network/slirp/ip_icmp.c (modified) (3 diffs)

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

@@ -103 +103 @@
         pData->pfIcmpCloseHandle = (BOOL (WINAPI *)(HANDLE))
                                     GetProcAddress(pData->hmIcmpLibrary, "IcmpCloseHandle");
-# ifdef VBOX_WITH_MULTI_DNS 
         pData->pfGetAdaptersAddresses = (ULONG (WINAPI *)(ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG))
                                     GetProcAddress(pData->hmIcmpLibrary, "GetAdaptersAddresses");
@@ -110 +109 @@
             LogRel(("NAT: Can't find GetAdapterAddresses in Iphlpapi.dll"));
         }
-# endif
     }
 
     if (pData->pfIcmpParseReplies == NULL)
     {
-# ifdef VBOX_WITH_MULTI_DNS 
         if(pData->pfGetAdaptersAddresses == NULL) 
             FreeLibrary(pData->hmIcmpLibrary);
-# else
-        FreeLibrary(pData->hmIcmpLibrary);
-# endif
         pData->hmIcmpLibrary = LoadLibrary("Icmp.dll");
         if (pData->hmIcmpLibrary == NULL)
@@ -371 +365 @@
                     {
                         case CTL_DNS:
-#ifndef VBOX_WITH_MULTI_DNS
-                            addr.sin_addr = dns_addr;
-                            break;
-#endif
                         case CTL_ALIAS:
                         default: