diff options
| author | malc | 2011-08-05 08:07:10 +0200 |
|---|---|---|
| committer | malc | 2011-08-05 08:07:10 +0200 |
| commit | a67a47d2b559a7733c3f89aeb2d81b19d2c027e4 (patch) | |
| tree | 146a7b6eebbee1367453fde501d4462ac6d9f8b4 /slirp/misc.c | |
| parent | Merge branch 'master' of git://git.qemu.org/qemu (diff) | |
| parent | Merge remote-tracking branch 'mst/for_anthony' into staging (diff) | |
| download | qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.gz qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.tar.xz qemu-a67a47d2b559a7733c3f89aeb2d81b19d2c027e4.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'slirp/misc.c')
| -rw-r--r-- | slirp/misc.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/slirp/misc.c b/slirp/misc.c index 08eba6adc0..6002550361 100644 --- 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 { @@ -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); + } } |