Changeset 39259 in vbox

Timestamp:

Nov 10, 2011 8:29:39 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74794

Message:

NAT: firewall emulation hack allowing NETBIOS resolving mechanism live in peace with Sun RPC.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_input.c (modified) (1 diff)
• ip_output.c (modified) (4 diffs)
• udp.c (modified) (1 diff)

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

@@ -116 +116 @@
     {
         int rc;
-        STAM_PROFILE_START(&pData->StatALIAS_input, b);
-        rc = LibAliasIn(select_alias(pData, m), mtod(m, char *), m_length(m, NULL));
-        STAM_PROFILE_STOP(&pData->StatALIAS_input, b);
-        Log2(("NAT: LibAlias return %d\n", rc));
+        if (!(m->m_flags & M_SKIP_FIREWALL))
+        {
+            STAM_PROFILE_START(&pData->StatALIAS_input, b);
+            rc = LibAliasIn(select_alias(pData, m), mtod(m, char *), m_length(m, NULL));
+            STAM_PROFILE_STOP(&pData->StatALIAS_input, b);
+            Log2(("NAT: LibAlias return %d\n", rc));
+        }
+        else
+            m->m_flags &= ~M_SKIP_FIREWALL;
         if (m->m_len != RT_N2H_U16(ip->ip_len))
             m->m_len = RT_N2H_U16(ip->ip_len);

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

@@ -169 +169 @@
         ip->ip_sum = cksum(m, hlen);
 
-        {
+        if (!(m->m_flags & M_SKIP_FIREWALL)){
             struct m_tag *t;
             STAM_PROFILE_START(&pData->StatALIAS_output, b);
@@ -186 +186 @@
             STAM_PROFILE_STOP(&pData->StatALIAS_output, b);
         }
+        else
+            m->m_flags &= ~M_SKIP_FIREWALL;
 
         memcpy(eh->h_source, eth_dst, ETH_ALEN);
@@ -292 +294 @@
 
 send_or_free:
-        {
+        if (!(m->m_flags & M_SKIP_FIREWALL)){
             /* @todo: We can't alias all fragments because the way libalias processing
              * the fragments brake the sequence. libalias put alias_address to the source
@@ -316 +318 @@
             Log2(("NAT: LibAlias return %d\n", rcLa));
         }
+        else
+            m->m_flags &= ~M_SKIP_FIREWALL;
         for (m = m0; m; m = m0)
         {

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

@@ -404 +404 @@
         if ((so->so_faddr.s_addr & RT_H2N_U32(~pData->netmask)) == RT_H2N_U32(~pData->netmask))
         {
-            saddr.sin_addr.s_addr = addr->sin_addr.s_addr;
+            /**
+             * We haven't got real firewall but have got its submodule libalias.
+             */
+            m->m_flags |= M_SKIP_FIREWALL;
+            /**
+             * udp/137 port is used for NetBIOS lookup. for some reasons Windows guest rejects
+             * accept data from non-aliased server.
+             */
+            if (   (so->so_fport == so->so_lport)
+                && (so->so_fport == RT_H2N_U16(137)))
+                saddr.sin_addr.s_addr = alias_addr.s_addr;
+            else
+                saddr.sin_addr.s_addr = addr->sin_addr.s_addr;
             so->so_faddr.s_addr = addr->sin_addr.s_addr;
         }