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

Timestamp:

Dec 9, 2009 10:34:36 AM (15 years ago)

Author:

vboxsync

Message:

NAT: coding style

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• bootp.c (modified) (19 diffs)
• dnsproxy/dnsproxy.c (modified) (2 diffs)
• ip_icmp.c (modified) (1 diff)
• ip_output.c (modified) (10 diffs)
• libalias/alias_dns.c (modified) (1 diff)
• slirp.c (modified) (45 diffs)
• slirp_state.h (modified) (2 diffs)
• socket.c (modified) (1 diff)
• tcp_subr.c (modified) (1 diff)
• udp.c (modified) (2 diffs)

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

@@ -84 +84 @@
     if (bc == NULL)
         return NULL;
-    paddr->s_addr = htonl(ntohl(special_addr.s_addr) | (bc->number + START_ADDR));
+    paddr->s_addr = htonl(ntohl(pData->special_addr.s_addr) | (bc->number + START_ADDR));
     bc->addr.s_addr = paddr->s_addr;
     return bc;
@@ -163 +163 @@
             bc = &bootp_clients[i];
             bc->allocated = 1;
-            paddr->s_addr = htonl(ntohl(special_addr.s_addr) | (i + START_ADDR));
+            paddr->s_addr = htonl(ntohl(pData->special_addr.s_addr) | (i + START_ADDR));
             return bc;
         }
@@ -241 +241 @@
     }
 #ifndef VBOX_WITH_NAT_SERVICE
-    saddr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
+    saddr.s_addr = htonl(ntohl(pData->special_addr.s_addr) | CTL_ALIAS);
 #else
-    saddr.s_addr = special_addr.s_addr;
+    saddr.s_addr = pData->special_addr.s_addr;
 #endif
     Log(("NAT: DHCP: s_addr:%R[IP4]\n", &saddr));
@@ -271 +271 @@
     if (pData->use_dns_proxy || pData->use_host_resolver)
     {
-        uint32_t addr = htonl(ntohl(special_addr.s_addr) | CTL_DNS);
+        uint32_t addr = htonl(ntohl(pData->special_addr.s_addr) | CTL_DNS);
         FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &addr);
         goto skip_dns_servers;
     }
 
-    if (!TAILQ_EMPTY(&pData->dns_list_head))
-    {
-        de = TAILQ_LAST(&pData->dns_list_head, dns_list_head);
+    if (!TAILQ_EMPTY(&pData->pDnsList))
+    {
+        de = TAILQ_LAST(&pData->pDnsList, dns_list_head);
         q_dns_header = q;
         FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &de->de_addr.s_addr);
     }
 
-    TAILQ_FOREACH_REVERSE(de, &pData->dns_list_head, dns_list_head, de_list)
-    {
-        if (TAILQ_LAST(&pData->dns_list_head, dns_list_head) == de)
+    TAILQ_FOREACH_REVERSE(de, &pData->pDnsList, dns_list_head, de_list)
+    {
+        if (TAILQ_LAST(&pData->pDnsList, dns_list_head) == de)
             continue; /* first value with head we've ingected before */
         FILL_BOOTP_APP(q_dns_header, q, RFC1533_DNS, 4, &de->de_addr.s_addr);
@@ -291 +291 @@
 
 skip_dns_servers:
-    if (LIST_EMPTY(&pData->dns_domain_list_head))
+    if (LIST_EMPTY(&pData->pDomainList))
     {
             /* Microsoft dhcp client doen't like domain-less dhcp and trimmed packets*/
@@ -299 +299 @@
     if (pData->fPassDomain && !pData->use_host_resolver)
     {
-        LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
+        LIST_FOREACH(dd, &pData->pDomainList, dd_list)
         {
 
@@ -427 +427 @@
             else
             {
-               if ((bp->bp_ciaddr.s_addr & htonl(pData->netmask)) != special_addr.s_addr)
+               if ((bp->bp_ciaddr.s_addr & htonl(pData->netmask)) != pData->special_addr.s_addr)
                {
                     off = dhcp_send_nack(pData, bp, bc, m);
@@ -449 +449 @@
             Assert(req_ip != NULL);
             ui32 = *(uint32_t *)(req_ip + 2);
-            if ((ui32 & htonl(pData->netmask)) != special_addr.s_addr)
+            if ((ui32 & htonl(pData->netmask)) != pData->special_addr.s_addr)
             {
                 LogRel(("NAT: address %R[IP4] has been req.\n", &ui32));
@@ -597 +597 @@
 
     pmsg_type = 0;
-
     p = buf;
     p_end = buf + size;
     if (size < 5)
         return;
+
     if (memcmp(p, rfc1533_cookie, 4) != 0)
         return;
+
     p = dhcp_find_option(bp->bp_vend, RFC2132_MSG_TYPE);
     Assert(p);
     if (p == NULL)
         return;
+
 #ifndef VBOX_WITH_SLIRP_BSD_MBUF
     if ((m = m_get(pData)) == NULL)
@@ -617 +619 @@
         return;
     }
-    switch(*(p+2))
+    switch (*(p+2))
     {
         case DHCPDISCOVER:
@@ -626 +628 @@
             if (rc > 0)
                 goto reply;
-        break;
+            break;
+
         case DHCPREQUEST:
             rc = dhcp_decode_request(pData, bp, buf, size, m);
             if (rc > 0)
                 goto reply;
-        break;
+            break;
+
         case DHCPRELEASE:
             rc = dhcp_decode_release(pData, bp, buf, size); 
             /* no reply required */
-        break;
+            break;
+
         case DHCPDECLINE:
             p = dhcp_find_option(&bp->bp_vend[0], RFC2132_REQ_ADDR);
             req_ip.s_addr = *(uint32_t *)(p + 2);
             rc = bootp_cache_lookup_ether_by_ip(pData, req_ip.s_addr, NULL);
-            if (rc != 0)
+            if (RT_FAILURE(rc))
             {
                 /* Not registered */
@@ -651 +656 @@
             }
             /* no response required */
-        break;
+            break;
+
         default:
             AssertMsgFailed(("unsupported DHCP message type"));
@@ -659 +665 @@
     m_free(pData, m);
     return;
+
 reply:
     bootp_reply(pData, m, rc, bp->bp_flags);
@@ -678 +685 @@
 
 #ifndef VBOX_WITH_NAT_SERVICE
-    saddr.sin_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
+    saddr.sin_addr.s_addr = htonl(ntohl(pData->special_addr.s_addr) | CTL_ALIAS);
 #else
-    saddr.sin_addr.s_addr = special_addr.s_addr;
+    saddr.sin_addr.s_addr = pData->special_addr.s_addr;
 #endif
 
@@ -711 +718 @@
 
     if (bp->bp_op == BOOTP_REQUEST)
-    {
         dhcp_decode(pData, bp, bp->bp_vend, DHCP_OPT_LEN);
-    }
 }
 
 int bootp_cache_lookup_ip_by_ether(PNATState pData,const uint8_t* ether, uint32_t *pip)
 {
-    int rc = 1;
-    uint32_t ip = INADDR_ANY;
     int i;
+
     if (ether == NULL || pip == NULL)
-        return rc;
+        return VERR_INVALID_PARAMETER;
+
     for (i = 0; i < NB_ADDR; i++)
     {
@@ -728 +733 @@
             && memcmp(bootp_clients[i].macaddr, ether, ETH_ALEN) == 0)
         {
-            ip = bootp_clients[i].addr.s_addr;
-            rc = 0;
-            break;
-        }
-    }
-    *pip = ip;
-    return rc;
+            *pip = bootp_clients[i].addr.s_addr;
+            return VINF_SUCCESS;
+        }
+    }
+
+    *pip = INADDR_ANY;
+    return VERR_NOT_FOUND;
 }
 
 int bootp_cache_lookup_ether_by_ip(PNATState pData, uint32_t ip, uint8_t *ether)
 {
-    int rc = 1;
     int i;
     for (i = 0; i < NB_ADDR; i++)
@@ -746 +750 @@
             && ip == bootp_clients[i].addr.s_addr)
         {
-            if(ether != NULL) memcpy(ether, bootp_clients[i].macaddr, ETH_ALEN);
-            rc = 0;
-            break;
-        }
-    }
-    return rc;
+            if (ether != NULL)
+                memcpy(ether, bootp_clients[i].macaddr, ETH_ALEN);
+            return VINF_SUCCESS;
+        }
+    }
+
+    return VERR_NOT_FOUND;
 }
 
