Re: [PATCH iproute2 REGRESSIONS v2] ss: Fix layout/output issues introduced by regression

[Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>]

Hello.

On 12/05/2014 06:03 PM, Vadim Kochan wrote:

> This patch fixes the following issues which was introduced by me in commits:

>      #1 (2dc854854b7f1b) ss: Fixed broken output for Netlink 'Peer Address:Port' column
>      ISSUE: Broken layout when all sockets are printed out

>      #2 (eef43b5052afb7) ss: Identify more netlink protocol names
>      ISSUE: Protocol id is not printed if 'numbers only' output was specified (-n)

> Also aligned the width of the local/peer ports to be more wider.

> I tested with a lot of option combinations (I may miss some test cases),
> but layout seems to me better than the previous released version of iproute2/ss.

> Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
> ---
>   misc/ss.c | 30 ++++++++++--------------------
>   1 file changed, 10 insertions(+), 20 deletions(-)

> diff --git a/misc/ss.c b/misc/ss.c
> index a99294d..8abaaff 100644
> --- a/misc/ss.c
> +++ b/misc/ss.c
[...]
> @@ -2912,11 +2910,12 @@ static void netlink_show_one(struct filter *f,
>   		printf("%-*s ", state_width, "UNCONN");
>   	printf("%-6d %-6d ", rq, wq);
>
> -	if (resolve_services)
> -	{
> +	if (resolve_services) {
>   		printf("%*s:", addr_width, nl_proto_n2a(prot, prot_name,
>   					sizeof(prot_name)));
> -	}
> +	} else
> +		printf("%*d:", addr_width, prot);
> +

    Extra empty line hardly needed here. And if iproute2 follows the Linux 
kernel style, {} should be used in all arms of the *if* statement (since it's 
used in one case).

>
>   	if (pid == -1) {
>   		printf("%-*s ", serv_width, "*");

WBR, Sergei