zebra: flow control (Coverity 1462467 1465497)

Signed-off-by: F. Aragon <paco@voltanet.io>

diff --git a/zebra/zebra_netns_id.c b/zebra/zebra_netns_id.c
index 317b02f601139d4182f85c8a2c01c8cc2038f9ba..96e6df34da9c1514e3669716b44abc76927a3bad 100644 (file)
--- a/zebra/zebra_netns_id.c
+++ b/zebra/zebra_netns_id.c
@@ -307,7 +307,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath)
                        nlh = (struct nlmsghdr *)((char *)nlh
                                                  + NETLINK_ALIGN(
                                                            nlh->nlmsg_len));
-               } while (len != 0 && return_nsid != NS_UNKNOWN && ret == 0);
+               } while (len != 0 && ret == 0);
        }
 
        close(fd);

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index bd00823ed82d1c63d0228e10a02107141dd1dc94..8935956b2572f94a3e4d02a01ea9e63c4cd8a1c2 100644 (file)
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1428,18 +1428,14 @@ static void rib_process_update_fib(struct zebra_vrf *zvrf,
                                if (new != old)
                                        zlog_debug(
                                                "%u:%s: Deleting route rn %p, re %p (type %d) "
-                                               "old %p (type %d) - %s",
+                                               "old %p (type %d) - nexthop inactive",
                                                zvrf_id(zvrf), buf, rn, new,
-                                               new->type, old, old->type,
-                                               nh_active ? "install failed"
-                                                         : "nexthop inactive");
+                                               new->type, old, old->type);
                                else
                                        zlog_debug(
-                                               "%u:%s: Deleting route rn %p, re %p (type %d) - %s",
+                                               "%u:%s: Deleting route rn %p, re %p (type %d) - nexthop inactive",
                                                zvrf_id(zvrf), buf, rn, new,
-                                               new->type,
-                                               nh_active ? "install failed"
-                                                         : "nexthop inactive");
+                                               new->type);
                        }
 
                        /* If labeled-unicast route, uninstall transit LSP. */