diff options
| author | Michael Tuexen <tuexen@FreeBSD.org> | 2021-04-18 14:08:08 +0000 |
|---|---|---|
| committer | Michael Tuexen <tuexen@FreeBSD.org> | 2021-04-18 14:16:42 +0000 |
| commit | 9e644c23000c2f5028b235f6263d17ffb24d3605 (patch) | |
| tree | 846286d2c178f8c442c7bd711ceb0a50a9c06f9e /usr.bin/sockstat | |
| parent | 136f6b6c0cc1343a7637c3250ff9dd0eced4b4d0 (diff) | |
| download | src-9e644c23000c2f5028b235f6263d17ffb24d3605.tar.gz src-9e644c23000c2f5028b235f6263d17ffb24d3605.zip | |
Diffstat (limited to 'usr.bin/sockstat')
| -rw-r--r-- | usr.bin/sockstat/sockstat.1 | 6 | ||||
| -rw-r--r-- | usr.bin/sockstat/sockstat.c | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index 8521c50348c9..f602ad467f9f 100644 --- a/usr.bin/sockstat/sockstat.1 +++ b/usr.bin/sockstat/sockstat.1 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 30, 2020 +.Dd March 28, 2021 .Dt SOCKSTAT 1 .Os .Sh NAME @@ -98,7 +98,7 @@ Display the protocol state, if applicable. This is currently only implemented for SCTP and TCP. .It Fl U Display the remote UDP encapsulation port number, if applicable. -This is currently only implemented for SCTP. +This is currently only implemented for SCTP and TCP. .It Fl u Show .Dv AF_LOCAL @@ -163,7 +163,7 @@ The address the foreign end of the socket is bound to (see .It Li ENCAPS The remote UDP encapsulation port number if .Fl U -is specified (only for SCTP). +is specified (only for SCTP or TCP). .It Li PATH STATE The path state if .Fl s diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index 26f31d96b8e0..109b254b7438 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -710,6 +710,8 @@ gather_inet(int proto) sockaddr(&faddr->address, sock->family, &xip->in6p_faddr, xip->inp_fport); } + if (proto == IPPROTO_TCP) + faddr->encaps_port = xtp->xt_encaps_port; laddr->next = NULL; faddr->next = NULL; sock->laddr = laddr; @@ -1087,10 +1089,13 @@ displaysock(struct sock *s, int pos) } if (opt_U) { if (faddr != NULL && - s->proto == IPPROTO_SCTP && - s->state != SCTP_CLOSED && - s->state != SCTP_BOUND && - s->state != SCTP_LISTEN) { + ((s->proto == IPPROTO_SCTP && + s->state != SCTP_CLOSED && + s->state != SCTP_BOUND && + s->state != SCTP_LISTEN) || + (s->proto == IPPROTO_TCP && + s->state != TCPS_CLOSED && + s->state != TCPS_LISTEN))) { while (pos < offset) pos += xprintf(" "); pos += xprintf("%u", |