d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netstat: cleanup

Browse Source 
protopr does not support reading from a core anymore.
So don't state that it can.

Reviewed by:		glebius, rscheff, rrs
MFC after:		1 week
Sponsored by:		Netflix, Inc.
Differential Revision:	https://reviews.freebsd.org/D39688
This commit is contained in:
Michael Tuexen 2023-04-20 23:52:19 +02:00
parent 85e8c2a034
commit ddf24a507c
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.bin/netstat/main.c
View File

@ -88,9 +88,9 @@ static struct protox {
int pr_usesysctl; /* non-zero if we use sysctl, not kvm */
int pr_protocol;
} protox[] = {
{ N_TCBINFO, N_TCPSTAT, 1, protopr,
{ -1 , N_TCPSTAT, 1, protopr,
tcp_stats, NULL, "tcp", 1, IPPROTO_TCP },
{ N_UDBINFO, N_UDPSTAT, 1, protopr,
{ -1 , N_UDPSTAT, 1, protopr,
udp_stats, NULL, "udp", 1, IPPROTO_UDP },
#ifdef SCTP
{ -1, N_SCTPSTAT, 1, sctp_protopr,
@ -100,13 +100,13 @@ static struct protox {
{ -1, -1, 1, protopr,
NULL, NULL, "sdp", 1, IPPROTO_TCP },
#endif
{ N_DIVCBINFO, -1, 1, protopr,
{ -1 , -1, 1, protopr,
divert_stats, NULL, "divert", 1, 0 },
{ N_RIPCBINFO, N_IPSTAT, 1, protopr,
{ -1 , N_IPSTAT, 1, protopr,
ip_stats, NULL, "ip", 1, IPPROTO_RAW },
{ N_RIPCBINFO, N_ICMPSTAT, 1, protopr,
{ -1 , N_ICMPSTAT, 1, protopr,
icmp_stats, NULL, "icmp", 1, IPPROTO_ICMP },
{ N_RIPCBINFO, N_IGMPSTAT, 1, protopr,
{ -1 , N_IGMPSTAT, 1, protopr,
igmp_stats, NULL, "igmp", 1, IPPROTO_IGMP },
#ifdef IPSEC
{ -1, N_IPSEC4STAT, 1, NULL, /* keep as compat */
@ -118,7 +118,7 @@ static struct protox {
{ -1, N_IPCOMPSTAT, 1, NULL,
ipcomp_stats, NULL, "ipcomp", 1, 0},
#endif
{ N_RIPCBINFO, N_PIMSTAT, 1, protopr,
{ -1 , N_PIMSTAT, 1, protopr,
pim_stats, NULL, "pim", 1, IPPROTO_PIM },
{ -1, N_CARPSTATS, 1, NULL,
carp_stats, NULL, "carp", 1, 0 },
@ -134,13 +134,13 @@ static struct protox {
#ifdef INET6
static struct protox ip6protox[] = {
{ N_TCBINFO, N_TCPSTAT, 1, protopr,
{ -1 , N_TCPSTAT, 1, protopr,
tcp_stats, NULL, "tcp", 1, IPPROTO_TCP },
{ N_UDBINFO, N_UDPSTAT, 1, protopr,
{ -1 , N_UDPSTAT, 1, protopr,
udp_stats, NULL, "udp", 1, IPPROTO_UDP },
{ N_RIPCBINFO, N_IP6STAT, 1, protopr,
{ -1 , N_IP6STAT, 1, protopr,
ip6_stats, ip6_ifstats, "ip6", 1, IPPROTO_RAW },
{ N_RIPCBINFO, N_ICMP6STAT, 1, protopr,
{ -1 , N_ICMP6STAT, 1, protopr,
icmp6_stats, icmp6_ifstats, "icmp6", 1, IPPROTO_ICMPV6 },
#ifdef SDP
{ -1, -1, 1, protopr,

4
usr.bin/netstat/nlist_symbols
View File

@ -4,7 +4,6 @@
all _ahstat
all _arpstat
all _carpstats
all _divcbinfo
all _espstat
all _icmp6stat
all _icmpstat
@ -36,15 +35,12 @@ all _pfsyncstats
all _pim6stat
all _pimstat
all _rip6stat
all _ripcbinfo
all _rtree
all _rtstat
all _sctpstat
all _sfstat
all _tcbinfo
all _tcpstat
all _tcps_states
all _udbinfo
all _udpstat
all _unp_count
all _unp_dhead