Changeset 52755 in vbox for trunk

Timestamp:

Sep 15, 2014 9:31:50 PM (11 years ago)

Author:

vboxsync

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

96113

Message:

NAT: G/c socket:so_la - per-socket libalias instance used for
port-forwarding - and concomitant code. It is never actually used as
PACKET_TAG_ALIAS that is supposed to select it is never set. Its
LibAliasRedirectPort() arguments were wrong too.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• ip_input.c (modified) (2 diffs)
• ip_output.c (modified) (2 diffs)
• slirp.c (modified) (3 diffs)
• socket.h (modified) (1 diff)
• tcp_subr.c (modified) (1 diff)

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

@@ -85 +85 @@
 }
 
-static struct libalias *select_alias(PNATState pData, struct mbuf* m)
-{
-    struct libalias *la = pData->proxy_alias;
-
-    struct m_tag *t;
-    if ((t = m_tag_find(m, PACKET_TAG_ALIAS, NULL)) != 0)
-        return (struct libalias *)&t[1];
-
-    return la;
-}
-
 /*
  * Ip input routine.  Checksum and byte swap header.  If fragmented
@@ -119 +108 @@
         {
             STAM_PROFILE_START(&pData->StatALIAS_input, b);
-            rc = LibAliasIn(select_alias(pData, m), mtod(m, char *), m_length(m, NULL));
+            rc = LibAliasIn(pData->proxy_alias, mtod(m, char *), m_length(m, NULL));
             STAM_PROFILE_STOP(&pData->StatALIAS_input, b);
             Log2(("NAT: LibAlias return %d\n", rc));

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

@@ -176 +176 @@
             struct m_tag *t;
             STAM_PROFILE_START(&pData->StatALIAS_output, b);
-            if ((t = m_tag_find(m, PACKET_TAG_ALIAS, NULL)) != 0)
-                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));
-
+            rc = LibAliasOut(pData->proxy_alias, mtod(m, char *), m_length(m, NULL));
             if (rc == PKT_ALIAS_IGNORED)
             {
@@ -310 +304 @@
             struct m_tag *t;
             int rcLa;
-            if ((t = m_tag_find(m, PACKET_TAG_ALIAS, NULL)) != 0)
-                rcLa = LibAliasOut((struct libalias *)&t[1], mtod(m, char *), m->m_len);
-            else
-                rcLa = LibAliasOut(pData->proxy_alias, mtod(m, char *), m->m_len);
-
+
+            rcLa = LibAliasOut(pData->proxy_alias, mtod(m, char *), m->m_len);
             if (rcLa == PKT_ALIAS_IGNORED)
             {

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

@@ -1528 +1528 @@
     {
         struct socket *so;
-        struct alias_link *alias_link;
-        struct libalias *lib;
-        int flags;
         struct sockaddr sa;
         struct sockaddr_in *psin;
         socklen_t socketlen;
-        struct in_addr alias;
         int rc;
         uint32_t guest_addr; /* need to understand if we already give address to guest */
@@ -1589 +1585 @@
             goto remove_port_forwarding;
 
-        psin = (struct sockaddr_in *)&sa;
-
-        lib = LibAliasInit(pData, NULL);
-        flags = LibAliasSetMode(lib, 0, 0);
-        flags |= pData->i32AliasMode;
-        flags |= PKT_ALIAS_REVERSE; /* set reverse  */
-        flags = LibAliasSetMode(lib, flags, ~0);
-
-        alias.s_addr = RT_H2N_U32(RT_N2H_U32(guest_addr) | CTL_ALIAS);
-        alias_link = LibAliasRedirectPort(lib, psin->sin_addr, RT_H2N_U16(rule->host_port),
-                                          alias, RT_H2N_U16(rule->guest_port),
-                                          pData->special_addr,  -1, /* not very clear for now */
-                                          rule->proto);
-        if (!alias_link)
-            goto remove_port_forwarding;
-
-        so->so_la = lib;
         rule->activated = 1;
         rule->so = so;
@@ -1688 +1667 @@
                     guest_addr.s_addr, rule->guest_port));
 
-            LibAliasUninit(rule->so->so_la);
             if (is_udp)
                 udp_detach(pData, rule->so);

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

@@ -101 +101 @@
     unsigned char so_ethaddr[6];
 #endif
-    /* required for port-forwarding */
-    struct libalias *so_la;
 
 #ifdef VBOX_WITH_NAT_UDP_SOCKET_CLONE

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

@@ -506 +506 @@
         so->so_laddr = inso->so_laddr;
         so->so_lport = inso->so_lport;
-        so->so_la = inso->so_la;
     }