Changeset 28480 in vbox for trunk/src/VBox/Devices/Network/slirp

Timestamp:

Apr 19, 2010 4:25:07 PM (15 years ago)

Author:

vboxsync

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

60275

Message:

NAT: nuke dead code.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• . (modified) (1 prop)
• libalias (modified) (1 prop)
• slirp.h (modified) (1 diff)
• tcp_input.c (modified) (3 diffs)
• tcp_subr.c (modified) (1 diff)

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

@@ -337 +337 @@
 int tcp_attach (PNATState, struct socket *);
 u_int8_t tcp_tos (struct socket *);
-int tcp_emu (PNATState, struct socket *, struct mbuf *);
 int tcp_ctl (PNATState, struct socket *);
 struct tcpcb *tcp_drop(PNATState, struct tcpcb *tp, int err);

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

@@ -266 +266 @@
             m_freem(pData, q->tqe_m);
         else
-        {
-            if (so->so_emu)
-            {
-                if (tcp_emu(pData, so, q->tqe_m))
-                    sbappend(pData, so, q->tqe_m);
-            }
-            else
-                sbappend(pData, so, q->tqe_m);
-        }
+            sbappend(pData, so, q->tqe_m);
         RTMemFree(q);
         tp->t_segqlen--;
@@ -705 +697 @@
              * Add data to socket buffer.
              */
-            if (so->so_emu)
-            {
-                if (tcp_emu(pData, so, m))
-                    sbappend(pData, so, m);
-            }
-            else
-                sbappend(pData, so, m);
+            sbappend(pData, so, m);
 
             /*
@@ -1557 +1543 @@
                 m_freem(pData, m);
             else
-            {
-                if (so->so_emu)
-                {
-                    if (tcp_emu(pData, so, m))
-                        sbappend(pData, so, m);
-                }
-                else
-                    sbappend(pData, so, m);
-            }
+                sbappend(pData, so, m);
         }
         else

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

@@ -654 +654 @@
     return 0;
 }
-
-/*
- * Emulate programs that try and connect to us. This includes ftp (the data
- * connection is initiated by the server) and IRC (DCC CHAT and DCC SEND)
- * for now
- *
- * NOTE: It's possible to crash SLiRP by sending it unstandard strings to
- * emulate... if this is a problem, more checks are needed here.
- *
- * XXX Assumes the whole command cames in one packet
- *
- * XXX Some ftp clients will have their TOS set to LOWDELAY and so Nagel will
- * kick in.  Because of this, we'll get the first letter, followed by the
- * rest, so we simply scan for ORT instead of PORT... DCC doesn't have this
- * problem because there's other stuff in the packet before the DCC command.
- *
- * Return 1 if the mbuf m is still valid and should be sbappend()ed
- *
- * NOTE: if you return 0 you MUST m_free() the mbuf!
- */
-int
-tcp_emu(PNATState pData, struct socket *so, struct mbuf *m)
-{
-    /*XXX: libalias should care about it */
-    so->so_emu = 0;
-    return 1;
-}