Changeset 40283 in vbox

Timestamp:

Feb 29, 2012 2:21:42 AM (13 years ago)

Author:

vboxsync

Message:

NAT: CTL_CHECK takes address without modification.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ctl.h (modified) (1 diff)
• udp.c (modified) (3 diffs)

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

@@ -25 +25 @@
 #define CTL_BROADCAST   255
 
-#define CTL_CHECK(x, ctl) (((x) & ~pData->netmask) == (ctl) \
+#define CTL_CHECK(x, ctl) ((RT_N2H_U32((x)) & ~pData->netmask) == (ctl) \
                            && (((x) & ~pData->netmask) == (pData->special_addr.s_addr & ~pData->netmask)))

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

@@ -182 +182 @@
     if (   pData->fUseHostResolver
         && uh->uh_dport == RT_H2N_U16_C(53)
-        && CTL_CHECK(RT_N2H_U32(ip->ip_dst.s_addr), CTL_DNS))
+        && CTL_CHECK(ip->ip_dst.s_addr, CTL_DNS))
     {
         struct sockaddr_in dst, src;
@@ -202 +202 @@
      */
     if (   uh->uh_dport == RT_H2N_U16_C(TFTP_SERVER)
-        && CTL_CHECK(RT_N2H_U32(ip->ip_dst.s_addr), CTL_TFTP))
+        && CTL_CHECK(ip->ip_dst.s_addr, CTL_TFTP))
     {
         tftp_input(pData, m);
@@ -413 +413 @@
             m->m_flags |= M_SKIP_FIREWALL;
             /**
-             * udp/137 port is used for NetBIOS lookup. for some reasons Windows guest rejects
+             * udp/137 port is Name Service in NetBIOS protocol. for some reasons Windows guest rejects
              * accept data from non-aliased server.
              */