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

Timestamp:

Apr 15, 2010 2:43:22 PM (15 years ago)

Author:

vboxsync

Message:

NAT: unify slirp_init() and adapt the coding style of some slirp_state variables

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (1 diff)
• slirp/bootp.c (modified) (2 diffs)
• slirp/libslirp.h (modified) (1 diff)
• slirp/slirp.c (modified) (7 diffs)
• slirp/slirp_state.h (modified) (2 diffs)
• slirp/udp.c (modified) (2 diffs)

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

@@ -1181 +1181 @@
                                    pDrvIns->iInstance, szNetwork);
 
-    char szNetAddr[16];
-    RTStrPrintf(szNetAddr, sizeof(szNetAddr), "%d.%d.%d.%d",
-               (Network & 0xFF000000) >> 24, (Network & 0xFF0000) >> 16,
-               (Network & 0xFF00) >> 8, Network & 0xFF);
-
     /*
      * Initialize slirp.
      */
-    rc = slirp_init(&pThis->pNATState, &szNetAddr[0], Netmask, fPassDomain, !!fUseHostResolver, pThis);
+    rc = slirp_init(&pThis->pNATState, RT_H2N_U32(Network), Netmask,
+                    fPassDomain, !!fUseHostResolver, pThis);
     if (RT_SUCCESS(rc))
     {

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

@@ -272 +272 @@
     FILL_BOOTP_EXT(q, RFC1533_GATEWAY, 4, &saddr);
 
-    if (pData->use_dns_proxy || pData->use_host_resolver)
+    if (pData->fUseDnsProxy || pData->fUseHostResolver)
     {
         uint32_t addr = RT_H2N_U32(RT_N2H_U32(pData->special_addr.s_addr) | CTL_DNS);
@@ -300 +300 @@
             FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, 1, " ");
     }
-    if (pData->fPassDomain && !pData->use_host_resolver)
+    if (pData->fPassDomain && !pData->fUseHostResolver)
     {
         LIST_FOREACH(dd, &pData->pDomainList, dd_list)

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

@@ -29 +29 @@
 #endif
 
-#ifndef VBOX_WITH_NAT_SERVICE
-int slirp_init(PNATState *, const char *, uint32_t, bool, bool, void *);
-#else
 int slirp_init(PNATState *, uint32_t, uint32_t, bool, bool, void *);
-#endif
 void slirp_register_statistics(PNATState pData, PPDMDRVINS pDrvIns);
 void slirp_deregister_statistics(PNATState pData, PPDMDRVINS pDrvIns);

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

@@ -523 +523 @@
 }
 
-#ifndef VBOX_WITH_NAT_SERVICE
-int slirp_init(PNATState *ppData, const char *pszNetAddr, uint32_t u32Netmask,
-               bool fPassDomain, bool fUseHostResolver, void *pvUser)
-#else
 int slirp_init(PNATState *ppData, uint32_t u32NetAddr, uint32_t u32Netmask,
                bool fPassDomain, bool fUseHostResolver, void *pvUser)
-#endif
 {
     int fNATfailed = 0;
@@ -541 +536 @@
         return VERR_INVALID_PARAMETER;
     pData->fPassDomain = !fUseHostResolver ? fPassDomain : false;
-    pData->use_host_resolver = fUseHostResolver;
+    pData->fUseHostResolver = fUseHostResolver;
     pData->pvUser = pvUser;
     pData->netmask = u32Netmask;
@@ -585 +580 @@
 #endif
 
-#ifndef VBOX_WITH_NAT_SERVICE
-    inet_aton(pszNetAddr, &pData->special_addr);
-#else
     pData->special_addr.s_addr = u32NetAddr;
-#endif
     pData->slirp_ethaddr = &special_ethaddr[0];
     alias_addr.s_addr = pData->special_addr.s_addr | RT_H2N_U32_C(CTL_ALIAS);
@@ -596 +587 @@
     /* set default addresses */
     inet_aton("127.0.0.1", &loopback_addr);
-    if (!pData->use_host_resolver)
+    if (!pData->fUseHostResolver)
     {
         if (slirp_init_dns_list(pData) < 0)
@@ -625 +616 @@
         ftp_alias_load(pData);
         nbt_alias_load(pData);
-        if (pData->use_host_resolver)
+        if (pData->fUseHostResolver)
             dns_alias_load(pData);
     }
@@ -729 +720 @@
     ftp_alias_unload(pData);
     nbt_alias_unload(pData);
-    if (pData->use_host_resolver)
+    if (pData->fUseHostResolver)
         dns_alias_unload(pData);
     while (!LIST_EMPTY(&instancehead))
@@ -1915 +1906 @@
 void slirp_set_dhcp_dns_proxy(PNATState pData, bool fDNSProxy)
 {
-    if (!pData->use_host_resolver)
+    if (!pData->fUseHostResolver)
     {
         Log2(("NAT: DNS proxy switched %s\n", (fDNSProxy ? "on" : "off")));
-        pData->use_dns_proxy = fDNSProxy;
+        pData->fUseDnsProxy = fDNSProxy;
     }
     else

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

@@ -281 +281 @@
     uma_zone_t zone_ext_refcnt;
 #endif
-    int use_host_resolver;
+    bool fUseHostResolver;
     /* from dnsproxy/dnsproxy.h*/
     unsigned int authoritative_port;
@@ -311 +311 @@
     struct request *request_hash[1 << HASHSIZE];
     /* this field control behaviour of DHCP server */
-    bool use_dns_proxy;
+    bool fUseDnsProxy;
 
     LIST_HEAD(RT_NOTHING, libalias) instancehead;

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

@@ -162 +162 @@
     }
 
-    if (   pData->use_host_resolver
+    if (   pData->fUseHostResolver
         && uh->uh_dport == RT_H2N_U16_C(53)
         && CTL_CHECK(RT_N2H_U32(ip->ip_dst.s_addr), CTL_DNS))
@@ -256 +256 @@
      * DNS proxy
      */
-    if (   pData->use_dns_proxy
+    if (   pData->fUseDnsProxy
         && (ip->ip_dst.s_addr == RT_H2N_U32(RT_N2H_U32(pData->special_addr.s_addr) | CTL_DNS))
         && (uh->uh_dport == RT_H2N_U16_C(53)))