commit aef4650851cf0f74d944466d50e26bb8f8635c3d
author Stas Nichiporovich <stas@iptel.by> Tue Apr 26 08:14:36 2016 +0000
committer Donald Sharp <sharpd@cumulusnetworks.com> Fri Apr 29 19:46:16 2016 -0400
tree 0fa32e61bc3c9d715247091fd3003690b3e056a1
parent bb01bdd740339b0c07d8ed0786811801b2a79192

zebra: fix crash caused by using route-map with "set src"

Signed-off-by: Stas Nichiporovich <stas@iptel.by>
Tested-by: NetDEF CI System <cisystem@netdef.org>

zebra/zebra_routemap.c

diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index da9cb13..49feccd 100644
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -424,11 +424,13 @@
 {
   struct access_list *alist;
   struct nexthop *nexthop;
+  struct nexthop_vrfid *nh_vrf;
   struct prefix_ipv4 p;
 
   if (type == RMAP_ZEBRA)
     {
-      nexthop = object;
+      nh_vrf = object;
+      nexthop = nh_vrf->nexthop;
       switch (nexthop->type) {
       case NEXTHOP_TYPE_IFINDEX:
       case NEXTHOP_TYPE_IFNAME:
@@ -486,11 +488,13 @@
 {
   struct prefix_list *plist;
   struct nexthop *nexthop;
+  struct nexthop_vrfid *nh_vrf;
   struct prefix_ipv4 p;
 
   if (type == RMAP_ZEBRA)
     {
-      nexthop = object;
+      nh_vrf = object;
+      nexthop = nh_vrf->nexthop;
       switch (nexthop->type) {
       case NEXTHOP_TYPE_IFINDEX:
       case NEXTHOP_TYPE_IFNAME:
@@ -632,10 +636,10 @@
 {
   if (type == RMAP_ZEBRA)
     {
-      struct nexthop *nexthop;
+      struct nexthop_vrfid *nh_vrf;
 
-      nexthop = object;
-      nexthop->src = *(union g_addr *)rule;
+      nh_vrf = object;
+      nh_vrf->nexthop->src = *(union g_addr *)rule;
     }
   return RMAP_OKAY;
 }