From owner-p4-projects@FreeBSD.ORG Wed Jun 10 15:28:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDCE41065672; Wed, 10 Jun 2009 15:28:38 +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 AC053106564A for ; Wed, 10 Jun 2009 15:28:38 +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 7FDC88FC16 for ; Wed, 10 Jun 2009 15:28:38 +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 n5AFScIF087551 for ; Wed, 10 Jun 2009 15:28:38 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5AFScdQ087549 for perforce@freebsd.org; Wed, 10 Jun 2009 15:28:38 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 10 Jun 2009 15:28:38 GMT Message-Id: <200906101528.n5AFScdQ087549@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 164009 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:28:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=164009 Change 164009 by pgj@petymeg-current on 2009/06/10 15:28:25 Remove need for xsocket Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#18 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#16 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#13 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#15 edit .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#10 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#18 (text+ko) ==== @@ -435,7 +435,6 @@ stp->st_flags = SOCKTYPE_TCP; /* XXX: Remove this. */ stp->XXX_inpcb = *inp; - stp->XXX_xsocket = *so; /* XXX: address is missing. */ stp->st_address[0] = '\0'; if (tp->t_state < 0 || tp->t_state >= TCP_NSTATES) ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#16 (text+ko) ==== @@ -85,7 +85,6 @@ const char *netstat_st_get_tcpstate(const struct socket_type *stp); /* XXX: Remove this hacks. */ 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 #endif /* !_NETSTAT_H_ */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#13 (text+ko) ==== @@ -65,7 +65,6 @@ /* XXX: Removables. */ struct inpcb XXX_inpcb; - struct xsocket XXX_xsocket; /* list of types */ LIST_ENTRY(socket_type) st_list; ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#15 (text+ko) ==== @@ -408,9 +408,3 @@ { return (stp->XXX_inpcb); } - -struct xsocket -XXX_netstat_st_get_xsocket(const struct socket_type *stp) -{ - return (stp->XXX_xsocket); -} ==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/inet.c#10 (text+ko) ==== @@ -614,10 +614,8 @@ static int first = 1; char buf1[15]; struct inpcb inp; - struct xsocket so; inp = XXX_netstat_st_get_inpcb(stp); - so = XXX_netstat_st_get_xsocket(stp); if (first) { if (!Lflag) { printf("Active Internet connections"); @@ -651,7 +649,7 @@ } first = 0; } - if (Lflag && so.so_qlimit == 0) + if (Lflag && netstat_st_get_qlimit(stp) == 0) return; if (Aflag) printf("%8lx ", netstat_st_get_pcb(stp));