Changeset 54109 in vbox for trunk

Timestamp:

Feb 8, 2015 11:03:56 PM (10 years ago)

Author:

vboxsync

Message:

NAT: Use PDMINETWORKNATCONFIG::pfnNotifyDnsChanged callback if
HAVE_NOTIFICATION_FOR_DNS_UPDATE is enabled - except on OS X, where
for now we still use old OS X specific notifications, so this should
be no-op on OS X. Since HAVE_NOTIFICATION_FOR_DNS_UPDATE is not
enabled for anything but OS X for now, this, for now, is a no-op
elsewhere too. But just enabling HAVE_NOTIFICATION_FOR_DNS_UPDATE in
libslirp.h should now be enough to switch.

File:

• trunk/src/VBox/Devices/Network/DrvNAT.cpp (modified) (3 diffs)

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

@@ -959 +959 @@
 
 
+/**
+ * @interface_method_impl{PDMINETWORKNATCONFIG,pfnNotifyDnsChanged}
+ *
+ * We are notified that host's resolver configuration has changed.  In
+ * the current setup we don't get any details and just reread that
+ * information ourselves.
+ */
+static DECLCALLBACK(void) drvNATNotifyDnsChanged(PPDMINETWORKNATCONFIG pInterface)
+{
+    PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkNATCfg);
+    drvNATUpdateDNS(pThis, /* fFlapLink */ true);
+}
+
+
 #ifdef RT_OS_DARWIN
 /**
@@ -1085 +1099 @@
         case VMRESUMEREASON_HOST_RESUME:
             bool fFlapLink;
-#if RT_OS_DARWIN
-            /* let drvNatDnsChanged event handler do it if necessary */
+#if HAVE_NOTIFICATION_FOR_DNS_UPDATE
+            /* let event handler do it if necessary */
             fFlapLink = false;
 #else
@@ -1405 +1419 @@
     /* NAT engine configuration */
     pThis->INetworkNATCfg.pfnRedirectRuleCommand = drvNATNetworkNatConfig_RedirectRuleCommand;
+#if HAVE_NOTIFICATION_FOR_DNS_UPDATE && !defined(RT_OS_DARWIN)
+    /* 
+     * On OS X we stick to the old OS X specific notifications for
+     * now.  Elsewhere use IHostNameResolutionConfigurationChangeEvent
+     * by enbaling HAVE_NOTIFICATION_FOR_DNS_UPDATE in libslirp.h.
+     * This code is still in a bit of flux and is implemented and
+     * enabled in steps to simplify more conservative backporting.
+     */
+    pThis->INetworkNATCfg.pfnNotifyDnsChanged = drvNATNotifyDnsChanged;
+#else
     pThis->INetworkNATCfg.pfnNotifyDnsChanged = NULL;
+#endif
 
     /*