Changeset 14329 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 18, 2008 9:59:24 PM (16 years ago)

Author:

vboxsync

Message:

slirp: removed unused control interface; added slirp_get_timeout_ms()

Location:

trunk/src/VBox/Devices/Network/slirp

Files:

• libslirp.h (modified) (1 diff)
• misc.c (modified) (1 diff)
• slirp.c (modified) (1 diff)
• socket.h (modified) (1 diff)
• tcp_input.c (modified) (2 diffs)
• tcp_subr.c (modified) (1 diff)

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

@@ -78 +78 @@
 #endif
 
+/*
+ * Return the timeout.
+ */
+unsigned int slirp_get_timeout_ms(PNATState pData);
+
 #ifdef __cplusplus
 }

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

@@ -223 +223 @@
 
 
-#ifdef _WIN32
-
-int
-fork_exec(PNATState pData, struct socket *so, char *ex, int do_pty)
-{
-    /* not implemented */
-    return 0;
-}
-
-#else
-
-/*
- * XXX This is ugly
- * We create and bind a socket, then fork off to another
- * process, which connects to this socket, after which we
- * exec the wanted program.  If something (strange) happens,
- * the accept() call could block us forever.
- *
- * do_pty = 0   Fork/exec inetd style
- * do_pty = 1   Fork/exec using slirp.telnetd
- * do_ptr = 2   Fork/exec using pty
- */
-int
-fork_exec(PNATState pData, struct socket *so, char *ex, int do_pty)
-{
-        int s;
-        struct sockaddr_in addr;
-        socklen_t addrlen = sizeof(addr);
-        int opt;
-        int master;
-        char *argv[256];
-#if 0
-        char buff[256];
-#endif
-        /* don't want to clobber the original */
-        char *bptr;
-        char *curarg;
-        int c, i, ret;
-
-        DEBUG_CALL("fork_exec");
-        DEBUG_ARG("so = %lx", (long)so);
-        DEBUG_ARG("ex = %lx", (long)ex);
-        DEBUG_ARG("do_pty = %lx", (long)do_pty);
-
-        if (do_pty == 2) {
-                AssertRelease(do_pty != 2);
-                /* shut up gcc */
-                s = 0;
-                master = 0;
-        } else {
-                addr.sin_family = AF_INET;
-                addr.sin_port = 0;
-                addr.sin_addr.s_addr = INADDR_ANY;
-
-                if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0 ||
-                    bind(s, (struct sockaddr *)&addr, addrlen) < 0 ||
-                    listen(s, 1) < 0) {
-                        lprint("Error: inet socket: %s\n", strerror(errno));
-                        closesocket(s);
-
-                        return 0;
-                }
-        }
-
-        switch(fork()) {
-         case -1:
-                lprint("Error: fork failed: %s\n", strerror(errno));
-                close(s);
-                if (do_pty == 2)
-                   close(master);
-                return 0;
-
-         case 0:
-                /* Set the DISPLAY */
-                if (do_pty == 2) {
-                        (void) close(master);
-#ifdef TIOCSCTTY /* XXXXX */
-                        (void) setsid();
-                        ioctl(s, TIOCSCTTY, (char *)NULL);
-#endif
-                } else {
-                        getsockname(s, (struct sockaddr *)&addr, &addrlen);
-                        close(s);
-                        /*
-                         * Connect to the socket
-                         * XXX If any of these fail, we're in trouble!
-                         */
-                        s = socket(AF_INET, SOCK_STREAM, 0);
-                        addr.sin_addr = loopback_addr;
-                        do {
-                            ret = connect(s, (struct sockaddr *)&addr, addrlen);
-                        } while (ret < 0 && errno == EINTR);
-                }
-
-#if 0
-                if (x_port >= 0) {
-#ifdef HAVE_SETENV
-                        sprintf(buff, "%s:%d.%d", inet_ntoa(our_addr), x_port, x_screen);
-                        setenv("DISPLAY", buff, 1);
-#else
-                        sprintf(buff, "DISPLAY=%s:%d.%d", inet_ntoa(our_addr), x_port, x_screen);
-                        putenv(buff);
-#endif
-                }
-#endif
-                dup2(s, 0);
-                dup2(s, 1);
-                dup2(s, 2);
-                for (s = 3; s <= 255; s++)
-                   close(s);
-
-                i = 0;
-                bptr = strdup(ex); /* No need to free() this */
-                if (do_pty == 1) {
-                        /* Setup "slirp.telnetd -x" */
-                        argv[i++] = "slirp.telnetd";
-                        argv[i++] = "-x";
-                        argv[i++] = bptr;
-                } else
-                   do {
-                        /* Change the string into argv[] */
-                        curarg = bptr;
-                        while (*bptr != ' ' && *bptr != (char)0)
-                           bptr++;
-                        c = *bptr;
-                        *bptr++ = (char)0;
-                        argv[i++] = strdup(curarg);
-                   } while (c);
-
-                argv[i] = 0;
-                execvp(argv[0], argv);
-
-                /* Ooops, failed, let's tell the user why */
-                  {
-                          char buff[256];
-
-                          sprintf(buff, "Error: execvp of %s failed: %s\n",
-                                  argv[0], strerror(errno));
-                          write(2, buff, strlen(buff)+1);
-                  }
-                close(0); close(1); close(2); /* XXX */
-                exit(1);
-
-         default:
-                if (do_pty == 2) {
-                        close(s);
-                        so->s = master;
-                } else {
-                        /*
-                         * XXX this could block us...
-                         * XXX Should set a timer here, and if accept() doesn't
-                         * return after X seconds, declare it a failure
-                         * The only reason this will block forever is if socket()
-                         * of connect() fail in the child process
-                         */
-                        do {
-                            so->s = accept(s, (struct sockaddr *)&addr, &addrlen);
-                        } while (so->s < 0 && errno == EINTR);
-                        closesocket(s);
-                        opt = 1;
-                        setsockopt(so->s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int));
-                        opt = 1;
-                        setsockopt(so->s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int));
-                }
-                fd_nonblock(so->s);
-
-                /* Append the telnet options now */
-                if (so->so_m != 0 && do_pty == 1)  {
-                        sbappend(pData, so, so->so_m);
-                        so->so_m = 0;
-                }
-
-                return 1;
-        }
-}
-#endif
-
 #ifndef HAVE_STRDUP
 char *

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

