diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2008-02-05 16:14:32 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2008-02-05 16:14:32 +0000 |
| commit | a9f52949554f7da6c2067224b8b2c12db1fd2b6a (patch) | |
| tree | 761b34a0e9307162edf47a08bbb28e8e23efd9e7 /usr.bin/netstat/inet.c | |
| parent | f28a1bef08ef4f0348c6480888ee766266ef883f (diff) | |
Change the method of identifying server connections to hide from
netstat without -a: use the connection state to identify TCP
servers, check the foreign address (not local address) to
identify servers on UDP and raw sockets.
From Philip Guenther, style changes suggested by Claudio.
ok claudio
Diffstat (limited to 'usr.bin/netstat/inet.c')
| -rw-r--r-- | usr.bin/netstat/inet.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c index bc70dd8370e..888952b7452 100644 --- a/usr.bin/netstat/inet.c +++ b/usr.bin/netstat/inet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet.c,v 1.104 2007/12/19 01:47:00 deraadt Exp $ */ +/* $OpenBSD: inet.c,v 1.105 2008/02/05 16:14:31 sthen Exp $ */ /* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */ /* @@ -118,7 +118,7 @@ protopr0(u_long off, char *name, int af) struct inpcbtable table; struct inpcb *head, *next, *prev; struct inpcb inpcb; - int istcp, israw; + int istcp, israw, isany; int first = 1; char *name0; char namebuf[20]; @@ -146,22 +146,25 @@ protopr0(u_long off, char *name, int af) case AF_INET: if ((inpcb.inp_flags & INP_IPV6) != 0) continue; + isany = inet_lnaof(inpcb.inp_faddr) == INADDR_ANY; break; case AF_INET6: if ((inpcb.inp_flags & INP_IPV6) == 0) continue; + isany = IN6_IS_ADDR_UNSPECIFIED(&inpcb.inp_faddr6); break; default: + isany = 0; break; } - if (!aflag && - inet_lnaof(inpcb.inp_laddr) == INADDR_ANY) - continue; kread((u_long)inpcb.inp_socket, &sockb, sizeof (sockb)); if (istcp) { kread((u_long)inpcb.inp_ppcb, &tcpcb, sizeof (tcpcb)); - } + if (!aflag && tcpcb.t_state <= TCPS_LISTEN) + continue; + } else if (!aflag && isany) + continue; if (first) { printf("Active Internet connections"); if (aflag) |