Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging

[qemu.git] / slirp / misc.c

diff --git a/slirp/misc.c b/slirp/misc.c
index 08eba6adc0d8ae29e36d115ddb2568186445db8a..6c80e69685c2d4525ca5519ab9c5b1c2e0c8a161 100644 (file)
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -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 {
@@ -181,7 +182,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
                   close(s);
 
                i = 0;
-               bptr = qemu_strdup(ex); /* No need to free() this */
+               bptr = g_strdup(ex); /* No need to free() this */
                if (do_pty == 1) {
                        /* Setup "slirp.telnetd -x" */
                        argv[i++] = "slirp.telnetd";
@@ -406,4 +407,17 @@ void slirp_connection_info(Slirp *slirp, 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);
+    }
 }