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

Timestamp:

Apr 19, 2010 4:44:22 PM (15 years ago)

Author:

vboxsync

Message:

NAT: nuke dead code.

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• misc.h (modified) (1 diff)
• socket.h (modified) (1 diff)
• tcp_input.c (modified) (3 diffs)
• tcp_subr.c (modified) (2 diffs)
• udp.c (modified) (3 diffs)

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

@@ -32 +32 @@
 #define _MISC_H_
 
-#define EMU_NONE      0x0
-
-/* TCP emulations */
-#define EMU_CTL       0x1
-#define EMU_FTP       0x2
-#define EMU_KSH       0x3
-#define EMU_IRC       0x4
-#define EMU_REALAUDIO 0x5
-#define EMU_RLOGIN    0x6
-#define EMU_IDENT     0x7
-#define EMU_RSH       0x8
-
-#define EMU_NOCONNECT 0x10      /* Don't connect */
-
-/* UDP emulations */
-#define EMU_TALK      0x1
-#define EMU_NTALK     0x2
-#define EMU_CUSEEME   0x3
-
-struct tos_t
-{
-    u_int16_t lport;
-    u_int16_t fport;
-    u_int8_t tos;
-    u_int8_t emu;
-};
-
-struct emu_t
-{
-    u_int16_t lport;
-    u_int16_t fport;
-    u_int8_t tos;
-    u_int8_t emu;
-    struct emu_t *next;
-};
-
-extern struct emu_t *tcpemu;
 
 extern int x_port, x_server, x_display;

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

@@ -75 +75 @@
 
     u_int8_t        so_iptos;    /* Type of service */
-    u_int8_t        so_emu;      /* Is the socket emulated? */
 
     u_char          so_type;     /* Type of socket, UDP or TCP */

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

@@ -530 +530 @@
         so->so_fport = ti->ti_dport;
 
-        if ((so->so_iptos = tcp_tos(so)) == 0)
-            so->so_iptos = ((struct ip *)ti)->ip_tos;
+        so->so_iptos = ((struct ip *)ti)->ip_tos;
 
         tp = sototcpcb(so);
@@ -766 +765 @@
              * But a bit of spaghetti code never hurt anybody :)
              */
-
-            if (so->so_emu & EMU_NOCONNECT)
-            {
-                so->so_emu &= ~EMU_NOCONNECT;
-                goto cont_input;
-            }
-
             if (   (tcp_fconnect(pData, so) == -1)
                 && errno != EINPROGRESS
@@ -1594 +1586 @@
             case TCPS_SYN_RECEIVED:
             case TCPS_ESTABLISHED:
-                if(so->so_emu == EMU_CTL)        /* no shutdown on socket */
-                    tp->t_state = TCPS_LAST_ACK;
-                else
-                    tp->t_state = TCPS_CLOSE_WAIT;
+                tp->t_state = TCPS_CLOSE_WAIT;
                 break;
 

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

@@ -587 +587 @@
     so->s = s;
 
-    so->so_iptos = tcp_tos(so);
     tp = sototcpcb(so);
 
@@ -625 +624 @@
     return 0;
 }
-
-/*
- * Set the socket's type of service field
- */
-static const struct tos_t tcptos[] =
-{
-    {0, 20, IPTOS_THROUGHPUT, 0},                       /* ftp data */
-    {21, 21, IPTOS_LOWDELAY,  EMU_FTP},                 /* ftp control */
-    {0, 23, IPTOS_LOWDELAY, 0},                         /* telnet */
-    {0, 80, IPTOS_THROUGHPUT, 0},                       /* WWW */
-    {0, 513, IPTOS_LOWDELAY, EMU_RLOGIN|EMU_NOCONNECT}, /* rlogin */
-    {0, 514, IPTOS_LOWDELAY, EMU_RSH|EMU_NOCONNECT},    /* shell */
-    {0, 544, IPTOS_LOWDELAY, EMU_KSH},                  /* kshell */
-    {0, 543, IPTOS_LOWDELAY, 0},                        /* klogin */
-    {0, 6667, IPTOS_THROUGHPUT, EMU_IRC},               /* IRC */
-    {0, 6668, IPTOS_THROUGHPUT, EMU_IRC},               /* IRC undernet */
-    {0, 7070, IPTOS_LOWDELAY, EMU_REALAUDIO },          /* RealAudio control */
-    {0, 113, IPTOS_LOWDELAY, EMU_IDENT },               /* identd protocol */
-    {0, 0, 0, 0}
-};
-
-/*
- * Return TOS according to the above table
- */
-u_int8_t
-tcp_tos(struct socket *so)
-{
-    return 0;
-}

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

@@ -268 +268 @@
         so->so_lport = uh->uh_sport;
 
-        if ((so->so_iptos = udp_tos(so)) == 0)
-            so->so_iptos = ip->ip_tos;
+        so->so_iptos = ip->ip_tos;
 
         /*
@@ -294 +293 @@
     m->m_len -= iphlen;
     m->m_data += iphlen;
-
-    /*
-     * Now we sendto() the packet.
-     */
-    if (so->so_emu)
-        udp_emu(pData, so, m);
 
     ttl = ip->ip_ttl = save_ip.ip_ttl;
@@ -491 +484 @@
 }
 
-static const struct tos_t udptos[] =
-{
-    {   0,    53, IPTOS_LOWDELAY, 0           }, /* DNS */
-    { 517,   517, IPTOS_LOWDELAY, EMU_TALK    }, /* talk */
-    { 518,   518, IPTOS_LOWDELAY, EMU_NTALK   }, /* ntalk */
-    {   0,  7648, IPTOS_LOWDELAY, EMU_CUSEEME }, /* Cu-Seeme */
-    {   0,     0, 0,              0           }
-};
-
-u_int8_t
-udp_tos(struct socket *so)
-{
-    int i = 0;
-
-    while(udptos[i].tos)
-    {
-        if (   (udptos[i].fport && RT_N2H_U16(so->so_fport) == udptos[i].fport)
-            || (udptos[i].lport && RT_N2H_U16(so->so_lport) == udptos[i].lport))
-        {
-            so->so_emu = udptos[i].emu;
-            return udptos[i].tos;
-        }
-        i++;
-    }
-
-    return 0;
-}
-
-#ifdef EMULATE_TALK
-#include "talkd.h"
-#endif
-
-/*
- * Here, talk/ytalk/ntalk requests must be emulated
- */
-void
-udp_emu(PNATState pData, struct socket *so, struct mbuf *m)
-{
-    so->so_emu = 0;
-}
-
 struct socket *
 udp_listen(PNATState pData, u_int32_t bind_addr, u_int port, u_int32_t laddr, u_int lport, int flags)