zebra: upon RTM_NEWROUTE/DELROUTE, find appropriate interface

The interface lookup algorithm is different according to if we are on
netns vrf or not. If we are on the former case, then we only have to
parse the interfaces of the netns, while if we are on the other case, we
have to parse all the interfaces of all the vrfs ( since index is not
overlapping in the latter case).

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 90334915491e1c9f69c51314602c78fbf4386b3d..79922eb17eba9ec16f1826fa50aed6fcc13302c0 100644 (file)
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -483,7 +483,9 @@ static int netlink_route_change_read_unicast(struct nlmsghdr *h, ns_id_t ns_id,
                                memcpy(&nh.gate, gate, sz);
 
                        if (index) {
-                               ifp = if_lookup_by_index(index, VRF_UNKNOWN);
+                               ifp = if_lookup_by_index_per_ns(
+                                               zebra_ns_lookup(ns_id),
+                                               index);
                                if (ifp)
                                        nh_vrf_id = ifp->vrf_id;
                        }
@@ -526,8 +528,9 @@ static int netlink_route_change_read_unicast(struct nlmsghdr *h, ns_id_t ns_id,
                                         * using the last one looked
                                         * up right now
                                         */
-                                       ifp = if_lookup_by_index(index,
-                                                                VRF_UNKNOWN);
+                                       ifp = if_lookup_by_index_per_ns(
+                                                       zebra_ns_lookup(ns_id),
+                                                       index);
                                        if (ifp)
                                                nh_vrf_id = ifp->vrf_id;
                                        else {