From owner-p4-projects@FreeBSD.ORG Wed Jun 10 15:06:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C73B106567F; Wed, 10 Jun 2009 15:06:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EB5E61065672 for ; Wed, 10 Jun 2009 15:06:12 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D972F8FC12 for ; Wed, 10 Jun 2009 15:06:12 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5AF6Cul085824 for ; Wed, 10 Jun 2009 15:06:12 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5AF6Cnu085822 for perforce@freebsd.org; Wed, 10 Jun 2009 15:06:12 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 10 Jun 2009 15:06:12 GMT Message-Id: <200906101506.n5AF6Cnu085822@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 164003 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Jun 2009 15:06:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=164003 Change 164003 by pgj@petymeg-current on 2009/06/10 15:05:55 Remove hacks for tcpcb, add a previously missed code snippet Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#17 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#15 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#12 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#14 edit .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#9 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#17 (text+ko) ==== @@ -434,8 +434,6 @@ stp->st_reflink = (u_long)0; stp->st_flags = SOCKTYPE_TCP; /* XXX: Remove this. */ - if (tp != NULL) - stp->XXX_tcpcb = *tp; stp->XXX_inpcb = *inp; stp->XXX_xsocket = *so; /* XXX: address is missing. */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#15 (text+ko) ==== @@ -84,7 +84,6 @@ const char *netstat_st_get_address(const struct socket_type *stp); const char *netstat_st_get_tcpstate(const struct socket_type *stp); /* XXX: Remove this hacks. */ -struct tcpcb XXX_netstat_st_get_tcpcb(const struct socket_type *stp); struct inpcb XXX_netstat_st_get_inpcb(const struct socket_type *stp); struct xsocket XXX_netstat_st_get_xsocket(const struct socket_type *stp); __END_DECLS ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#12 (text+ko) ==== @@ -64,7 +64,6 @@ char st_tcpstate[16]; /* XXX: Removables. */ - struct tcpcb XXX_tcpcb; struct inpcb XXX_inpcb; struct xsocket XXX_xsocket; ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#14 (text+ko) ==== @@ -403,12 +403,6 @@ } /* XXX: Remove this hacks. */ -struct tcpcb -XXX_netstat_st_get_tcpcb(const struct socket_type *stp) -{ - return (stp->XXX_tcpcb); -} - struct inpcb XXX_netstat_st_get_inpcb(const struct socket_type *stp) { ==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#9 (text+ko) ==== @@ -613,18 +613,11 @@ { static int first = 1; char buf1[15]; - struct tcpcb tp; struct inpcb inp; struct xsocket so; - int istcp; - istcp = 0; inp = XXX_netstat_st_get_inpcb(stp); so = XXX_netstat_st_get_xsocket(stp); - if (netstat_st_get_protocol(stp) == IPPROTO_TCP) { - tp = XXX_netstat_st_get_tcpcb(stp); - istcp = 1; - } if (first) { if (!Lflag) { printf("Active Internet connections"); @@ -709,6 +702,17 @@ netstat_st_get_name(stp), 0); } /* else nothing printed now */ #endif /* INET6 */ + } else { + if (inp.inp_vflag & INP_IPV4) { + inetprint(&inp.inp_laddr, (int)inp.inp_lport, + netstat_st_get_name(stp), 0); + if (!Lflag) + inetprint(&inp.inp_faddr, + (int)inp.inp_fport, + netstat_st_get_name(stp), + inp.inp_lport != inp.inp_fport); + } +#ifdef INET6 else if (inp.inp_vflag & INP_IPV6) { inet6print(&inp.in6p_laddr, (int)inp.inp_lport, netstat_st_get_name(stp), 0); @@ -718,6 +722,7 @@ netstat_st_get_name(stp), inp.inp_lport != inp.inp_fport); } /* else nothing printed now */ +#endif /* INET6 */ } if (xflag) { if (Lflag) @@ -734,7 +739,7 @@ netstat_st_get_rcv_mbmax(stp), netstat_st_get_snd_mbmax(stp)); } - if (istcp && !Lflag) { + if (!Lflag) { printf("%s", netstat_st_get_tcpstate(stp)); } putchar('\n');