@@ -760 +765 @@
 int bootp_dhcp_init(PNATState pData)
 {
-    int rc = 1;
     pData->pbootp_clients = RTMemAllocZ(sizeof(BOOTPClient) * NB_ADDR);
-    if (pData->pbootp_clients != NULL)
-        rc = 0;
-    return rc;
+    if (!pData->pbootp_clients)
+        return VERR_NO_MEMORY;
+
+    return VINF_SUCCESS;
 }
 
@@ -771 +776 @@
     if (pData->pbootp_clients != NULL)
         RTMemFree(pData->pbootp_clients);
-    return 0;
-}
+
+    return VINF_SUCCESS;
+}

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

@@ -154 +154 @@
         m->m_len += req->nbyte;
         ip->ip_src.s_addr = so->so_laddr.s_addr;
-        ip->ip_dst.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_DNS);
+        ip->ip_dst.s_addr = htonl(ntohl(pData->special_addr.s_addr) | CTL_DNS);
         udp->uh_dport = ntohs(53);
         udp->uh_sport = so->so_lport;
@@ -273 +273 @@
         memcpy(&req->client, &fromaddr, sizeof(struct sockaddr_in));
         memcpy(&req->clientid, &buf[0], 2);
-        req->dns_server = TAILQ_LAST(&pData->dns_list_head, dns_list_head);
+        req->dns_server = TAILQ_LAST(&pData->pDnsList, dns_list_head);
         if (req->dns_server == NULL)
         {

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

@@ -372 +372 @@
 #endif
                 addr.sin_family = AF_INET;
-                if ((ip->ip_dst.s_addr & htonl(pData->netmask)) == special_addr.s_addr)
+                if ((ip->ip_dst.s_addr & htonl(pData->netmask)) == pData->special_addr.s_addr)
                 {
                     /* It's an alias */

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

@@ -53 +53 @@
 static int rt_lookup_in_cache(PNATState pData, uint32_t dst, uint8_t *ether)
 {
-    int rc = 1;
+    int rc;
     if (dst == INADDR_BROADCAST)
     {
         memcpy(ether, broadcast_ethaddr, ETH_ALEN);
-        return 0;
-    }
+        return VINF_SUCCESS;
+    }
+
     rc = slirp_arp_lookup_ether_by_ip(pData, dst, ether);
-    if (rc == 0)
+    if (RT_SUCCESS(rc))
         return rc;
+
     rc = bootp_cache_lookup_ether_by_ip(pData, dst, ether);
-    if (rc == 0)
+    if (RT_SUCCESS(rc))
         return rc;
     /*
@@ -69 +71 @@
      */
     slirp_arp_who_has(pData, dst);
-    return rc;
+    return VERR_NOT_FOUND;
 }
 
@@ -138 +140 @@
     {
         error = ENOBUFS;
-        goto bad;
+        goto exit_drop_package;
     }
 #endif
@@ -149 +151 @@
     {
        rc = rt_lookup_in_cache(pData, ip->ip_dst.s_addr, eth_dst);
-       if (rc != 0)
-           goto bad;
+       if (RT_FAILURE(rc))
+           goto exit_drop_package;
     }
     else
@@ -163 +165 @@
      */
     rc = rt_lookup_in_cache(pData, ip->ip_dst.s_addr, eth_dst);
-    if (rc != 0)
-        goto bad;
+    if (RT_FAILURE(rc))
+        goto exit_drop_package;
+
     eh = (struct ethhdr *)(m->m_data - ETH_HLEN);
 #endif
@@ -187 +190 @@
             STAM_PROFILE_START(&pData->StatALIAS_output, a);
             if (t = m_tag_find(m, PACKET_TAG_ALIAS, NULL) != 0)
-            {
-                rc = LibAliasOut((struct libalias *)&t[1], mtod(m, char *), m_length(m, NULL));
-            }
+                rc = LibAliasOut((struct libalias *)&t[1], mtod(m, char *),
+                                 m_length(m, NULL));
             else
-            {
                 rc = LibAliasOut(pData->proxy_alias, mtod(m, char *),
                                  m_length(m, NULL));
-            }
+
             if (rc == PKT_ALIAS_IGNORED)
             {
                 Log(("NAT: packet was droppped\n"));
-                goto bad;
+                goto exit_drop_package;
             }
 #endif
@@ -222 +223 @@
         error = -1;
         ipstat.ips_cantfrag++;
-        goto bad;
+        goto exit_drop_package;
     }
 
