matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iproute: Fix Netid value for multi-families output 

When requesting simultaneous output of TCP and UDP sockets
the netid field shows "tcp" always.

[root@xemvm1 iproute2]# ./misc/ss -a -tu
Netid State      Recv-Q Send-Q                            Local Address:Port                                Peer Address:Port
tcp   UNCONN     0      0                                             *:32713                                          *:*
tcp   UNCONN     0      0                                             *:bootpc                                         *:*
tcp   UNCONN     0      0                                            :::57879                                         :::*
tcp   LISTEN     0      128                                           *:ssh                                            *:*
tcp   ESTAB      0      48                                      1.2.3.5:ssh                                      1.2.3.4:45826
tcp   ESTAB      0      0                                       1.2.3.5:ssh                                      1.2.3.4:45814
tcp   LISTEN     0      128                                          :::ssh                                           :::*

While the 1st 3 sockets are UDP ones:

[root@xemvm1 iproute2]# ./misc/ss -a -u
State       Recv-Q Send-Q                              Local Address:Port                                  Peer Address:Port
UNCONN      0      0                                               *:32713                                            *:*
UNCONN      0      0                                               *:bootpc                                           *:*
UNCONN      0      0                                              :::57879                                           :::*

Reported-by: François-Xavier Le Bail <fx.lebail@yahoo.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Tested-by: François-Xavier Le Bail <fx.lebail@yahoo.com>
This commit is contained in:
Pavel Emelyanov 2014-01-28 10:24:15 +04:00 committed by Stephen Hemminger
parent c33049044e
commit 77a8ca8118
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
misc/ss.c
View File

@ -1462,7 +1462,21 @@ static void tcp_show_info(const struct nlmsghdr *nlh, struct inet_diag_msg *r,
} }
} }
static int inet_show_sock(struct nlmsghdr *nlh, struct filter *f) static char *proto_name(int protocol)
{
switch (protocol) {
case IPPROTO_UDP:
return "udp";
case IPPROTO_TCP:
return "tcp";
case IPPROTO_DCCP:
return "dccp";
}
return "???";
}
static int inet_show_sock(struct nlmsghdr *nlh, struct filter *f, int protocol)
{ {
struct rtattr * tb[INET_DIAG_MAX+1]; struct rtattr * tb[INET_DIAG_MAX+1];
struct inet_diag_msg *r = NLMSG_DATA(nlh); struct inet_diag_msg *r = NLMSG_DATA(nlh);
@ -1487,7 +1501,7 @@ static int inet_show_sock(struct nlmsghdr *nlh, struct filter *f)
return 0; return 0;
if (netid_width) if (netid_width)
printf("%-*s ", netid_width, "tcp"); printf("%-*s ", netid_width, proto_name(protocol));
if (state_width) if (state_width)
printf("%-*s ", state_width, sstate_name[s.state]); printf("%-*s ", state_width, sstate_name[s.state]);
@ -1760,7 +1774,7 @@ again:
h = NLMSG_NEXT(h, status); h = NLMSG_NEXT(h, status);
continue; continue;
} }
err = inet_show_sock(h, NULL); err = inet_show_sock(h, NULL, protocol);
if (err < 0) { if (err < 0) {
close(fd); close(fd);
return err; return err;
@ -1839,7 +1853,7 @@ static int tcp_show_netlink_file(struct filter *f)
return -1; return -1;
} }
err = inet_show_sock(h, f); err = inet_show_sock(h, f, IPPROTO_TCP);
if (err < 0) if (err < 0)
return err; return err;
} }