From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 25 May 2017 00:11:15 +0000 (-0400)
Subject: babeld: Fix redistribute events for v4/6 up from zebra
X-Git-Tag: reindent-master-before~74^2~15
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e9047736f79f18d2cd741b6af943be91e7839578;p=matthieu%2Ffrr.git

babeld: Fix redistribute events for v4/6 up from zebra

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/babeld/babel_zebra.c b/babeld/babel_zebra.c
index e09c265347..f54f5b3469 100644
--- a/babeld/babel_zebra.c
+++ b/babeld/babel_zebra.c
@@ -102,7 +102,8 @@ babel_zebra_read_ipv6 (int command, struct zclient *zclient,
 
     /* Type, flags, message. */
     api.type = stream_getc (s);
-    api.flags = stream_getc (s);
+    api.instance = stream_getw (s);
+    api.flags = stream_getl (s);
     api.message = stream_getc (s);
 
     /* IPv6 prefix. */
@@ -128,7 +129,7 @@ babel_zebra_read_ipv6 (int command, struct zclient *zclient,
     else
         api.metric = 0;
 
-    if (command == ZEBRA_IPV6_ROUTE_ADD)
+    if (command == ZEBRA_REDISTRIBUTE_IPV6_ADD)
         babel_ipv6_route_add(&api, &prefix, ifindex, &nexthop);
     else
         babel_ipv6_route_delete(&api, &prefix, ifindex);
@@ -154,7 +155,8 @@ babel_zebra_read_ipv4 (int command, struct zclient *zclient,
 
     /* Type, flags, message. */
     api.type = stream_getc (s);
-    api.flags = stream_getc (s);
+    api.instance = stream_getw (s);
+    api.flags = stream_getl (s);
     api.message = stream_getc (s);
 
     /* IPv6 prefix. */
@@ -180,7 +182,7 @@ babel_zebra_read_ipv4 (int command, struct zclient *zclient,
     else
         api.metric = 0;
 
-    if (command == ZEBRA_IPV4_ROUTE_ADD) {
+    if (command == ZEBRA_REDISTRIBUTE_IPV4_ADD) {
         babel_ipv4_route_add(&api, &prefix, ifindex, &nexthop);
     } else {
         babel_ipv4_route_delete(&api, &prefix, ifindex);