File iproute-Fix-for-missing-Oifs-display.patch of Package iproute2

Overview Repositories Revisions Requests Users Attributes Meta

File iproute-Fix-for-missing-Oifs-display.patch of Package iproute2 (Revision 10b09744f30dc355771f1440b56f80da)

Currently displaying revision 10b09744f30dc355771f1440b56f80da , Show latest

From: Phil Sutter <phil@nwl.cc>
Date: Thu, 17 Aug 2017 19:09:27 +0200
Subject: iproute: Fix for missing 'Oifs:' display
Patch-mainline: v4.13.0
Git-commit: 2a866256197f8b86e61fa1afc99b11d7056d5686
References: bsc#1085669

Covscan complained about dead code but after reading it, I assume the
author's intention was to prefix the interface list with 'Oifs: '.
Initializing first to 1 and setting it to 0 after above prefix was
printed should fix it.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Michal Kubecek <mkubecek@suse.cz>

---
 ip/iproute.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ip/iproute.c b/ip/iproute.c
index 4fd36a1e5b74..a37a7fad5ebf 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -621,7 +621,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 	}
 	if (tb[RTA_MULTIPATH]) {
 		struct rtnexthop *nh = RTA_DATA(tb[RTA_MULTIPATH]);
-		int first = 0;
+		int first = 1;
 
 		len = RTA_PAYLOAD(tb[RTA_MULTIPATH]);
 
@@ -631,10 +631,12 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 			if (nh->rtnh_len > len)
 				break;
 			if (r->rtm_flags&RTM_F_CLONED && r->rtm_type == RTN_MULTICAST) {
-				if (first)
+				if (first) {
 					fprintf(fp, "Oifs: ");
-				else
+					first = 0;
+				} else {
 					fprintf(fp, " ");
+				}
 			} else
 				fprintf(fp, "%s\tnexthop ", _SL_);
 			if (nh->rtnh_len > sizeof(*nh)) {
-- 
2.16.2

Places

File iproute-Fix-for-missing-Oifs-display.patch of Package iproute2 (Revision 10b09744f30dc355771f1440b56f80da)

Places