Changeset 50950 in vbox for trunk/src/VBox

Timestamp:

Apr 2, 2014 1:32:02 AM (11 years ago)

Author:

vboxsync

Message:

NAT: Rename fHostNetworkConfigurationEventListener parameter to fFlapLink.
drvNATHostNetworkConfigurationChangeEventStrategySelector is called
with it set to true not only for the (MacOS) event. I can see how it
is intended to eventually signal the fact that DNS information *has*
changed, but then it wouldn't make sense to do anything if it hadn't.
So use the name that better describes current reallity and deal with
the future in the future.

File:

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

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

@@ -223 +223 @@
 DECLINLINE(void) drvNATHostNetworkConfigurationChangeEventStrategySelector(
   PDRVNAT pThis,
-  bool fHostNetworkConfigurationEventListener);
+  bool fFlapLink);
 static DECLCALLBACK(int) drvNATReinitializeHostNameResolving(PDRVNAT pThis);
 
@@ -979 +979 @@
         CFArrayRef hArrAddresses = (CFArrayRef)CFDictionaryGetValue(hDnsDict, kSCPropNetDNSServerAddresses);
         if (hArrAddresses)
-            drvNATHostNetworkConfigurationChangeEventStrategySelector(pThis, /* RT_OS_DARWIN */ true);
+            drvNATHostNetworkConfigurationChangeEventStrategySelector(pThis, /* fFlapLink */ true);
 
         CFRelease(hDnsDict);
@@ -1052 +1052 @@
     {
         case VMRESUMEREASON_HOST_RESUME:
+            bool fFlapLink;
 #if RT_OS_DARWIN
-            drvNATHostNetworkConfigurationChangeEventStrategySelector(pThis, false);
+            /* let drvNatDnsChanged event handler do it if necessary */
+            fFlapLink = false;
 #else
-            drvNATHostNetworkConfigurationChangeEventStrategySelector(pThis, true);
-#endif
+            /* XXX: when in doubt, use brute force */
+            fFlapLink = true;
+#endif
+            drvNATHostNetworkConfigurationChangeEventStrategySelector(pThis, fFlapLink);
             return;
         default: /* Ignore every other resume reason. */
@@ -1083 +1087 @@
  * search string) at runtime (VBOX_NAT_ENFORCE_INTERNAL_DNS_UPDATE), we can do it safely on NAT thread,
  * so with changing other variables (place where we handle update) the main mechanism of update
- * _won't_ be changed, the only thing will change is drop of fHostNetworkConfigurationEventListener parameter.
+ * _won't_ be changed, the only thing will change is drop of fFlapLink parameter.
  */
 DECLINLINE(void) drvNATHostNetworkConfigurationChangeEventStrategySelector(PDRVNAT pThis,
-                                                                        bool fHostNetworkConfigurationEventListener)
+                                                                        bool fFlapLink)
 {
     int strategy = slirp_host_network_configuration_change_strategy_selector(pThis->pNATState);
@@ -1122 +1126 @@
              */
 
-            if (fHostNetworkConfigurationEventListener)
+            if (fFlapLink)
                 pThis->pIAboveConfig->pfnSetLinkState(pThis->pIAboveConfig,
                                                       PDMNETWORKLINKSTATE_DOWN_RESUME);