hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-21 18:50:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

netstat: Add missing "shutdown-ack-timer" key to libxo output

Browse Source 
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
This commit is contained in:
Bram 2024-07-23 11:05:13 +02:00 committed by Warner Losh
parent 94567c8641
commit 674b96f58b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/netstat/if.c
View File

@ -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",

2
usr.bin/netstat/sctp.c
View File

@ -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");