--- previous/src/slirp/slirpdebug.c 2018/04/24 19:30:44 1.1 +++ previous/src/slirp/slirpdebug.c 2018/04/24 19:34:27 1.1.1.3 @@ -16,8 +16,6 @@ int dostats = 0; #endif int slirp_debug = 0; -extern char *strerror _P((int)); - /* Carry over one item from main.c so that the tty's restored. * Only done when the tty being used is /dev/tty --RedWolf */ extern struct termios slirp_tty_settings; @@ -47,14 +45,14 @@ debug_init(file, dbg) } } +#if 0 + /* * Dump a packet in the same format as tcpdump -x */ #ifdef DEBUG -void -dump_packet(dat, n) - void *dat; - int n; +static void +dump_packet(void *dat, int n) { u_char *pptr = (u_char *)dat; int j,k; @@ -71,7 +69,6 @@ dump_packet(dat, n) } #endif -#if 0 /* * Statistic routines * @@ -294,6 +291,7 @@ mbufstats() void sockstats() { + char addr[INET_ADDRSTRLEN]; char buff[256]; int n; struct socket *so; @@ -311,9 +309,11 @@ sockstats() buff[17] = 0; lprint("%s %3d %15s %5d ", buff, so->s, - inet_ntoa(so->so_laddr), ntohs(so->so_lport)); + inet_ntop(AF_INET, &so->so_laddr, addr, sizeof(addr)), + ntohs(so->so_lport)); lprint("%15s %5d %5d %5d\r\n", - inet_ntoa(so->so_faddr), ntohs(so->so_fport), + inet_ntop(AF_INET, &so->so_faddr, addr, sizeof(addr)), + ntohs(so->so_fport), so->so_rcv.sb_cc, so->so_snd.sb_cc); } @@ -325,9 +325,11 @@ sockstats() buff[17] = 0; lprint("%s %3d %15s %5d ", buff, so->s, - inet_ntoa(so->so_laddr), ntohs(so->so_lport)); + inet_ntop(AF_INET, &so->so_laddr, addr, sizeof(addr)), + ntohs(so->so_lport)); lprint("%15s %5d %5d %5d\r\n", - inet_ntoa(so->so_faddr), ntohs(so->so_fport), + inet_ntop(AF_INET, &so->so_faddr, addr, sizeof(addr)), + ntohs(so->so_fport), so->so_rcv.sb_cc, so->so_snd.sb_cc); } }