@@ -1012 +1012 @@
 }
 #endif
+
+unsigned int slirp_get_timeout_ms(PNATState pData)
+{
+    if (link_up)
+    {
+        if (time_fasttimo)
+            return 2;
+        if (do_slowtimo)
+            return 500;
+    }
+    return 0;
+}

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

@@ -68 +68 @@
 #define SS_FWDRAIN              0x040   /* We received a FIN, drain data and set SS_FCANTSENDMORE */
 
-#define SS_CTL                  0x080
+/* #define SS_CTL               0x080 */
 #define SS_FACCEPTCONN          0x100   /* Socket is accepting connections from a host on the internet */
 #define SS_FACCEPTONCE          0x200   /* If set, the SS_FACCEPTCONN socket will die after one accept */

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

@@ -812 +812 @@
            */
 
-          /*
-           * If this is destined for the control address, then flag to
-           * tcp_ctl once connected, otherwise connect
-           */
-          if ((so->so_faddr.s_addr&htonl(pData->netmask)) == special_addr.s_addr) {
-            int lastbyte=ntohl(so->so_faddr.s_addr) & ~pData->netmask;
-            if (lastbyte!=CTL_ALIAS && lastbyte!=CTL_DNS) {
-#if 0
-              if(lastbyte==CTL_CMD || lastbyte==CTL_EXEC) {
-                /* Command or exec adress */
-                so->so_state |= SS_CTL;
-              } else
-#endif
-              {
-                /* May be an add exec */
-                struct ex_list *ex_ptr;
-                for(ex_ptr = exec_list; ex_ptr; ex_ptr = ex_ptr->ex_next) {
-                  if(ex_ptr->ex_fport == so->so_fport &&
-                     lastbyte == ex_ptr->ex_addr) {
-                    so->so_state |= SS_CTL;
-                    break;
-                  }
-                }
-              }
-              if(so->so_state & SS_CTL) goto cont_input;
-            }
-            /* CTL_ALIAS: Do nothing, tcp_fconnect will be called on it */
-          }
-
           if (so->so_emu & EMU_NOCONNECT) {
             so->so_emu &= ~EMU_NOCONNECT;
@@ -1211 +1182 @@
                  */
                 tp->snd_una=ti->ti_ack;
-                if (so->so_state & SS_CTL) {
-                  /* So tcp_ctl reports the right state */
-                  ret = tcp_ctl(pData, so);
-                  if (ret == 1) {
-                    soisfconnected(so);
-                    so->so_state &= ~SS_CTL;   /* success XXX */
-                  } else if (ret == 2) {
-                    so->so_state = SS_NOFDREF; /* CTL_CMD */
-                  } else {
-                    needoutput = 1;
-                    tp->t_state = TCPS_FIN_WAIT_1;
-                  }
-                } else {
-                  soisfconnected(so);
-                }
+                soisfconnected(so);
 
                 /* Do window scaling? */

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

@@ -1233 +1233 @@
 }
 