@@ -229 +230 @@
     {
         error = -1;
-        goto bad;
+        goto exit_drop_package;
     }
 
@@ -238 +239 @@
         uint8_t *buf; /* intermediate buffer we'll use for copy from orriginal packet*/
 #endif
-            {
+        {
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
-                struct m_tag *t;
-                char *tmpbuf = NULL;
-                int tmplen = 0;
-#endif
-                int rc;
-                HTONS(ip->ip_len);
-                HTONS(ip->ip_off);
-                ip->ip_sum = 0;
-                ip->ip_sum = cksum(m, hlen);
-#ifndef VBOX_WITH_SLIRP_BSD_MBUF
-                rc = LibAliasOut((m->m_la ? m->m_la : pData->proxy_alias),
-                    mtod(m, char *), m->m_len);
-#else
-                if (m->m_next != NULL)
+            struct m_tag *t;
+            char *tmpbuf = NULL;
+            int tmplen = 0;
+#endif
+            int rc;
+            HTONS(ip->ip_len);
+            HTONS(ip->ip_off);
+            ip->ip_sum = 0;
+            ip->ip_sum = cksum(m, hlen);
+#ifndef VBOX_WITH_SLIRP_BSD_MBUF
+            rc = LibAliasOut((m->m_la ? m->m_la : pData->proxy_alias),
+                              mtod(m, char *), m->m_len);
+#else
+            if (m->m_next != NULL)
+            {
+                /*we've receives packet in fragments*/
+                tmplen = m_length(m, NULL);
+                tmpbuf = RTMemAlloc(tmplen);
+                Assert(tmpbuf);
+                m_copydata(m, 0, tmplen, tmpbuf);
+            }
+            else
+            {
+                tmpbuf = mtod(m, char *);
+                tmplen = m_length(m, NULL);
+
+            }
+
+            if (t = m_tag_find(m, PACKET_TAG_ALIAS, NULL) != 0)
+                rc = LibAliasOut((struct libalias *)&t[1], tmpbuf, tmplen);
+            else
+                rc = LibAliasOut(pData->proxy_alias, tmpbuf, tmplen);
+
+            if (m->m_next != NULL)
+            {
+                if (rc != PKT_ALIAS_IGNORED)
                 {
-                    /*we've receives packet in fragments*/
-                    tmplen = m_length(m, NULL);
-                    tmpbuf = RTMemAlloc(tmplen);
-                    Assert(tmpbuf);
-                    m_copydata(m, 0, tmplen, tmpbuf);
+                    struct ip *tmpip = (struct ip *)tmpbuf;
+                    m_copyback(pData, m, 0, ntohs(tmpip->ip_len) + (tmpip->ip_hl << 2), tmpbuf);
                 }
-                else
-                {
-                    tmpbuf = mtod(m, char *);
-                    tmplen = m_length(m, NULL);
-
-                }
-                if (t = m_tag_find(m, PACKET_TAG_ALIAS, NULL) != 0)
-                {
-                    rc = LibAliasOut((struct libalias *)&t[1], tmpbuf, tmplen);
-                }
-                else
-                {
-                    rc = LibAliasOut(pData->proxy_alias, tmpbuf, tmplen);
-                }
-                if (m->m_next != NULL)
-                {
-                    if (rc != PKT_ALIAS_IGNORED)
-                    {
-                        struct ip *tmpip = (struct ip *)tmpbuf;
-                        m_copyback(pData, m, 0, ntohs(tmpip->ip_len) + (tmpip->ip_hl << 2), tmpbuf);
-                    }
-                    if (tmpbuf != NULL)
-                        RTMemFree(tmpbuf);
-                }
-                if (rc == PKT_ALIAS_IGNORED)
-                {
-                    Log(("NAT: packet was droppped\n"));
-                    goto bad;
-                }
-#endif
-                NTOHS(ip->ip_len);
-                NTOHS(ip->ip_off);
-                Log2(("NAT: LibAlias return %d\n", rc));
+                if (tmpbuf != NULL)
+                    RTMemFree(tmpbuf);
+            }
+            if (rc == PKT_ALIAS_IGNORED)
+            {
+                Log(("NAT: packet was droppped\n"));
+                goto exit_drop_package;
+            }
+#endif
+            NTOHS(ip->ip_len);
+            NTOHS(ip->ip_off);
+            Log2(("NAT: LibAlias return %d\n", rc));
         }
 
@@ -409 +408 @@
 done:
     STAM_PROFILE_STOP(&pData->StatIP_output, a);
-    return (error);
-
-bad:
+    return error;
+
+exit_drop_package:
     m_freem(pData, m0);
     STAM_PROFILE_STOP(&pData->StatIP_output, a);
-    goto done;
+    return error;
 }

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

@@ -58 +58 @@
     if (   (ntohs(*ah->dport) == DNS_CONTROL_PORT_NUMBER
         || ntohs(*ah->sport) == DNS_CONTROL_PORT_NUMBER)
-        && (ah->oaddr->s_addr == htonl(ntohl(la->special_addr.s_addr)|CTL_DNS)))
+        && (ah->oaddr->s_addr == htonl(ntohl(la->pData->special_addr.s_addr)|CTL_DNS)))
         return (0);
     return (-1);

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

