commit 1885d0a5274cd78e46ad6c22171a5240a2f27f64
author Feng Lu <lu.feng@6wind.com> Fri May 22 11:40:04 2015 +0200
committer David Lamparter <equinox@opensourcerouting.org> Tue Jun 02 07:48:34 2015 +0200
tree acaf9496dcdd722400d5634e58180f17350cc0b6
parent 4364ee5b6f65008fe19225f05e489ad8257a7df8

zebra: let the route-map rule "match interface" work for VRFs

Introduce a new "struct nexthop_vrfid" to specify a nexthop together
with the VRF ID it belongs to.

Thus in route_match_interface(), we can lookup the interface from
the correct VRF.

Signed-off-by: Feng Lu <lu.feng@6wind.com>
Reviewed-by: Alain Ritoux <alain.ritoux@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Vincent JARDIN <vincent.jardin@6wind.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

zebra/rib.h

diff --git a/zebra/rib.h b/zebra/rib.h
index 2d8805a..84cd3da 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -317,6 +317,14 @@
                                       : ((tnexthop) = (nexthop)->next)) \
                        : (((recursing) = 0),((tnexthop) = (tnexthop)->next)))
 
+/* Structure holding nexthop & VRF identifier,
+ * used for applying the route-map. */
+struct nexthop_vrfid
+{
+  struct nexthop *nexthop;
+  vrf_id_t vrf_id;
+};
+
 /* Routing table instance.  */
 struct zebra_vrf
 {

zebra/zebra_rib.c

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 336b566..8bd4ecc 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1066,7 +1066,8 @@
   if (!rmap && proto_rm[family][ZEBRA_ROUTE_MAX])
     rmap = route_map_lookup_by_name (proto_rm[family][ZEBRA_ROUTE_MAX]);
   if (rmap) {
-      ret = route_map_apply(rmap, &rn->p, RMAP_ZEBRA, nexthop);
+      struct nexthop_vrfid nh_vrf = {nexthop, rib->vrf_id};
+      ret = route_map_apply(rmap, &rn->p, RMAP_ZEBRA, &nh_vrf);
   }
 
   if (ret == RMAP_DENYMATCH)

zebra/zebra_routemap.c

diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index b0dca08..f373775 100644
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -130,6 +130,7 @@
 route_match_interface (void *rule, struct prefix *prefix,
 		       route_map_object_t type, void *object)
 {
+  struct nexthop_vrfid *nh_vrf;
   struct nexthop *nexthop;
   char *ifname = rule;
   unsigned int ifindex;
@@ -138,10 +139,13 @@
     {
       if (strcasecmp(ifname, "any") == 0)
 	return RMAP_MATCH;
-      ifindex = ifname2ifindex(ifname);
+      nh_vrf = object;
+      if (!nh_vrf)
+	return RMAP_NOMATCH;
+      ifindex = ifname2ifindex_vrf (ifname, nh_vrf->vrf_id);
       if (ifindex == 0)
 	return RMAP_NOMATCH;
-      nexthop = object;
+      nexthop = nh_vrf->nexthop;
       if (!nexthop)
 	return RMAP_NOMATCH;
       if (nexthop->ifindex == ifindex)