commit 346f8ca81481a248a6bb0058445ab7bf3123e60b
author Pavel Emelyanov <xemul@parallels.com> Thu Oct 25 03:24:58 2012 +0000
committer Stephen Hemminger <shemminger@vyatta.com> Fri Oct 26 17:48:49 2012 -0700
tree ca1c43886926c24f99e7b196c6f68be59849d8e8
parent 886d19d6c93546db7c093df07a71c38cda6c1694

ss: Get udp sockets info via sock-diag

Now everything is prepared for it, so the patch is straightforward.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

misc/ss.c

diff --git a/misc/ss.c b/misc/ss.c
index 1ceb026..a0ab2e9 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -1508,6 +1508,9 @@
 	struct rtattr rta;
 	struct iovec iov[3];
 
+	if (protocol == IPPROTO_UDP)
+		return -1;
+
 	memset(&nladdr, 0, sizeof(nladdr));
 	nladdr.nl_family = AF_NETLINK;
 
@@ -1976,6 +1979,10 @@
 {
 	FILE *fp = NULL;
 
+	if (!getenv("PROC_NET_UDP") && !getenv("PROC_ROOT")
+	    && inet_show_netlink(f, NULL, IPPROTO_UDP) == 0)
+		return 0;
+
 	dg_proto = UDP_PROTO;
 
 	if (f->families&(1<<AF_INET)) {