@@ -22 +22 @@
 #  define DO_ENGAGE_EVENT1(so, fdset, label)                        \
     do {                                                            \
-        if(    so->so_poll_index != -1                              \
+        if (    so->so_poll_index != -1                             \
             && so->s == polls[so->so_poll_index].fd) {              \
             polls[so->so_poll_index].events |= N_(fdset ## _poll);  \
@@ -34 +34 @@
         polls[poll_index].revents = 0;                              \
         poll_index++;                                               \
-    } while(0)
-
-
-#  define DO_ENGAGE_EVENT2(so, fdset1, fdset2, label)           \
-    do {                                                        \
-        if(    so->so_poll_index != -1                          \
-            && so->s == polls[so->so_poll_index].fd) {          \
-            polls[so->so_poll_index].events |=                  \
-                N_(fdset1 ## _poll) | N_(fdset1 ## _poll);      \
-            break; /* out of this loop */                       \
-        }                                                       \
-        AssertRelease(poll_index < (nfds));                     \
-        polls[poll_index].fd = (so)->s;                         \
-        (so)->so_poll_index = poll_index;                       \
-        polls[poll_index].events =                              \
-            N_(fdset1 ## _poll) | N_(fdset1 ## _poll);          \
-        poll_index++;                                           \
-    } while(0)
+    } while (0)
+
+
+#  define DO_ENGAGE_EVENT2(so, fdset1, fdset2, label)               \
+    do {                                                            \
+        if (    so->so_poll_index != -1                             \
+            && so->s == polls[so->so_poll_index].fd) {              \
+            polls[so->so_poll_index].events |=                      \
+                N_(fdset1 ## _poll) | N_(fdset1 ## _poll);          \
+            break; /* out of this loop */                           \
+        }                                                           \
+        AssertRelease(poll_index < (nfds));                         \
+        polls[poll_index].fd = (so)->s;                             \
+        (so)->so_poll_index = poll_index;                           \
+        polls[poll_index].events =                                  \
+            N_(fdset1 ## _poll) | N_(fdset1 ## _poll);              \
+        poll_index++;                                               \
+    } while (0)
 
 #  define DO_POLL_EVENTS(rc, error, so, events, label) do {} while (0)
 
-#  define DO_CHECK_FD_SET(so, events, fdset) (  ((so)->so_poll_index != -1)                                     \
-                                                && ((so)->so_poll_index <= ndfs)                                \
-                                                && ((so)->s == polls[so->so_poll_index].fd)                     \
-                                                && (polls[(so)->so_poll_index].revents & N_(fdset ## _poll)))
-#  define DO_UNIX_CHECK_FD_SET(so, events, fdset ) DO_CHECK_FD_SET((so), (events), fdset) /*specific for Unix API */
-#  define DO_WIN_CHECK_FD_SET(so, events, fdset ) 0 /* specific for Windows Winsock API */
+#  define DO_CHECK_FD_SET(so, events, fdset)                        \
+      (   ((so)->so_poll_index != -1)                               \
+       && ((so)->so_poll_index <= ndfs)                             \
+       && ((so)->s == polls[so->so_poll_index].fd)                  \
+       && (polls[(so)->so_poll_index].revents & N_(fdset ## _poll)))
+
+   /* specific for Unix API */
+#  define DO_UNIX_CHECK_FD_SET(so, events, fdset ) DO_CHECK_FD_SET((so), (events), fdset) 
+   /* specific for Windows Winsock API */
+#  define DO_WIN_CHECK_FD_SET(so, events, fdset ) 0 
 
 # ifndef RT_OS_WINDOWS
@@ -84 +88 @@
 # else /* !RT_OS_WINDOWS */
 #  define DO_WIN_CHECK_FD_SET(so, events, fdset ) DO_CHECK_FD_SET((so), (events), fdset)
-#  define ICMP_ENGAGE_EVENT(so, fdset) do {} while(0)
+#  define ICMP_ENGAGE_EVENT(so, fdset) do {} while (0)
 #endif /* RT_OS_WINDOWS */
 
@@ -93 +97 @@
  * So no call to WSAEventSelect necessary.
  */
-# define ICMP_ENGAGE_EVENT(so, fdset)                do {} while(0)
+# define ICMP_ENGAGE_EVENT(so, fdset)                do {} while (0)
 
 # define DO_ENGAGE_EVENT1(so, fdset1, label)                                                    \
@@ -105 +109 @@
                         error, (so), (so)->s, VBOX_SOCKET_EVENT));                              \
         }                                                                                       \
-    } while(0);                                                                                 \
+    } while (0);                                                                                 \
     CONTINUE(label)
 
@@ -191 +195 @@
 
 static void activate_port_forwarding(PNATState, struct ethhdr *);
-static uint32_t find_guest_ip(PNATState, const uint8_t *);
 
 static const uint8_t special_ethaddr[6] =
@@ -213 +216 @@
                                const char **ppszDomain)
 {
-    /* Get amount of memory required for operation */
     ULONG flags = GAA_FLAG_INCLUDE_PREFIX; /*GAA_FLAG_INCLUDE_ALL_INTERFACES;*/ /* all interfaces registered in NDIS */
-    PIP_ADAPTER_ADDRESSES addresses = NULL;
-    PIP_ADAPTER_ADDRESSES addr = NULL;
-    PIP_ADAPTER_DNS_SERVER_ADDRESS dns = NULL;
-    ULONG size = 0;
+    PIP_ADAPTER_ADDRESSES pAdapterAddr = NULL;
+    PIP_ADAPTER_ADDRESSES pAddr = NULL;
+    PIP_ADAPTER_DNS_SERVER_ADDRESS pDnsAddr = NULL;
+    ULONG size;
     int wlen = 0;
-    char *suffix;
-    struct dns_entry *da = NULL;
-    struct dns_domain_entry *dd = NULL;
+    char *pszSuffix;
+    struct dns_domain_entry *pDomain = NULL;
     ULONG ret = ERROR_SUCCESS;
 
     /* @todo add SKIPing flags to get only required information */
 
-    ret = pData->pfGetAdaptersAddresses(AF_INET, 0, NULL /* reserved */, addresses, &size);
+    /* determine size of buffer */
+    size = 0;
+    ret = pData->pfGetAdaptersAddresses(AF_INET, 0, NULL /* reserved */, pAdapterAddr, &size);
     if (ret != ERROR_BUFFER_OVERFLOW)
     {
@@ -233 +236 @@
         return -1;
     }
-
     if (size == 0)
     {
@@ -240 +242 @@
     }
 
-    addresses = RTMemAllocZ(size);
-    if (addresses == NULL)
+    pAdapterAddr = RTMemAllocZ(size);
+    if (!pAdapterAddr)
     {
         LogRel(("NAT: No memory available \n"));
         return -1;
     }
-
-    ret = pData->pfGetAdaptersAddresses(AF_INET, 0, NULL /* reserved */, addresses, &size);
+    ret = pData->pfGetAdaptersAddresses(AF_INET, 0, NULL /* reserved */, pAdapterAddr, &size);
     if (ret != ERROR_SUCCESS)
     {
         LogRel(("NAT: error %lu occurred on fetching adapters info\n", ret));
-        RTMemFree(addresses);
+        RTMemFree(pAdapterAddr);
         return -1;
     }
-    addr = addresses;
-    while(addr != NULL)
+
+    for (pAddr = pAdapterAddr; pAddr != NULL; pAddr = pAddr->Next)
     {
         int found;
-        if (addr->OperStatus != IfOperStatusUp)
-            goto next;
-        dns = addr->FirstDnsServerAddress;
-        while (dns != NULL)
-        {
-            struct sockaddr *saddr = dns->Address.lpSockaddr;
-            if (saddr->sa_family != AF_INET)
-                goto next_dns;
+        if (pAddr->OperStatus != IfOperStatusUp)
+            continue;
+
+        for (pDnsAddr = pAddr->FirstDnsServerAddress; pDnsAddr != NULL; pDnsAddr = pDnsAddr->Next)
+        {
+            struct sockaddr *SockAddr = pDnsAddr->Address.lpSockaddr;
+            struct in_addr  *InAddr;
+            struct dns_entry *pDns;
+
+            if (SockAddr->sa_family != AF_INET)
+                continue;
+
+            InAddr = ((struct sockaddr_in *)SockAddr)->sin_addr;
+
             /* add dns server to list */
-            da = RTMemAllocZ(sizeof(struct dns_entry));
-            if (da == NULL)
+            pDns = RTMemAllocZ(sizeof(struct dns_entry));
+            if (!pDns)
             {
                 LogRel(("NAT: Can't allocate buffer for DNS entry\n"));
-                RTMemFree(addresses);
+                RTMemFree(pAdapterAddr);
                 return VERR_NO_MEMORY;
             }
-            LogRel(("NAT: adding %R[IP4] to DNS server list\n",
-                    &((struct sockaddr_in *)saddr)->sin_addr));
-            if ((((  struct sockaddr_in *)saddr)->sin_addr.s_addr & htonl(IN_CLASSA_NET)) ==
-                     ntohl(INADDR_LOOPBACK & IN_CLASSA_NET)) {
-                da->de_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
-            }
+
+            LogRel(("NAT: adding %R[IP4] to DNS server list\n", &InAddr));
+            if (InAddr.s_addr & htonl(IN_CLASSA_NET) == ntohl(INADDR_LOOPBACK & IN_CLASSA_NET))
+                pDns->de_addr.s_addr = htonl(ntohl(pData->special_addr.s_addr) | CTL_ALIAS);
             else
-            {
-                da->de_addr.s_addr = ((struct sockaddr_in *)saddr)->sin_addr.s_addr;
-            }
-            TAILQ_INSERT_HEAD(&pData->dns_list_head, da, de_list);
-
-            if (addr->DnsSuffix == NULL)
-                goto next_dns;
-
-            /*uniq*/
-            RTUtf16ToUtf8(addr->DnsSuffix, &suffix);
-
-            if (!suffix || strlen(suffix) == 0) {
-                RTStrFree(suffix);
-                goto next_dns;
+                pDns->de_addr.s_addr = InAddr.s_addr;
+
+            TAILQ_INSERT_HEAD(&pData->pDnsList, pDns, de_list);
+
+            if (pAdddr->DnsSuffix == NULL)
+                continue;
+
+            /* uniq */
+            RTUtf16ToUtf8(pAdddr->DnsSuffix, &pszSuffix);
+            if (!pszSuffix || strlen(pszSuffix) == 0)
+            {
+                RTStrFree(pszSuffix);
+                continue;
             }
 
             found = 0;
-            LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
-            {
-                if (   dd->dd_pszDomain != NULL
-                    && strcmp(dd->dd_pszDomain, suffix) == 0)
+            LIST_FOREACH(pDomain, &pData->pDomainList, dd_list)
+            {
+                if (   pDomain->dd_pszDomain != NULL
+                    && strcmp(pDomain->dd_pszDomain, pszSuffix) == 0)
                 {
                     found = 1;
-                    RTStrFree(suffix);
+                    RTStrFree(pszSuffix);
                     break;
                 }
             }
-            if (found == 0)
-            {
-                dd = RTMemAllocZ(sizeof(struct dns_domain_entry));
-                if (dd == NULL)
+            if (!found)
+            {
+                pDomain = RTMemAllocZ(sizeof(struct dns_domain_entry));
+                if (!pDomain)
                 {
                     LogRel(("NAT: not enough memory\n"));
-                    RTStrFree(suffix);
-                    RTMemFree(addresses);
+                    RTStrFree(pszSuffix);
+                    RTMemFree(pAdapterAddr);
                     return VERR_NO_MEMORY;
                 }
-                dd->dd_pszDomain = suffix;
-                LogRel(("NAT: adding domain name %s to search list\n", dd->dd_pszDomain));
-                LIST_INSERT_HEAD(&pData->dns_domain_list_head, dd, dd_list);
-            }
-        next_dns:
-            dns = dns->Next;
-        }
-    next:
-        addr = addr->Next;
-    }
-    RTMemFree(addresses);
+                pDomain->dd_pszDomain = pszSuffix;
+                LogRel(("NAT: adding domain name %s to search list\n", pDomain->dd_pszDomain));
+                LIST_INSERT_HEAD(&pData->pDomainList, pDomain, dd_list);
+            }
+        }
+    }
+    RTMemFree(pAdapterAddr);
     return 0;
 }
@@ -341 +341 @@
     char *pu8Buf = (char *)pvBuf;
     *pcbRead = 0;
-    while(   RT_SUCCESS(rc = RTFileRead(File, &bTest, 1, &cbRead))
-          && (pu8Buf - (char *)pvBuf) < cbBufSize)
+
+    while (   RT_SUCCESS(rc = RTFileRead(File, &bTest, 1, &cbRead))
+           && (pu8Buf - (char *)pvBuf) < cbBufSize)
     {
         if (cbRead == 0)
             return VERR_EOF;
+
         if (bTest == '\r' || bTest == '\n')
         {
@@ -357 +359 @@
     return rc;
 }
+
 static int get_dns_addr_domain(PNATState pData, bool fVerbose,
                                struct in_addr *pdns_addr,
@@ -410 +413 @@
     if (ppszDomain)
         *ppszDomain = NULL;
-    Log(("nat: DNS Servers:\n"));
+
+    Log(("NAT: DNS Servers:\n"));
     while (    RT_SUCCESS(rc = RTFileGets(f, buff, 512, &bytes))
             && rc != VERR_EOF)
     {
-        struct dns_entry *da = NULL;
+        struct dns_entry *pDns = NULL;
         if (sscanf(buff, "nameserver%*[ \t]%256s", buff2) == 1)
         {
             if (!inet_aton(buff2, &tmp_addr))
                 continue;
-            /*localhost mask */
-            da = RTMemAllocZ(sizeof (struct dns_entry));
-            if (da == NULL)
+
+            /* localhost mask */
+            pDns = RTMemAllocZ(sizeof (struct dns_entry));
+            if (!pDns)
             {
                 LogRel(("can't alloc memory for DNS entry\n"));
                 return -1;
             }
-            /*check */
-            da->de_addr.s_addr = tmp_addr.s_addr;
-            if ((da->de_addr.s_addr & htonl(IN_CLASSA_NET)) == ntohl(INADDR_LOOPBACK & IN_CLASSA_NET)) {
-                da->de_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
-            }
-            TAILQ_INSERT_HEAD(&pData->dns_list_head, da, de_list);
+
+            /* check */
+            pDns->de_addr.s_addr = tmp_addr.s_addr;
+            if ((pDns->de_addr.s_addr & htonl(IN_CLASSA_NET)) == ntohl(INADDR_LOOPBACK & IN_CLASSA_NET))
+            {
+                pDns->de_addr.s_addr = htonl(ntohl(pData->special_addr.s_addr) | CTL_ALIAS);
+            }
+            TAILQ_INSERT_HEAD(&pData->pDnsList, pDns, de_list);
             found++;
         }
@@ -438 +445 @@
             char *tok;
             char *saveptr;
-            struct dns_domain_entry *dd = NULL;
+            struct dns_domain_entry *pDomain = NULL;
             int found = 0;
             tok = strtok_r(&buff[6], " \t\n", &saveptr);
-            LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
-            {
-                if(    tok != NULL
-                    && strcmp(tok, dd->dd_pszDomain) == 0)
+            LIST_FOREACH(pDomain, &pData->pDomainList, dd_list)
+            {
+                if (   tok != NULL
+                    && strcmp(tok, pDomain->dd_pszDomain) == 0)
                 {
                     found = 1;
@@ -450 +457 @@
                 }
             }
-            if (tok != NULL && found == 0) {
-                dd = RTMemAllocZ(sizeof(struct dns_domain_entry));
-                if (dd == NULL)
+            if (tok != NULL && found == 0)
+            {
+                pDomain = RTMemAllocZ(sizeof(struct dns_domain_entry));
+                if (!pDomain)
                 {
                     LogRel(("NAT: not enought memory to add domain list\n"));
                     return VERR_NO_MEMORY;
                 }
-                dd->dd_pszDomain = RTStrDup(tok);
-                LogRel(("NAT: adding domain name %s to search list\n", dd->dd_pszDomain));
-                LIST_INSERT_HEAD(&pData->dns_domain_list_head, dd, dd_list);
+                pDomain->dd_pszDomain = RTStrDup(tok);
+                LogRel(("NAT: adding domain name %s to search list\n", pDomain->dd_pszDomain));
+                LIST_INSERT_HEAD(&pData->pDomainList, pDomain, dd_list);
             }
         }
@@ -473 +481 @@
 static int slirp_init_dns_list(PNATState pData)
 {
-    TAILQ_INIT(&pData->dns_list_head);
-    LIST_INIT(&pData->dns_domain_list_head);
+    TAILQ_INIT(&pData->pDnsList);
+    LIST_INIT(&pData->pDomainList);
     return get_dns_addr_domain(pData, true, NULL, NULL);
 }
@@ -480 +488 @@
 static void slirp_release_dns_list(PNATState pData)
 {
-    struct dns_entry *de = NULL;
-    struct dns_domain_entry *dd = NULL;
-    while(!TAILQ_EMPTY(&pData->dns_list_head)) {
-        de = TAILQ_FIRST(&pData->dns_list_head);
-        TAILQ_REMOVE(&pData->dns_list_head, de, de_list);
-        RTMemFree(de);
-    }
-    while(!LIST_EMPTY(&pData->dns_domain_list_head)) {
-        dd = LIST_FIRST(&pData->dns_domain_list_head);
-        LIST_REMOVE(dd, dd_list);
-        if (dd->dd_pszDomain != NULL)
-            RTStrFree(dd->dd_pszDomain);
-        RTMemFree(dd);
+    struct dns_entry *pDns = NULL;
+    struct dns_domain_entry *pDomain = NULL;
+
+    while (!TAILQ_EMPTY(&pData->pDnsList))
+    {
+        pDns = TAILQ_FIRST(&pData->pDnsList);
+        TAILQ_REMOVE(&pData->pDnsList, pDns, de_list);
+        RTMemFree(pDns);
+    }
+
+    while (!LIST_EMPTY(&pData->pDomainList))
+    {
+        pDomain = LIST_FIRST(&pData->pDomainList);
+        LIST_REMOVE(pDomain, dd_list);
+        if (pDomain->dd_pszDomain != NULL)
+            RTStrFree(pDomain->dd_pszDomain);
+        RTMemFree(pDomain);
     }
 }
@@ -564 +576 @@
 
 #ifndef VBOX_WITH_NAT_SERVICE
-    inet_aton(pszNetAddr, &special_addr);
+    inet_aton(pszNetAddr, &pData->special_addr);
 #else
-    special_addr.s_addr = u32NetAddr;
+    pData->special_addr.s_addr = u32NetAddr;
 #endif
     pData->slirp_ethaddr = &special_ethaddr[0];
-    alias_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS);
+    alias_addr.s_addr = pData->special_addr.s_addr | htonl(CTL_ALIAS);
     /* @todo: add ability to configure this staff */
 
@@ -598 +610 @@
         flags |= PKT_ALIAS_LOG; /* set logging */
         flags = LibAliasSetMode(pData->proxy_alias, flags, ~0);
-        proxy_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
+        proxy_addr.s_addr = htonl(ntohl(pData->special_addr.s_addr) | CTL_ALIAS);
         LibAliasSetAddress(pData->proxy_alias, proxy_addr);
         ftp_alias_load(pData);
@@ -684 +696 @@
     if (pData->use_host_resolver)
         dns_alias_unload(pData);
-    while(!LIST_EMPTY(&instancehead))
+    while (!LIST_EMPTY(&instancehead))
     {
         struct libalias *la = LIST_FIRST(&instancehead);
@@ -690 +702 @@
         LibAliasUninit(la);
     }
-    while(!LIST_EMPTY(&pData->arp_cache))
+    while (!LIST_EMPTY(&pData->arp_cache))
     {
         struct arp_cache_entry *ac = LIST_FIRST(&pData->arp_cache);
@@ -1419 +1431 @@
     tip = *(uint32_t*)ah->ar_tip;
 
-
     ar_op = ntohs(ah->ar_op);
-    switch(ar_op)
+    switch (ar_op)
     {
         case ARPOP_REQUEST:
@@ -1446 +1457 @@
 #endif
 #ifdef VBOX_WITH_NAT_SERVICE
-            if (tip == special_addr.s_addr) goto arp_ok;
-#endif
-            if ((htip & pData->netmask) == ntohl(special_addr.s_addr))
+            if (tip == pData->special_addr.s_addr)
+                goto arp_ok;
+#endif
+            if ((htip & pData->netmask) == ntohl(pData->special_addr.s_addr))
             {
                 if (   CTL_CHECK(htip, CTL_DNS)
@@ -1464 +1476 @@
                 m_free(pData, mr);
                 return;
-        arp_ok:
+
+         arp_ok:
                 rah->ar_hrd = htons(1);
                 rah->ar_pro = htons(ETH_P_IP);
@@ -1487 +1500 @@
                 m_free(pData, m);
             }
-            /*Gratuitous ARP*/
+            /* Gratuitous ARP */
             if (  *(uint32_t *)ah->ar_sip == *(uint32_t *)ah->ar_tip
                 && memcmp(ah->ar_tha, broadcast_ethaddr, ETH_ALEN) == 0
-                &&  memcmp(eh->h_dest, broadcast_ethaddr, ETH_ALEN) == 0)
+                && memcmp(eh->h_dest, broadcast_ethaddr, ETH_ALEN) == 0)
             {
                 /* we've received anounce about address asignment
@@ -1507 +1520 @@
             }
             break;
+
         case ARPOP_REPLY:
-        {
             if (slirp_arp_cache_update(pData, *(uint32_t *)ah->ar_sip, &ah->ar_sha[0]) == 0)
             {
@@ -1515 +1528 @@
             }
             slirp_arp_cache_add(pData, *(uint32_t *)ah->ar_sip, ah->ar_sha);
-            /*after/save restore we need up port forwarding again*/
+            /* after/save restore we need up port forwarding again */
             if (pData->port_forwarding_activated != pData->port_forwarding_count)
                 activate_port_forwarding(pData, eh);
             m_free(pData, m);
-        }
-        break;
+            break;
+
         default:
             break;
@@ -1570 +1583 @@
 
     if (pkt_len < MSIZE)
-    {
         size = MCLBYTES;
-    }
     else if (pkt_len < MCLBYTES)
-    {
         size = MCLBYTES;
-    }
-    else if(pkt_len < MJUM9BYTES)
-    {
+    else if (pkt_len < MJUM9BYTES)
         size = MJUM9BYTES;
-    }
     else if (pkt_len < MJUM16BYTES)
-    {
         size = MJUM16BYTES;
-    }
     else
-    {
         AssertMsgFailed(("Unsupported size"));
-    }
+
     m = m_getjcl(pData, M_NOWAIT, MT_HEADER, M_PKTHDR, size);
     if (!m)
@@ -1603 +1607 @@
     /* Note: we add to align the IP header */
 
-
     if (pData->port_forwarding_activated != pData->port_forwarding_count)
         activate_port_forwarding(pData, mtod(m, struct ethhdr *));
@@ -1612 +1615 @@
             arp_input(pData, m);
             break;
+
         case ETH_P_IP:
             /* Update time. Important if the network is very quiet, as otherwise
@@ -1633 +1637 @@
             ip_input(pData, m);
             break;
+
         case ETH_P_IPV6:
             m_free(pData, m);
@@ -1641 +1646 @@
             }
             break;
+
         default:
             Log(("NAT: Unsupported protocol %x\n", proto));
@@ -1646 +1652 @@
             break;
     }
+
 #ifdef VBOX_WITH_SLIRP_BSD_MBUF
     RTMemFree((void *)pkt);
@@ -1664 +1671 @@
     eh = mtod(m, struct ethhdr *);
 
-    if(MBUF_HEAD(m) != m->m_data)
+    if (MBUF_HEAD(m) != m->m_data)
     {
         LogRel(("NAT: ethernet detects corruption of the packet"));
@@ -1721 +1728 @@
 {
     uint32_t ip = INADDR_ANY;
+    int rc;
+    
     if (eth_addr == NULL)
-        goto done;
-    if (memcmp(eth_addr, zerro_ethaddr, ETH_ALEN) == 0
+        return INADDR_ANY;
+
+    if (   memcmp(eth_addr, zerro_ethaddr, ETH_ALEN) == 0
         || memcmp(eth_addr, broadcast_ethaddr, ETH_ALEN) == 0)
-        goto done;
-    if(slirp_arp_lookup_ip_by_ether(pData, eth_addr, &ip) == 0)
-        goto done;
+        return INADDR_ANY;
+
+    rc = slirp_arp_lookup_ip_by_ether(pData, eth_addr, &ip);
+    if (RT_SUCCESS(rc))
+        return ip;
+
     bootp_cache_lookup_ip_by_ether(pData, eth_addr, &ip);
-done:
+    /* ignore return code, ip will be set to INADDR_ANY on error */
     return ip;
 }
@@ -1777 +1790 @@
 #if !defined(VBOX_WITH_NAT_SERVICE)
         if (rule->guest_addr.s_addr != guest_addr)
-        {
             continue;
-        }
 #endif
 
         LogRel(("NAT: set redirect %s hp:%d gp:%d\n", (rule->proto == IPPROTO_UDP?"UDP":"TCP"),
             rule->host_port, rule->guest_port));
+
         if (rule->proto == IPPROTO_UDP)
         {
@@ -1796 +1808 @@
             pData->port_forwarding_activated++;
         }
+
         if (so == NULL)
         {
@@ -1827 +1840 @@
         alias.s_addr =  htonl(ntohl(guest_addr) | CTL_ALIAS);
         link = LibAliasRedirectPort(lib, psin->sin_addr, htons(rule->host_port),
-            alias, htons(rule->guest_port),
-            special_addr,  -1, /* not very clear for now*/
-            rule->proto);
-        if (link == NULL)
+                                    alias, htons(rule->guest_port),
+                                    pData->special_addr,  -1, /* not very clear for now */
+                                    rule->proto);
+        if (!link)
         {
             LogRel(("NAT: failed redirect %s hp:%d gp:%d\n", (rule->proto == IPPROTO_UDP?"UDP":"TCP"),
-                rule->host_port, rule->guest_port));
+                   rule->host_port, rule->guest_port));
             goto remove_port_forwarding;
         }
+
         so->so_la = lib;
         rule->activated = 1;
         continue;
+
     remove_port_forwarding:
         LIST_REMOVE(rule, list);
@@ -1961 +1976 @@
     Log2(("next_server:%s\n", next_server));
     if (next_server == NULL)
-        pData->tftp_server.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_TFTP);
+        pData->tftp_server.s_addr = htonl(ntohl(pData->special_addr.s_addr) | CTL_TFTP);
     else
         inet_aton(next_server, &pData->tftp_server);
@@ -1989 +2004 @@
 }
 
-#define CHECK_ARG(name, val, lim_min, lim_max)                                  \
-do {                                                                            \
-    if ((val) < (lim_min) || (val) > (lim_max))                                 \
-    {                                                                           \
-        LogRel(("NAT: (" #name ":%d) has been ignored, "                        \
-            "because out of range (%d, %d)\n", (val), (lim_min), (lim_max)));   \
-        return;                                                                 \
-    }                                                                           \
-    else                                                                        \
-    {                                                                           \
-        LogRel(("NAT: (" #name ":%d)\n", (val)));                               \
-    }                                                                           \
-} while (0)
+#define CHECK_ARG(name, val, lim_min, lim_max)                                      \
+    do {                                                                            \
+        if ((val) < (lim_min) || (val) > (lim_max))                                 \
+        {                                                                           \
+            LogRel(("NAT: (" #name ":%d) has been ignored, "                        \
+                "because out of range (%d, %d)\n", (val), (lim_min), (lim_max)));   \
+            return;                                                                 \
+        }                                                                           \
+        else                                                                        \
+        {                                                                           \
+            LogRel(("NAT: (" #name ":%d)\n", (val)));                               \
+        }                                                                           \
+    } while (0)
 
 /* don't allow user set less 8kB and more than 1M values */
@@ -2029 +2044 @@
  * Looking for Ether by ip in ARP-cache
  * Note: it´s responsible of caller to allocate buffer for result
- * @returns 0 - if found, 1 - otherwise
+ * @returns iprt status code
  */
 int slirp_arp_lookup_ether_by_ip(PNATState pData, uint32_t ip, uint8_t *ether)
 {
     struct arp_cache_entry *ac = NULL;
-    int rc = 1;
+
     if (ether == NULL)
-        return rc;
+        return VERR_INVALID_PARAMETER;
 
     if (LIST_EMPTY(&pData->arp_cache))
-        return rc;
+        return VERR_NOT_FOUND;
 
     LIST_FOREACH(ac, &pData->arp_cache, list)
@@ -2046 +2061 @@
         {
             memcpy(ether, ac->ether, ETH_ALEN);
-            rc = 0;
-            return rc;
-        }
-    }
-    return rc;
+            return VINF_SUCCESS;
+        }
+    }
+    return VERR_NOT_FOUND;
 }
 
@@ -2061 +2075 @@
 {
     struct arp_cache_entry *ac = NULL;
-    int rc = 1;
     *ip = INADDR_ANY;
+
     if (LIST_EMPTY(&pData->arp_cache))
-        return rc;
+        return VERR_NOT_FOUND;
+
     LIST_FOREACH(ac, &pData->arp_cache, list)
     {
@@ -2070 +2085 @@
         {
             *ip = ac->ip;
-            rc = 0;
-            return rc;
-        }
-    }
-    return rc;
+            return VINF_SUCCESS;
+        }
+    }
+    return VERR_NOT_FOUND;
 }
 
@@ -2102 +2116 @@
     ahdr->ar_op = htons(ARPOP_REQUEST);
     memcpy(ahdr->ar_sha, special_ethaddr, ETH_ALEN);
-    *(uint32_t *)ahdr->ar_sip = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS);
+    *(uint32_t *)ahdr->ar_sip = htonl(ntohl(pData->special_addr.s_addr) | CTL_ALIAS);
     memset(ahdr->ar_tha, 0xff, ETH_ALEN); /*broadcast*/
     *(uint32_t *)ahdr->ar_tip = dst;
@@ -2159 +2173 @@
 }
 #endif
-void slirp_set_dhcp_mtu(PNATState, int);

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

@@ -175 +175 @@
     ULONG (WINAPI * pfGetAdaptersAddresses)(ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG);
 #endif
-    struct dns_list_head dns_list_head;
-    struct dns_domain_list_head dns_domain_list_head;
+    struct dns_list_head pDnsList;
+    struct dns_domain_list_head pDomainList;
     struct in_addr tftp_server;
     struct in_addr loopback_addr;
@@ -404 +404 @@
 # define handler_chain pData->handler_chain
 #endif
-#define special_addr pData->special_addr
 #define dns_addr pData->dns_addr
 #define loopback_addr pData->loopback_addr

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

@@ -765 +765 @@
     paddr = (struct sockaddr_in *)&addr;
     paddr->sin_family = AF_INET;
-    if ((so->so_faddr.s_addr & htonl(pData->netmask)) == special_addr.s_addr)
+    if ((so->so_faddr.s_addr & htonl(pData->netmask)) == pData->special_addr.s_addr)
     {
         /* It's an alias */

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

@@ -396 +396 @@
 
         addr.sin_family = AF_INET;
-        if ((so->so_faddr.s_addr & htonl(pData->netmask)) == special_addr.s_addr)
+        if ((so->so_faddr.s_addr & htonl(pData->netmask)) == pData->special_addr.s_addr)
         {
             /* It's an alias */

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

@@ -259 +259 @@
      */
     if (   pData->use_dns_proxy
-        && (ip->ip_dst.s_addr == htonl(ntohl(special_addr.s_addr) | CTL_DNS))
+        && (ip->ip_dst.s_addr == htonl(ntohl(pData->special_addr.s_addr) | CTL_DNS))
         && (ntohs(uh->uh_dport) == 53))
     {
@@ -377 +377 @@
 
     saddr = *addr;
-    if ((so->so_faddr.s_addr & htonl(pData->netmask)) == special_addr.s_addr)
+    if ((so->so_faddr.s_addr & htonl(pData->netmask)) == pData->special_addr.s_addr)
     {
         saddr.sin_addr.s_addr = so->so_faddr.s_addr;