Skip to content

Commit

Permalink
Don't show the number of currently established SCTP associations,
Browse files Browse the repository at this point in the history 
since this is not monotonically increasing. It's number can be
derived from the other counters shown.

MFC after:	3 days
  • Loading branch information
@tuexen
tuexen committed Apr 10, 2018
1 parent 382a135 commit 72609e5
Showing 1 changed file with 48 additions and 51 deletions.
99 changes: 48 additions & 51 deletions usr.bin/systat/sctp.c
View file
Expand Up @@ -53,24 +53,23 @@ static struct sctpstat curstat, initstat, oldstat;
00 SCTP Associations SCTP Packets
01999999999999 associations initiated 999999999999 packets sent
02999999999999 associations accepted 999999999999 packets received
03999999999999 associations established 999999999999 - out of the blue
04999999999999 associations restarted 999999999999 - bad vtag
05999999999999 associations terminated 999999999999 - bad crc32c
06999999999999 associations aborted
07
08 SCTP Timers SCTP Chunks
09999999999999 init timeouts 999999999999 control chunks sent
10999999999999 cookie timeouts 999999999999 data chunks sent
11999999999999 data timeouts 999999999999 - ordered
12999999999999 delayed sack timeouts 999999999999 - unordered
13999999999999 shutdown timeouts 999999999999 control chunks received
14999999999999 shutdown-ack timeouts 999999999999 data chunks received
15999999999999 shutdown guard timeouts 999999999999 - ordered
16999999999999 heartbeat timeouts 999999999999 - unordered
17999999999999 path MTU timeouts
18999999999999 autoclose timeouts SCTP user messages
19999999999999 asconf timeouts 999999999999 fragmented
20999999999999 stream reset timeouts 999999999999 reassembled
03999999999999 associations restarted 999999999999 - out of the blue
04999999999999 associations terminated 999999999999 - bad vtag
05999999999999 associations aborted 999999999999 - bad crc32c
06
07 SCTP Timers SCTP Chunks
08999999999999 init timeouts 999999999999 control chunks sent
09999999999999 cookie timeouts 999999999999 data chunks sent
10999999999999 data timeouts 999999999999 - ordered
11999999999999 delayed sack timeouts 999999999999 - unordered
12999999999999 shutdown timeouts 999999999999 control chunks received
13999999999999 shutdown-ack timeouts 999999999999 data chunks received
14999999999999 shutdown guard timeouts 999999999999 - ordered
15999999999999 heartbeat timeouts 999999999999 - unordered
16999999999999 path MTU timeouts
17999999999999 autoclose timeouts SCTP user messages
18999999999999 asconf timeouts 999999999999 fragmented
19999999999999 stream reset timeouts 999999999999 reassembled
--0123456789012345678901234567890123456789012345678901234567890123456789012345
--0 1 2 3 4 5 6 7
*/
Expand Down Expand Up @@ -100,24 +99,23 @@ labelsctp(void)
L(0, "SCTP Associations"); R(0, "SCTP Packets");
L(1, "associations initiated"); R(1, "packets sent");
L(2, "associations accepted"); R(2, "packets received");
L(3, "associations established"); R(3, "- out of the blue");
L(4, "associations restarted"); R(4, "- bad vtag");
L(5, "associations terminated"); R(5, "- bad crc32c");
L(6, "associations aborted");
L(3, "associations restarted"); R(3, "- out of the blue");
L(4, "associations terminated"); R(4, "- bad vtag");
L(5, "associations aborted"); R(5, "- bad crc32c");

