* [PATCH] iproute: Fix Netid value for multi-families output
@ 2014-01-28 6:24 Pavel Emelyanov
2014-01-29 19:29 ` François-Xavier Le Bail
2014-02-10 22:48 ` Stephen Hemminger
0 siblings, 2 replies; 3+ messages in thread
From: Pavel Emelyanov @ 2014-01-28 6:24 UTC (permalink / raw)
To: Stephen Hemminger, Linux Netdev List; +Cc: François-Xavier Le Bail
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>
---
diff --git a/misc/ss.c b/misc/ss.c
index 764ffe2..37dcc11 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -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 inet_diag_msg *r = NLMSG_DATA(nlh);
@@ -1487,7 +1501,7 @@ static int inet_show_sock(struct nlmsghdr *nlh, struct filter *f)
return 0;
if (netid_width)
- printf("%-*s ", netid_width, "tcp");
+ printf("%-*s ", netid_width, proto_name(protocol));
if (state_width)
printf("%-*s ", state_width, sstate_name[s.state]);
@@ -1760,7 +1774,7 @@ again:
h = NLMSG_NEXT(h, status);
continue;
}
- err = inet_show_sock(h, NULL);
+ err = inet_show_sock(h, NULL, protocol);
if (err < 0) {
close(fd);
return err;
@@ -1839,7 +1853,7 @@ static int tcp_show_netlink_file(struct filter *f)
return -1;
}
- err = inet_show_sock(h, f);
+ err = inet_show_sock(h, f, IPPROTO_TCP);
if (err < 0)
return err;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] iproute: Fix Netid value for multi-families output
2014-01-28 6:24 [PATCH] iproute: Fix Netid value for multi-families output Pavel Emelyanov
@ 2014-01-29 19:29 ` François-Xavier Le Bail
2014-02-10 22:48 ` Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: François-Xavier Le Bail @ 2014-01-29 19:29 UTC (permalink / raw)
To: Stephen Hemminger, Linux Netdev List, Pavel Emelyanov
On Tue, 1/28/14, Pavel Emelyanov <xemul@parallels.com> wrote:
> When requesting simultaneous output of TCP and UDP sockets
> the netid field shows "tcp" always.
[...]
> 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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] iproute: Fix Netid value for multi-families output
2014-01-28 6:24 [PATCH] iproute: Fix Netid value for multi-families output Pavel Emelyanov
2014-01-29 19:29 ` François-Xavier Le Bail
@ 2014-02-10 22:48 ` Stephen Hemminger
1 sibling, 0 replies; 3+ messages in thread
From: Stephen Hemminger @ 2014-02-10 22:48 UTC (permalink / raw)
To: Pavel Emelyanov
Cc: Stephen Hemminger, Linux Netdev List,
François-Xavier Le Bail
On Tue, 28 Jan 2014 10:24:15 +0400
Pavel Emelyanov <xemul@parallels.com> wrote:
> When requesting simultaneous output of TCP and UDP sockets
> the netid field shows "tcp" always.
Applied
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-10 22:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-28 6:24 [PATCH] iproute: Fix Netid value for multi-families output Pavel Emelyanov
2014-01-29 19:29 ` François-Xavier Le Bail
2014-02-10 22:48 ` Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).