diff --git a/misc/ss.c b/misc/ss.c index a99294dc..c9733a77 100644 --- a/misc/ss.c +++ b/misc/ss.c @@ -101,8 +101,6 @@ int state_width; int addrp_width; int addr_width; int serv_width; -int paddr_width; -int pserv_width; int screen_width; static const char *TCP_PROTO = "tcp"; @@ -2912,10 +2910,11 @@ 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); } if (pid == -1) { @@ -2947,10 +2946,10 @@ static void netlink_show_one(struct filter *f, if (state == NETLINK_CONNECTED) { printf("%*d:%-*d", - paddr_width, dst_group, pserv_width, dst_pid); + addr_width, dst_group, serv_width, dst_pid); } else { printf("%*s*%-*s", - paddr_width, "", pserv_width, ""); + addr_width, "", serv_width, ""); } char *pid_context = NULL; @@ -3684,22 +3683,13 @@ int main(int argc, char *argv[]) printf("%-*s ", state_width, "State"); printf("%-6s %-6s ", "Recv-Q", "Send-Q"); - paddr_width = addr_width; - pserv_width = serv_width; - - /* Netlink service column can be resolved as process name/pid thus it - * can be much wider than address column which is just a - * protocol name/id. - */ - if (current_filter.dbs & (1<