vhost build fix for i386

[qemu.git] / slirp / misc.c

diff --git a/slirp/misc.c b/slirp/misc.c
index cffb3a0dac9e707526c2a7a678cc80eadfd83c2e..6002550361d601eb521954c599a3953232a8e7cf 100644 (file)
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -14,8 +14,6 @@
 int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
 #endif
 
-u_int curtime, time_fasttimo, last_slowtimo;
-
 struct quehead {
        struct quehead *qh_link;
        struct quehead *qh_rlink;
@@ -121,6 +119,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
        char *bptr;
        const char *curarg;
        int c, i, ret;
+       pid_t pid;
 
        DEBUG_CALL("fork_exec");
        DEBUG_ARG("so = %lx", (long)so);
@@ -134,7 +133,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
                addr.sin_port = 0;
                addr.sin_addr.s_addr = INADDR_ANY;
 
-               if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0 ||
+               if ((s = qemu_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));
@@ -144,7 +143,8 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
                }
        }
 
-       switch(fork()) {
+       pid = fork();
+       switch(pid) {
         case -1:
                lprint("Error: fork failed: %s\n", strerror(errno));
                close(s);
@@ -153,11 +153,12 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
                return 0;
 
         case 0:
+                setsid();
+
                /* Set the DISPLAY */
                if (do_pty == 2) {
                        (void) close(master);
 #ifdef TIOCSCTTY /* XXXXX */
-                       (void) setsid();
                        ioctl(s, TIOCSCTTY, (char *)NULL);
 #endif
                } else {
@@ -167,7 +168,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
                         * Connect to the socket
                         * XXX If any of these fail, we're in trouble!
                         */
-                       s = socket(AF_INET, SOCK_STREAM, 0);
+                       s = qemu_socket(AF_INET, SOCK_STREAM, 0);
                        addr.sin_addr = loopback_addr;
                         do {
                             ret = connect(s, (struct sockaddr *)&addr, addrlen);
@@ -181,7 +182,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
                   close(s);
 
                i = 0;
-               bptr = strdup(ex); /* No need to free() this */
+               bptr = qemu_strdup(ex); /* No need to free() this */
                if (do_pty == 1) {
                        /* Setup "slirp.telnetd -x" */
                        argv[i++] = "slirp.telnetd";
@@ -202,18 +203,13 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
                execvp(argv[0], (char **)argv);
 
                /* Ooops, failed, let's tell the user why */
-                 {
-                         char buff[256];
-
-                         snprintf(buff, sizeof(buff),
-                                   "Error: execvp of %s failed: %s\n",
-                                   argv[0], strerror(errno));
-                         write(2, buff, strlen(buff)+1);
-                 }
+        fprintf(stderr, "Error: execvp of %s failed: %s\n",
+                argv[0], strerror(errno));
                close(0); close(1); close(2); /* XXX */
                exit(1);
 
         default:
+               qemu_add_child_watch(pid);
                if (do_pty == 2) {
                        close(s);
                        so->s = master;
@@ -268,52 +264,10 @@ void lprint(const char *format, ...)
     va_list args;
 
     va_start(args, format);
-    monitor_vprintf(cur_mon, format, args);
+    monitor_vprintf(default_mon, format, args);
     va_end(args);
 }
 
-#ifdef BAD_SPRINTF
-
-#undef vsprintf
-#undef sprintf
-
-/*
- * Some BSD-derived systems have a sprintf which returns char *
- */
-
-int
-vsprintf_len(string, format, args)
-       char *string;
-       const char *format;
-       va_list args;
-{
-       vsprintf(string, format, args);
-       return strlen(string);
-}
-
-int
-#ifdef __STDC__
-sprintf_len(char *string, const char *format, ...)
-#else
-sprintf_len(va_alist) va_dcl
-#endif
-{
-       va_list args;
-#ifdef __STDC__
-       va_start(args, format);
-#else
-       char *string;
-       char *format;
-       va_start(args);
-       string = va_arg(args, char *);
-       format = va_arg(args, char *);
-#endif
-       vsprintf(string, format, args);
-       return strlen(string);
-}
-
-#endif
-
 void
 u_sleep(int usec)
 {
@@ -372,7 +326,7 @@ fd_block(int fd)
 #endif
 }
 
-void slirp_connection_info(Monitor *mon)
+void slirp_connection_info(Slirp *slirp, Monitor *mon)
 {
     const char * const tcpstates[] = {
         [TCPS_CLOSED]       = "CLOSED",
@@ -399,7 +353,7 @@ void slirp_connection_info(Monitor *mon)
     monitor_printf(mon, "  Protocol[State]    FD  Source Address  Port   "
                         "Dest. Address  Port RecvQ SendQ\n");
 
-    for (so = tcb.so_next; so != &tcb; so = so->so_next) {
+    for (so = slirp->tcb.so_next; so != &slirp->tcb; so = so->so_next) {
         if (so->so_state & SS_HOSTFWD) {
             state = "HOST_FORWARD";
         } else if (so->so_tcpcb) {
@@ -429,7 +383,7 @@ void slirp_connection_info(Monitor *mon)
                        so->so_rcv.sb_cc, so->so_snd.sb_cc);
     }
 
-    for (so = udb.so_next; so != &udb; so = so->so_next) {
+    for (so = slirp->udb.so_next; so != &slirp->udb; so = so->so_next) {
         if (so->so_state & SS_HOSTFWD) {
             n = snprintf(buf, sizeof(buf), "  UDP[HOST_FORWARD]");
             src_len = sizeof(src);
@@ -453,4 +407,17 @@ void slirp_connection_info(Monitor *mon)
                        inet_ntoa(dst_addr), ntohs(dst_port),
                        so->so_rcv.sb_cc, so->so_snd.sb_cc);
     }
+
+    for (so = slirp->icmp.so_next; so != &slirp->icmp; so = so->so_next) {
+        n = snprintf(buf, sizeof(buf), "  ICMP[%d sec]",
+                     (so->so_expire - curtime) / 1000);
+        src.sin_addr = so->so_laddr;
+        dst_addr = so->so_faddr;
+        memset(&buf[n], ' ', 19 - n);
+        buf[19] = 0;
+        monitor_printf(mon, "%s %3d %15s  -    ", buf, so->s,
+                       src.sin_addr.s_addr ? inet_ntoa(src.sin_addr) : "*");
+        monitor_printf(mon, "%15s  -    %5d %5d\n", inet_ntoa(dst_addr),
+                       so->so_rcv.sb_cc, so->so_snd.sb_cc);
+    }
 }