]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
iproute: Fix for missing 'Oifs:' display
authorPhil Sutter <phil@nwl.cc>
Thu, 17 Aug 2017 17:09:27 +0000 (19:09 +0200)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 22 Aug 2017 00:12:21 +0000 (17:12 -0700)
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>
ip/iproute.c

index cb695ad4141a7f7a8249c74371fb78ca66783cd5..89caac124f4897c445bec4fb503c9630dcab68ae 100644 (file)
@@ -624,7 +624,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]);
 
@@ -634,10 +634,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)) {