diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-25 02:11:15 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-25 02:14:53 +0200 |
| commit | e9047736f79f18d2cd741b6af943be91e7839578 (patch) | |
| tree | 64d517eb90803b34731cf43dca64f290967ea709 /babeld | |
| parent | babeld: Send in the ifindex to zebra for route install (diff) | |
| download | frr-e9047736f79f18d2cd741b6af943be91e7839578.tar.xz frr-e9047736f79f18d2cd741b6af943be91e7839578.zip | |
babeld: Fix redistribute events for v4/6 up from zebra
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'babeld')
| -rw-r--r-- | babeld/babel_zebra.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/babeld/babel_zebra.c b/babeld/babel_zebra.c index e09c26534..f54f5b346 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); |