Commit Graph

46 Commits

Author SHA1 Message Date
Giorgos Keramidas
d2d77d2aee In revision 1.14 I broke the -4 and -6 options of sockstat(1).
Using either one of the two would result in an empty protos[]
array, and no sockets were actually listed:

  % sockstat -4
  USER     COMMAND    PID   FD PROTO  LOCAL ADDRESS         FOREIGN ADDRESS
  % sockstat -6
  USER     COMMAND    PID   FD PROTO  LOCAL ADDRESS         FOREIGN ADDRESS
  %

Fix this bug by tweaking appropriately the logic of handling opt_4,
opt_6, opt_u and protos_defined.

Submitted by:	des
Pointy hat:	keramida
2006-11-12 19:03:39 +00:00
Giorgos Keramidas
1f3d67aade Add support for filtering sockets by protocol type. The default
behavior of sockstat(1) will still be to show "udp", "tcp" and
"divert" protocols, but we can now provide a (comma-separated)
list of protocols, as in:

    % sockstat -P tcp

to list only TCP sockets, or we can filter more than one protocol
by separating the protocol names with a comma:

    % sockstat -P tcp,udp

Protocol names are parsed with getprotobyname(3), so any protocol
whose name is listed in `/etc/protocols' should work fine.

Submitted by:	Josh Carroll <josh.carroll@psualum.com>
Approved by:	des
2006-11-11 22:11:54 +00:00
Dag-Erling Smørgrav
fd0cba238e Don't free(sock) before it's even allocated.
Submitted by:	Joerg Sonnenberger <joerg@britannica.bec.de>
MFC after:	1 week
2005-06-10 06:36:03 +00:00
Ruslan Ermilov
254dd1666e Let bsd.prog.mk set SRCS and MAN to their default values. 2005-01-28 16:08:11 +00:00
Ruslan Ermilov
4438d91ea2 Scheduled mdoc(7) sweep. 2005-01-11 10:32:52 +00:00
Ruslan Ermilov
4b2a3d41da Unbreak sockstat(1) on systems without the divert protocol. 2004-12-06 09:28:05 +00:00
Ruslan Ermilov
2cfbdf89b7 Show divert(4) sockets as well. 2004-12-05 14:17:14 +00:00
Peter Pentchev
97c6143c95 Do not display bogus entries for sockets in the TIME_WAIT or similar
states that no longer have a corresponding file descriptor - until now,
sockstat would mostly randomly match null kern.file.*.xf_data fields
with the first mostly-closed socket.

This bugfix is a RELENG_5 candidate.

Approved by:	andre
2004-08-25 16:36:17 +00:00
John-Mark Gurney
b4eb37c63d make sockstat not print wierd addresses on not connected unix domain sockets
Pointed out by:	rwatson
Reviewed by:	peter
2003-07-19 06:23:56 +00:00
Maxime Henrion
ae94787d6d Finish the implementation of the -p switch so that it
actually works.  I have no idea why this wasn't finished
and happened to try to use it.
2003-06-07 14:36:49 +00:00
Robert Drehmel
9efed1e6e2 To reserve space for 65536 bits, allocate
65536 / (sizeof(int) * CHAR_BITS) `int's instead of
65536 / (sizeof(int) * CHAR_BITS) bytes to avoid a possible
segmentation fault if ports above 16383 are specified via the
-p option on a platform with 4 byte wide ints.

Approved by:	re (bmah)
Reported by:	Marco Wertejuk <wertejuk@mwcis.com>
2003-05-09 09:11:27 +00:00
Matthew Dillon
48e3128b34 Bow to the whining masses and change a union back into void *. Retain
removal of unnecessary casts and throw in some minor cleanups to see if
anyone complains, just for the hell of it.
2003-01-13 00:33:17 +00:00
Matthew Dillon
cd72f2180b Change struct file f_data to un_data, a union of the correct struct
pointer types, and remove a huge number of casts from code using it.

Change struct xfile xf_data to xun_data (ABI is still compatible).

