- Copy stable/10@285827 to releng/10.2 in preparation for 10.2-RC1
builds.
- Update newvers.sh to reflect RC1.
- Update __FreeBSD_version to reflect 10.2.
- Update default pkg(8) configuration to use the quarterly branch.[1]

Discussed with: re, portmgr [1]
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

MFC r284636:

- Add SOCK_SEQPACKET support in UNIX-domain socket.
- Display zoneid using % notation in an IPv6 address.
- Use nitems().
- Use sstos{in,in6,un} macros to simplify casts.
- style(9).

Approved by: re (gjb)

MFC r284351:
Simplify printaddr(). No functional change.

MFC r284352:
Allow more than one socket entry for a file descriptor. This is needed
for supporting 1-to-many style SCTP sockets. For other sochets, there
is no functional change.

MFC r284353:
Allow more than one local or remote address per socket. This is needed to
support SCTP (and MPTCP in the future). No functional change for existing
protocols.

MFC r284354:
Add support for SCTP.

MFC r284355:
When using -L the code skips a socket if the local or foreign
address is loopback. So it is shown if both are not loopback.
The man page says that it is shown if the local or foreign
address is not loopback. Change the man page to reflect the
code.

MFC r281202:

The code says "or", not "either or". So fix the documentation.

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Allow the socket list to be limited to a specific jail id.

No objections: current@

sockstat: Also show sockets not associated with a file descriptor.

Sockets not associated with a file descriptor include TCP TIME_WAIT states
and sockets created via the socket(9) API such as from rpc.lockd and the NFS
client.

PR: bin/164081
MFC after: 2 weeks
No objection: des

Reencode files from latin1 to UTF-8.

This makes a tiny percentage of entries in calendars ugly for latin1
users, but fixes them for UTF-8 users.

This badly needs a solution involving locale-dependent re-encoding.

Note that sockstat(1) does not display kernel-owned sockets.

Submitted by: infofarmer@
MFC after: 2 weeks

Add manual page links to advertise procstat(1) a little better.

Approved by: re (kib)

Add an -L option to ignore loopback Internet sockets.

MFC after: 2 weeks

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

Scheduled mdoc(7) sweep.

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

mdoc(7) police: markup polishing.

Approved by: re

Rewrite sockstat(1) in C.

Sponsored by: DARPA, NAI Labs

Spell "FreeBSD" with "F" and "BSD" in uppercase.

mdoc(7) police: fix markup.

Allow the user to specify port ranges against which to match inet sockets.

Suggested by: roam

mdoc(7) police: removed HISTORY info from the .Os call.

Add (and document) options for showing only listening or connected sockets.

Prepare for mdoc(7)NG.

mdoc(7) police: added missing .Os call.

Spell the des's name correctly.

Document the fact that sockstat now lists Unix domain sockets, and the new
command-line options for selecting what to display.

Do not dot terminate list of references

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.

Update sockstat to support INET6 socket printing.

Approved by: jkh

Submitted by: Ben Smithurst <ben@scientia.demon.co.uk>
Reviewed by: des

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

$Id$ -> $FreeBSD$

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

Rename lsock(1) to sockstat(1).

Suggested by: Sheldon Hearn <sheldonh@iafrica.com>
Approved by: Peter Wemm <peter@netplex.com.au>