From fac4d51eea6cad22d5224ff5a0c538ce2ccdeada Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Mon, 2 Jul 2018 10:33:00 +0200 Subject: [PATCH] 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 --- zebra/rt_netlink.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 9033491549..79922eb17e 100644 --- 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 { -- 2.39.5