-/*
- * Do misc. config of SLiRP while its running.
- * Return 0 if this connections is to be closed, 1 otherwise,
- * return 2 if this is a command-line connection
- */
-int
-tcp_ctl(PNATState pData, struct socket *so)
-{
-        struct sbuf *sb = &so->so_snd;
-        int command;
-        struct ex_list *ex_ptr;
-        int do_pty;
-        /*      struct socket *tmpso; */
-
-        DEBUG_CALL("tcp_ctl");
-        DEBUG_ARG("so = %lx", (long )so);
-
-#if 0
-        /*
-         * Check if they're authorised
-         */
-        if (ctl_addr.s_addr && (ctl_addr.s_addr == -1 || (so->so_laddr.s_addr != ctl_addr.s_addr))) {
-                sb->sb_cc = sprintf(sb->sb_wptr,"Error: Permission denied.\r\n");
-                sb->sb_wptr += sb->sb_cc;
-                return 0;
-        }
-#endif
-        command = (ntohl(so->so_faddr.s_addr) & 0xff);
-
-        switch(command) {
-        default: /* Check for exec's */
-
-                /*
-                 * Check if it's pty_exec
-                 */
-                for (ex_ptr = exec_list; ex_ptr; ex_ptr = ex_ptr->ex_next) {
-                        if (ex_ptr->ex_fport == so->so_fport &&
-                            command == ex_ptr->ex_addr) {
-                                do_pty = ex_ptr->ex_pty;
-                                goto do_exec;
-                        }
-                }
-
-                /*
-                 * Nothing bound..
-                 */
-                /* tcp_fconnect(so); */
-
-                /* FALLTHROUGH */
-        case CTL_ALIAS:
-          sb->sb_cc = sprintf(sb->sb_wptr,
-                              "Error: No application configured.\r\n");
-          sb->sb_wptr += sb->sb_cc;
-          return(0);
-
-        do_exec:
-                DEBUG_MISC((dfd, " executing %s \n",ex_ptr->ex_exec));
-                return(fork_exec(pData, so, ex_ptr->ex_exec, do_pty));
-
-#if 0
-        case CTL_CMD:
-           for (tmpso = tcb.so_next; tmpso != &tcb; tmpso = tmpso->so_next) {
-             if (tmpso->so_emu == EMU_CTL &&
-                 !(tmpso->so_tcpcb?
-                   (tmpso->so_tcpcb->t_state & (TCPS_TIME_WAIT|TCPS_LAST_ACK))
-                   :0)) {
-               /* Ooops, control connection already active */
-               sb->sb_cc = sprintf(sb->sb_wptr,"Sorry, already connected.\r\n");
-               sb->sb_wptr += sb->sb_cc;
-               return 0;
-             }
-           }
-           so->so_emu = EMU_CTL;
-           ctl_password_ok = 0;
-           sb->sb_cc = sprintf(sb->sb_wptr, "Slirp command-line ready (type \"help\" for help).\r\nSlirp> ");
-           sb->sb_wptr += sb->sb_cc;
-           do_echo=-1;
-           return(2);
-#endif
-        }
-}
-
 #if SIZEOF_CHAR_P != 4
 /**