If we need to add a #define for f_data and xf_data we can, but I don't
think it will be necessary.  There are no operational changes in this
commit.
2003-01-12 01:37:13 +00:00
Ruslan Ermilov
06e482e60a mdoc(7) police: markup polishing.
Approved by:	re
2002-11-26 17:33:37 +00:00
Robert Drehmel
6dbe8d53a5 Use a cast to `void *' before casting to a pointer to a structure
to stop GCC emitting warnings about increased alignment requirements
which broke the build for sparc64.

Approved by:	des
2002-08-02 11:57:59 +00:00
Dag-Erling Smørgrav
02bd9db045 Don't depend on namespace pollution from <netinet/in_pcb.h>.
Submitted by:	bde
2002-08-01 16:49:31 +00:00
Dag-Erling Smørgrav
1e6690e5db Implement the -l and -c options, which I'd forgotten. 2002-08-01 11:02:30 +00:00
Dag-Erling Smørgrav
ca007d9172 Rewrite sockstat(1) in C.
Sponsored by:	DARPA, NAI Labs
2002-07-31 12:32:03 +00:00
Dag-Erling Smørgrav
d397408818 Usage style sweep: spell "usage" with a small 'u'.
Also change one case of blatant __progname abuse (several more remain)
This commit does not touch anything in src/{contrib,crypto,gnu}/.
2002-04-22 13:44:47 +00:00
Dag-Erling Smørgrav
b32ecb502b Drop maintainership of this, it serves no purpose. 2002-04-15 19:36:50 +00:00
Ruslan Ermilov
c5e7e03a14 Spell "FreeBSD" with "F" and "BSD" in uppercase. 2001-08-13 16:33:00 +00:00
Ruslan Ermilov
3ce0d6e846 mdoc(7) police: fix markup. 2001-08-10 10:43:45 +00:00
Dag-Erling Smørgrav
03f28475f8 Allow the user to specify port ranges against which to match inet sockets.
Suggested by:	roam
2001-08-07 19:59:52 +00:00
Matt Jacob
df94d4d280 Fix 64 bit issues so that sockstat && fstat work correctly on alpha.
PR:		29231
Submitted by:	pherman@frenchfries.net
MFC after:	2 weeks
2001-07-25 20:31:20 +00:00
Ruslan Ermilov
625003720a mdoc(7) police: removed HISTORY info from the .Os call. 2001-07-10 14:16:33 +00:00
Ruslan Ermilov
b9ad8c8635 beforeinstall -> SCRIPTS. 2001-04-07 11:21:35 +00:00
Ruslan Ermilov
dc12be5258 MAN[1-9] -> MAN. 2001-03-27 10:52:19 +00:00
Dag-Erling Smørgrav
84e268e3fc Use the newly introduced -W flag to netstat(1) to avoid truncated addresses. 2001-03-15 20:46:35 +00:00
Dag-Erling Smørgrav
a0581bbcc2 Add (and document) options for showing only listening or connected sockets. 2001-03-06 13:48:38 +00:00
Ruslan Ermilov
1bfea903ed Prepare for mdoc(7)NG. 2001-01-16 09:39:23 +00:00
Ruslan Ermilov
88544700ca mdoc(7) police: added missing .Os call. 2000-12-14 13:58:15 +00:00
Ruslan Ermilov
b82f5db0ac Spell the des's name correctly. 2000-11-14 13:19:26 +00:00
Dag-Erling Smørgrav
91ef813ce3 Skip sockets with no SCB 2000-10-13 16:25:37 +00:00
Dag-Erling Smørgrav
ac1070c6fe Document the fact that sockstat now lists Unix domain sockets, and the new
command-line options for selecting what to display.
2000-10-07 14:11:43 +00:00
Dag-Erling Smørgrav
0c2352994b Total rewrite. This was actually the first non-trivial Perl script I ever
wrote, and as such was not very pretty.

Changes that may cause problems for people who use sockstat in scripts:

 - sockstat(8) now displays Unix domain sockets in addition to IPv4 and IPv6
 - the last period in local and foreign addresses is changed to a colon to
   make the port number easier to spot
 - IPv4 and IPv6 sockets are listed separately (IPv4 first, then IPv6, then
   Unix)
2000-10-07 14:10:37 +00:00
Ruslan Ermilov
6159b9dd5b Restore support for displaying raw IPv4 sockets and
correct the author's name.  Were broken in rev 1.6.

Approved by:	des
2000-08-30 13:24:01 +00:00
Dag-Erling Smørgrav
2d090923d6 Invoke netstat(1) and fstat(1) with full path. 2000-08-30 09:18:20 +00:00
Philippe Charnier
f57cdd0f01 Do not dot terminate list of references 2000-03-26 14:56:52 +00:00
Yoshinobu Inoue
f3935df101 Prevent sockstat print out some empty entries related to IPv6.
Sockstat use netstat tcp/udp socket print, and fstat tcp/udp
  socket print, but it just specify all of IPPROTO_IP and
  IPPROTO_IPV6 sockets for fstat.
  Now IPv6 socket also use raw socket, but only netstat don't print it,
  so now they are printed as empty entries in sockstat output.

Approved by: jkh
2000-03-11 11:25:00 +00:00
Sheldon Hearn
87faa07bec Remove single-space hard sentence breaks. These degrade the quality
of the typeset output, tend to make diffs harder to read and provide
bad examples for new-comers to mdoc.
2000-03-01 12:20:22 +00:00
Yoshinobu Inoue
482ca4274b Update sockstat to support INET6 socket printing.
Approved by: jkh

Submitted by: Ben Smithurst <ben@scientia.demon.co.uk>
Reviewed by: des
2000-02-26 02:56:16 +00:00
Sheldon Hearn
5ff829fdbf Add xrefs to the {f,net,sock}stat.1 manpages. While I'm in there, fix
the sockstat.1 document title, which still remembers when sockstat was
called lsock.

Reviewed by:	mpp
1999-09-06 13:14:24 +00:00
Peter Wemm
c3aac50f28 $Id$ -> $FreeBSD$ 1999-08-28 01:08:13 +00:00
Dag-Erling Smørgrav
14802b6092 Use -finet option to netstat(1), and don't discard anything.
Don't truncate the protocol field.
These two changes conspire to make sockstat(1) show divert sockets.

Submitted by:	ru
1999-07-06 19:12:31 +00:00
Dag-Erling Smørgrav
c0da497e2d Don't use STDOUT_TOP.
Submitted by:	Christopher Masto <chris@netmonger.net>
1999-05-01 11:31:19 +00:00
Dag-Erling Smørgrav
5827850902 Rename lsock(1) to sockstat(1).
Suggested by:	Sheldon Hearn <sheldonh@iafrica.com>
Approved by:	Peter Wemm <peter@netplex.com.au>
1999-04-15 13:40:43 +00:00