[PATCH 1/2] [IPROUTE2] Add missing LIBUTIL for dependencies.

[PATCH 1/2] [IPROUTE2] Add missing LIBUTIL for dependencies.

[John Heffner]

Signed-off-by: John Heffner <jheffner@psc.edu>
---
 Makefile |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index af0d5e4..7e4605c 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,8 @@ LDLIBS += -L../lib -lnetlink -lutil
 
 SUBDIRS=lib ip tc misc netem genl
 
-LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
+LIBUTIL=../lib/libutil.a
+LIBNETLINK=../lib/libnetlink.a $(LIBUTIL)
 
 all: Config
 	@set -e; \
-- 
1.5.3.rc4.29.g74276-dirty

[PATCH 2/2] [IPROUTE2] ss: parse bare integers are port numbers rather than IP addresses

[John Heffner]

Signed-off-by: John Heffner <jheffner@psc.edu>
---
 misc/ss.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/misc/ss.c b/misc/ss.c
index 5d14f13..d617f6d 100644
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -953,6 +953,10 @@ void *parse_hostcond(char *addr)
 	memset(&a, 0, sizeof(a));
 	a.port = -1;
 
+	/* Special case: integer by itself is considered a port number */
+	if (!get_integer(&a.port, addr, 0))
+		goto out;
+
 	if (fam == AF_UNIX || strncmp(addr, "unix:", 5) == 0) {
 		char *p;
 		a.addr.family = AF_UNIX;
-- 
1.5.3.rc4.29.g74276-dirty