Changeset 50949 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Apr 2, 2014 12:53:08 AM (11 years ago)

Author:

vboxsync

Message:

NAT: Rename horrifying "VBOX_NAT_HNCE_EXSPOSED_NAME_RESOLUTION_INFO"
which is not just a mouthful, but has a typo in "exposed" too. While
here rename the rest of them with s/HNCE/DNS/. "HNCE" is an obscure
abbreviation and as far as I can tell it doesn't really reflect the
meaning of these constants.

Location:

trunk/src/VBox/Devices/Network

Files:

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

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

@@ -1092 +1092 @@
     {
 
-        case VBOX_NAT_HNCE_DNSPROXY:
+        case VBOX_NAT_DNS_DNSPROXY:
             {
                 /**
@@ -1116 +1116 @@
             }
 
-        case VBOX_NAT_HNCE_EXSPOSED_NAME_RESOLUTION_INFO:
+        case VBOX_NAT_DNS_EXTERNAL:
             /*
              * Host resumed from a suspend and the network might have changed.
@@ -1127 +1127 @@
             return;
 
-        case VBOX_NAT_HNCE_HOSTRESOLVER:
+        case VBOX_NAT_DNS_HOSTRESOLVER:
         default:
             return;

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

@@ -111 +111 @@
  * This method help DrvNAT to select strategy: about VMRESUMEREASON_HOST_RESUME:
  * - proceed with link termination (we let guest track host DNS settings)
- *    VBOX_NAT_HNCE_EXPOSED_NAME_RESOLVING_INFO
+ *    VBOX_NAT_DNS_EXTERNAL
  * - enforce internal DNS update (we are using dnsproxy and track but don't export DNS host settings)
- *    VBOX_NAT_HNCE_DNSPROXY
+ *    VBOX_NAT_DNS_DNSPROXY
  * - ignore (NAT configured to use hostresolver - we aren't track any host DNS changes)
- *    VBOX_NAT_HNCE_HOSTRESOLVER
+ *    VBOX_NAT_DNS_HOSTRESOLVER
  * @note: It's safe to call this method from any thread, because settings we're checking 
  * are immutable at runtime.
  */
-#define VBOX_NAT_HNCE_EXSPOSED_NAME_RESOLUTION_INFO 0
-#define VBOX_NAT_HNCE_DNSPROXY 1
-#define VBOX_NAT_HNCE_HOSTRESOLVER 2
+#define VBOX_NAT_DNS_EXTERNAL 0
+#define VBOX_NAT_DNS_DNSPROXY 1
+#define VBOX_NAT_DNS_HOSTRESOLVER 2
 int slirp_host_network_configuration_change_strategy_selector(const PNATState);
 #if defined(RT_OS_WINDOWS)

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

@@ -2054 +2054 @@
 int slirp_host_network_configuration_change_strategy_selector(const PNATState pData)
 {
-    if (pData->fUseHostResolverPermanent) return VBOX_NAT_HNCE_HOSTRESOLVER;
+    if (pData->fUseHostResolverPermanent)
+        return VBOX_NAT_DNS_HOSTRESOLVER;
+
     if (pData->fUseDnsProxy) {
 #if HAVE_NOTIFICATION_FOR_DNS_UPDATE
@@ -2068 +2070 @@
         if (   RT_FAILURE(rc)
             || LIST_EMPTY(&pData->pDomainList))
-            return VBOX_NAT_HNCE_DNSPROXY;
+            return VBOX_NAT_DNS_DNSPROXY;
         
         if (   rcp_state.rcps_domain
             && strcmp(rcp_state.rcps_domain, LIST_FIRST(&pData->pDomainList)->dd_pszDomain) == 0)
-            return VBOX_NAT_HNCE_DNSPROXY;
+            return VBOX_NAT_DNS_DNSPROXY;
         else
-            return VBOX_NAT_HNCE_EXSPOSED_NAME_RESOLUTION_INFO; /* XXX: rename it */
+            return VBOX_NAT_DNS_EXTERNAL;
 #else
         /* copy domain name */
         /* domain only compare with coy version */
-        return VBOX_NAT_HNCE_DNSPROXY;
-#endif
-    }
-    return VBOX_NAT_HNCE_EXSPOSED_NAME_RESOLUTION_INFO;
-}
+        return VBOX_NAT_DNS_DNSPROXY;
+#endif
+    }
+    return VBOX_NAT_DNS_EXTERNAL;
+}