From da857abe6dfbcdc67bfd58f4c5a6c8d4d98a63509a260f6eaa7ab75e73992541 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 19 Feb 2009 21:30:00 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/iproute2?expand=0&rev=18

---
 iproute2-2.6.25-ss-inet6.diff | 32 ++++++++++++++++++++++++++++++++
 iproute2.changes              |  6 ++++++
 iproute2.spec                 |  7 ++++++-
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 iproute2-2.6.25-ss-inet6.diff

diff --git a/iproute2-2.6.25-ss-inet6.diff b/iproute2-2.6.25-ss-inet6.diff
new file mode 100644
index 0000000..f71e842
--- /dev/null
+++ b/iproute2-2.6.25-ss-inet6.diff
@@ -0,0 +1,32 @@
+--- misc/ss.c	2009-02-19 13:55:43.000000000 +0100
++++ misc/ss.c	2009-02-19 13:58:07.000000000 +0100
+@@ -1509,6 +1509,7 @@
+ 		h = (struct nlmsghdr*)buf;
+ 		while (NLMSG_OK(h, status)) {
+ 			int err;
++			struct inet_diag_msg *r = NLMSG_DATA(h);
+ 
+ 			if (/*h->nlmsg_pid != rth->local.nl_pid ||*/
+ 			    h->nlmsg_seq != 123456)
+@@ -1527,6 +1528,10 @@
+ 				return 0;
+ 			}
+ 			if (!dump_fp) {
++				if (!(f->families & (1<<r->idiag_family))) {
++					h = NLMSG_NEXT(h, status);
++					continue;
++				}
+ 				err = tcp_show_sock(h, NULL);
+ 				if (err < 0)
+ 					return err;
+@@ -2634,9 +2639,7 @@
+ 		int mask2;
+ 		if (preferred_family == AF_INET ||
+ 		    preferred_family == AF_INET6) {
+-			mask2= (1<<TCP_DB);
+-			if (!do_default)
+-				mask2 = (1<<UDP_DB)|(1<<RAW_DB);
++			mask2= current_filter.dbs;
+ 		} else if (preferred_family == AF_PACKET) {
+ 			mask2 = PACKET_DBM;
+ 		} else if (preferred_family == AF_UNIX) {
diff --git a/iproute2.changes b/iproute2.changes
index a7ead4d..c23a8c1 100644
--- a/iproute2.changes
+++ b/iproute2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 19 14:03:23 CET 2009 - ms@suse.de
+
+- fixed ss utility to display inet6 addresses if requested
+  with -6 or -f inet6 (bnc #473156)
+
 -------------------------------------------------------------------
 Tue Jan 27 11:47:57 CET 2009 - ms@suse.de
 
diff --git a/iproute2.spec b/iproute2.spec
index 81a9804..a7a5470 100644
--- a/iproute2.spec
+++ b/iproute2.spec
@@ -25,7 +25,7 @@ Group:          Productivity/Networking/Routing
 Provides:       iproute 
 AutoReqProv:    on
 Version:        2.6.25
-Release:        43
+Release:        45
 Summary:        Advanced Routing
 Url:            http://developer.osdl.org/dev/iproute2/
 Source0:        %name-%version.tar.bz2
@@ -42,6 +42,7 @@ Patch9:         %name-2.6.25-DCCP-redefine
 Patch10:        %name-2.6.25-warnings.diff
 Patch11:        %name-2.6.25-hw-address-size.diff
 Patch12:        %name-2.6.25-skbedit-memset.diff
+Patch13:        %name-2.6.25-ss-inet6.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %package -n libnetlink-devel
@@ -83,6 +84,7 @@ Authors:
 %patch10
 %patch11 -p1
 %patch12
+%patch13
 find . -name *.orig -print0 | xargs -r0 rm -v
 
 %build
@@ -133,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %_libdir/lib*
 
 %changelog
+* Thu Feb 19 2009 ms@suse.de
+- fixed ss utility to display inet6 addresses if requested
+  with -6 or -f inet6 (bnc #473156)
 * Tue Jan 27 2009 ms@suse.de
 - fixed a bug in which the memory for the tc_skbedit struct was
   being used uninitialized to 0.  This patch corrects the issue