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

Timestamp:

Jan 13, 2010 10:29:59 AM (15 years ago)

Author:

vboxsync

Message:

NAT: fixed recent regression (xtracker 4590) on non-Linux/non-Windows hosts; some -Wshadow warnings

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (1 diff)
• slirp/ip_input.c (modified) (1 diff)
• slirp/slirp.c (modified) (9 diffs)

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

@@ -1160 +1160 @@
             if (pipe(&fds[0]) != 0) /** @todo RTPipeCreate() or something... */
             {
-                int rc = RTErrConvertFromErrno(errno);
+                rc = RTErrConvertFromErrno(errno);
                 AssertRC(rc);
                 return rc;

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

@@ -108 +108 @@
     {
         int rc;
-        STAM_PROFILE_START(&pData->StatALIAS_input, a);
+        STAM_PROFILE_START(&pData->StatALIAS_input, b);
         rc = LibAliasIn(select_alias(pData, m), mtod(m, char *), m->m_len);
-        STAM_PROFILE_STOP(&pData->StatALIAS_input, a);
+        STAM_PROFILE_STOP(&pData->StatALIAS_input, b);
         Log2(("NAT: LibAlias return %d\n", rc));
         if (m->m_len != ntohs(ip->ip_len))

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

@@ -70 +70 @@
 #  define readfds_poll   (POLLRDNORM)
 #  define writefds_poll  (POLLWRNORM)
-#  define xfds_poll      (POLLRDBAND|POLLWRBAND|POLLPRI)
 # else
 #  define readfds_poll   (POLLIN)
 #  define writefds_poll  (POLLOUT)
-#  define xfds_poll      (POLLPRI)
 # endif
+# define xfds_poll       (POLLPRI)
 # define closefds_poll   (POLLHUP)
 # define rderr_poll      (POLLERR)
@@ -367 +366 @@
     char buff2[256];
     RTFILE f;
-    int found = 0;
+    int fFoundNameserver = 0;
     struct in_addr tmp_addr;
     int rc;
@@ -439 +438 @@
             }
             TAILQ_INSERT_HEAD(&pData->pDnsList, pDns, de_list);
-            found++;
+            fFoundNameserver++;
         }
         if ((!strncmp(buff, "domain", 6) || !strncmp(buff, "search", 6)))
@@ -446 +445 @@
             char *saveptr;
             struct dns_domain_entry *pDomain = NULL;
-            int found = 0;
+            int fFoundDomain = 0;
             tok = strtok_r(&buff[6], " \t\n", &saveptr);
             LIST_FOREACH(pDomain, &pData->pDomainList, dd_list)
@@ -453 +452 @@
                     && strcmp(tok, pDomain->dd_pszDomain) == 0)
                 {
-                    found = 1;
+                    fFoundDomain = 1;
                     break;
                 }
             }
-            if (tok != NULL && found == 0)
+            if (tok != NULL && !fFoundDomain)
             {
                 pDomain = RTMemAllocZ(sizeof(struct dns_domain_entry));
@@ -472 +471 @@
     }
     RTFileClose(f);
-    if (!found)
+    if (!fFoundNameserver)
         return -1;
     return 0;
@@ -1017 +1016 @@
         if (time_fasttimo && ((curtime - time_fasttimo) >= 2))
         {
-            STAM_PROFILE_START(&pData->StatFastTimer, a);
+            STAM_PROFILE_START(&pData->StatFastTimer, b);
             tcp_fasttimo(pData);
             time_fasttimo = 0;
-            STAM_PROFILE_STOP(&pData->StatFastTimer, a);
+            STAM_PROFILE_STOP(&pData->StatFastTimer, b);
         }
         if (do_slowtimo && ((curtime - last_slowtimo) >= 499))
         {
-            STAM_PROFILE_START(&pData->StatSlowTimer, a);
+            STAM_PROFILE_START(&pData->StatSlowTimer, c);
             ip_slowtimo(pData);
             tcp_slowtimo(pData);
             last_slowtimo = curtime;
-            STAM_PROFILE_STOP(&pData->StatSlowTimer, a);
+            STAM_PROFILE_STOP(&pData->StatSlowTimer, c);
         }
     }
@@ -1777 +1776 @@
     {
         struct socket *so;
-        struct alias_link *link;
+        struct alias_link *alias_link;
         struct libalias *lib;
         int flags;
@@ -1845 +1844 @@
 
         alias.s_addr =  htonl(ntohl(guest_addr) | CTL_ALIAS);
-        link = LibAliasRedirectPort(lib, psin->sin_addr, htons(rule->host_port),
-                                    alias, htons(rule->guest_port),
-                                    pData->special_addr,  -1, /* not very clear for now */
-                                    rule->proto);
-        if (!link)
+        alias_link = LibAliasRedirectPort(lib, psin->sin_addr, htons(rule->host_port),
+                                          alias, htons(rule->guest_port),
+                                          pData->special_addr,  -1, /* not very clear for now */
+                                          rule->proto);
+        if (!alias_link)
             goto remove_port_forwarding;