From: Denis Ovsienko <infrastation@yandex.ru>
Date: Sat, 21 Jan 2012 19:16:00 +0000 (+0400)
Subject: babeld: add MP-specific zclient API fix
X-Git-Tag: frr-2.0-rc1~1871^2~43
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a19a3bf94740aebff6fdfc76f3d4b17c0013fae4;p=matthieu%2Ffrr.git

babeld: add MP-specific zclient API fix

Add proper initialization of SAFI field, which is present in the
revisions of zapi_ipv4 and zapi_ipv6 structures specific to
MP-BGP patchset. Without this change no Babel routes could make
into zebra RIB.
---

diff --git a/babeld/kernel_zebra.c b/babeld/kernel_zebra.c
index 7ddc797dc6..53da5f4021 100644
--- a/babeld/kernel_zebra.c
+++ b/babeld/kernel_zebra.c
@@ -206,6 +206,7 @@ kernel_route_add_v4(const unsigned char *pref, unsigned short plen,
     api.type  = ZEBRA_ROUTE_BABEL;
     api.flags = 0;
     api.message = 0;
+    api.safi = SAFI_UNICAST;
     SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
     api.nexthop_num = 1;
     api.nexthop = &nexthop_pointer;
@@ -248,6 +249,7 @@ kernel_route_add_v6(const unsigned char *pref, unsigned short plen,
     api.type  = ZEBRA_ROUTE_BABEL;
     api.flags = 0;
     api.message = 0;
+    api.safi = SAFI_UNICAST;
     SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
     api.nexthop_num = 1;
     api.nexthop = &nexthop_pointer;
@@ -291,6 +293,7 @@ kernel_route_delete_v4(const unsigned char *pref, unsigned short plen,
     api.type  = ZEBRA_ROUTE_BABEL;
     api.flags = 0;
     api.message = 0;
+    api.safi = SAFI_UNICAST;
     SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
     api.nexthop_num = 1;
     api.nexthop = &nexthop_pointer;
@@ -334,6 +337,7 @@ kernel_route_delete_v6(const unsigned char *pref, unsigned short plen,
     api.type  = ZEBRA_ROUTE_BABEL;
     api.flags = 0;
     api.message = 0;
+    api.safi = SAFI_UNICAST;
     SET_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP);
     api.nexthop_num = 1;
     api.nexthop = &nexthop_pointer;