L(8, "SCTP Timers"); R(8, "SCTP Chunks");
L(9, "init timeouts"); R(9, "control chunks sent");
L(10, "cookie timeouts"); R(10, "data chunks sent");
L(11, "data timeouts"); R(11, "- ordered");
L(12, "delayed sack timeouts"); R(12, "- unordered");
L(13, "shutdown timeouts"); R(13, "control chunks received");
L(14, "shutdown-ack timeouts"); R(14, "data chunks received");
L(15, "shutdown guard timeouts"); R(15, "- ordered");
L(16, "heartbeat timeouts"); R(16, "- unordered");
L(17, "path MTU timeouts");
L(18, "autoclose timeouts"); R(18, "SCTP User Messages");
L(19, "asconf timeouts"); R(19, "fragmented");
L(20, "stream reset timeouts"); R(20, "reassembled");
L(7, "SCTP Timers"); R(7, "SCTP Chunks");
L(8, "init timeouts"); R(8, "control chunks sent");
L(9, "cookie timeouts"); R(9, "data chunks sent");
L(10, "data timeouts"); R(10, "- ordered");
L(11, "delayed sack timeouts"); R(11, "- unordered");
L(12, "shutdown timeouts"); R(12, "control chunks received");
L(13, "shutdown-ack timeouts"); R(13, "data chunks received");
L(14, "shutdown guard timeouts"); R(14, "- ordered");
L(15, "heartbeat timeouts"); R(15, "- unordered");
L(16, "path MTU timeouts");
L(17, "autoclose timeouts"); R(17, "SCTP User Messages");
L(18, "asconf timeouts"); R(18, "fragmented");
L(19, "stream reset timeouts"); R(19, "reassembled");
#undef L
#undef R
}
Expand Down Expand Up @@ -286,24 +284,23 @@ showsctp(void)
#define R(row, stat) DO(stat, row, 38)
L(1, sctps_activeestab); R(1, sctps_outpackets);
L(2, sctps_passiveestab); R(2, sctps_inpackets);
L(3, sctps_currestab); R(3, sctps_outoftheblue);
L(4, sctps_restartestab); R(4, sctps_badvtag);
L(5, sctps_shutdown); R(5, sctps_checksumerrors);
L(6, sctps_aborted);
L(3, sctps_restartestab); R(3, sctps_outoftheblue);
L(4, sctps_shutdown); R(4, sctps_badvtag);
L(5, sctps_aborted); R(5, sctps_checksumerrors);


L(9, sctps_timoinit); R(9, sctps_outcontrolchunks);
L(10, sctps_timocookie); R(10, sctps_senddata);
L(11, sctps_timodata); R(11, sctps_outorderchunks);
L(12, sctps_timosack); R(12, sctps_outunorderchunks);
L(13, sctps_timoshutdown); R(13, sctps_incontrolchunks);
L(14, sctps_timoshutdownack); R(14, sctps_recvdata);
L(15, sctps_timoshutdownguard); R(15, sctps_inorderchunks);
L(16, sctps_timoheartbeat); R(16, sctps_inunorderchunks);
L(17, sctps_timopathmtu);
L(18, sctps_timoautoclose);
L(19, sctps_timoasconf); R(19, sctps_fragusrmsgs);
L(20, sctps_timostrmrst); R(20, sctps_reasmusrmsgs);
L(8, sctps_timoinit); R(8, sctps_outcontrolchunks);
L(9, sctps_timocookie); R(9, sctps_senddata);
L(10, sctps_timodata); R(10, sctps_outorderchunks);
L(11, sctps_timosack); R(11, sctps_outunorderchunks);
L(12, sctps_timoshutdown); R(12, sctps_incontrolchunks);
L(13, sctps_timoshutdownack); R(13, sctps_recvdata);
L(14, sctps_timoshutdownguard); R(14, sctps_inorderchunks);
L(15, sctps_timoheartbeat); R(15, sctps_inunorderchunks);
L(16, sctps_timopathmtu);
L(17, sctps_timoautoclose);
L(18, sctps_timoasconf); R(18, sctps_fragusrmsgs);
L(19, sctps_timostrmrst); R(19, sctps_reasmusrmsgs);
#undef DO
#undef L
#undef R
Expand Down

0 comments on commit 72609e5

Please sign in to comment.