aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram <bram@cbbg.nl>2024-07-23 09:05:13 +0000
committerWarner Losh <imp@FreeBSD.org>2024-09-20 15:06:50 +0000
commit674b96f58b9c7daabb53ba3180afe4fc26354e27 (patch)
treef57a1855a90237ce17453751ab371ad7c0d77b5c
parent94567c8641e235763b5b2926416d89d36654cde1 (diff)
downloadsrc-674b96f58b9c.tar.gz
src-674b96f58b9c.zip
netstat: Add missing "shutdown-ack-timer" key to libxo output
The key "shutdown-timer" was present twice in the libxo output. The second occurence of "shutdown-time" has been renamed to "shutdown-ack-timer". PR: 254672 Reviewed by: imp, zlei Pull Request: https://github.com/freebsd/freebsd-src/pull/1331
-rw-r--r--usr.bin/netstat/if.c4
-rw-r--r--usr.bin/netstat/sctp.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index f0af785bce04..877c7aa8dd5e 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -501,7 +501,7 @@ intpr(void (*pfunc)(char *), int af)
IFA_STAT(ipackets), link|network, 1);
show_stat("lu", nerr_len, "received-errors", IFA_STAT(ierrors),
link, 1);
- /* Below is kept for backwards compatibility. Will be removed in the future. */
+ /* Below is kept for backwards compatibility. Will be removed before FreeBSD 16. */
show_stat("lu", nerr_len, "dropped-packets", IFA_STAT(iqdrops),
link, 1);
show_stat("lu", nerr_len, "dropped-packets-in", IFA_STAT(iqdrops),
@@ -708,7 +708,7 @@ loop:
new->ift_ip - old->ift_ip, 1, 1);
show_stat("lu", 5, "received-errors",
new->ift_ie - old->ift_ie, 1, 1);
- /* Below is kept for backwards compatibility. Will be removed in the future. */
+ /* Below is kept for backwards compatibility. Will be removed before FreeBSD 16. */
show_stat("lu", 5, "dropped-packets",
new->ift_id - old->ift_id, 1, 1);
show_stat("lu", 5, "dropped-packets-in",
diff --git a/usr.bin/netstat/sctp.c b/usr.bin/netstat/sctp.c
index 92c4bf67b2fa..e9fd494e292b 100644
--- a/usr.bin/netstat/sctp.c
+++ b/usr.bin/netstat/sctp.c
@@ -711,7 +711,7 @@ sctp_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
"secret\n");
p(sctps_timopathmtu, "\t\t{:pmtu-timer/%ju} "
"{N:/PMTU timer%s fired}\n");
- p(sctps_timoshutdownack, "\t\t{:shutdown-timer/%ju} "
+ p(sctps_timoshutdownack, "\t\t{:shutdown-ack-timer/%ju} "
"{N:/shutdown ack timer%s fired}\n");
p(sctps_timoshutdownguard, "\t\t{:shutdown-guard-timer/%ju} "
"{N:/shutdown guard timer%s fired}\n");