sockstat: improve output formatting
ClosedPublic
Actions

Authored by tuexen on Wed, Oct 8, 7:26 PM.

Details

Reviewers

asomers
glebius
peter.lei_ieee.org
lstewart
rrs

Commits

rGa9ffe497c864: sockstat: improve output formatting
rG7e567f51ff59: sockstat: improve output formatting
rG98b2a2265f5e: sockstat: improve output formatting

Summary

Fix the format when the output for a socket spans multiple lines.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

tuexen created this revision.Wed, Oct 8, 7:26 PM

Herald added a subscriber: imp. · View Herald TranscriptWed, Oct 8, 7:26 PM

tuexen requested review of this revision.Wed, Oct 8, 7:26 PM

tuexen added a reviewer: rrs.Wed, Oct 8, 7:55 PM

Could you please give an example of the before and after output?

In D52984#1210640, @asomers wrote:

Could you please give an example of the before and after output?

Sure. Here is the output without the fix:

tuexen@head:~/freebsd-src/usr.bin/sockstat % sockstat -Ptcp,sctp
USER   COMMAND     PID FD PROTO LOCAL ADDRESS         FOREIGN ADDRESS      
tuexen nc         1671  3 sctp4 127.0.0.1:10061       127.0.0.1:1234       ??     ??           ?? ?? 192.168.1.71:10061    ??                   
tuexen nc         1670  3 sctp4 127.0.0.1:1234        *:*                  
tuexen nc         1670  4 sctp4 127.0.0.1:1234        127.0.0.1:10061      ??     ??           ?? ?? ??                    192.168.1.71:10061   
tuexen sshd-sessi 1661  7 tcp4  192.168.1.71:22       192.168.1.195:56451  
root   sshd-sessi 1659  7 tcp4  192.168.1.71:22       192.168.1.195:56451  
tuexen sshd-sessi 1654  7 tcp4  192.168.1.71:22       192.168.1.195:56448  
root   sshd-sessi 1652  7 tcp4  192.168.1.71:22       192.168.1.195:56448  
tuexen sshd-sessi 1647  7 tcp4  192.168.1.71:22       192.168.1.195:56445  
root   sshd-sessi 1645  7 tcp4  192.168.1.71:22       192.168.1.195:56445  
root   sshd       1586  6 tcp6  *:22                  *:*                  
root   sshd       1586  7 tcp4  *:22                  *:*

Here is the output with the patch applied:

tuexen@head:~/freebsd-src/usr.bin/sockstat % sockstat -Ptcp,sctp
USER   COMMAND     PID FD PROTO LOCAL ADDRESS         FOREIGN ADDRESS      
tuexen nc         1671  3 sctp4 127.0.0.1:10061       127.0.0.1:1234       
??     ??           ?? ?? ??    192.168.1.71:10061    ??                   
tuexen nc         1670  3 sctp4 127.0.0.1:1234        *:*                  
tuexen nc         1670  4 sctp4 127.0.0.1:1234        127.0.0.1:10061      
??     ??           ?? ?? ??    ??                    192.168.1.71:10061   
tuexen sshd-sessi 1661  7 tcp4  192.168.1.71:22       192.168.1.195:56451  
root   sshd-sessi 1659  7 tcp4  192.168.1.71:22       192.168.1.195:56451  
tuexen sshd-sessi 1654  7 tcp4  192.168.1.71:22       192.168.1.195:56448  
root   sshd-sessi 1652  7 tcp4  192.168.1.71:22       192.168.1.195:56448  
tuexen sshd-sessi 1647  7 tcp4  192.168.1.71:22       192.168.1.195:56445  
root   sshd-sessi 1645  7 tcp4  192.168.1.71:22       192.168.1.195:56445  
root   sshd       1586  6 tcp6  *:22                  *:*                  
root   sshd       1586  7 tcp4  *:22                  *:*

rrs accepted this revision.Thu, Oct 9, 3:02 PM

This revision is now accepted and ready to land.Thu, Oct 9, 3:02 PM

Closed by commit rG98b2a2265f5e: sockstat: improve output formatting (authored by tuexen). · Explain WhyThu, Oct 9, 7:14 PM

This revision was automatically updated to reflect the committed changes.

tuexen added a commit: rG98b2a2265f5e: sockstat: improve output formatting.

tuexen added a commit: rG7e567f51ff59: sockstat: improve output formatting.Tue, Oct 14, 8:48 PM

cperciva added a commit: rGa9ffe497c864: sockstat: improve output formatting.Wed, Oct 15, 6:09 AM