summaryrefslogtreecommitdiff
path: root/zebra/zebra_fpm_protobuf.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2016-09-21 12:45:46 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-09-23 12:12:17 -0400
commit518acd6fd802dbb5ab30db7d12b9995f582b824f (patch)
tree030866a4aef697a6c87faec9976f1901e1e11059 /zebra/zebra_fpm_protobuf.c
parentb80f3b245caa3ff1cf40b5a0d7be47540ffd6d4c (diff)
fpm/protobuf: fix compile errors & warnings
BABEL was removed, ifname nexthops were removed, additional includes were needed, and lastly the protobuf enum-handling triggers a warning. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'zebra/zebra_fpm_protobuf.c')
-rw-r--r--zebra/zebra_fpm_protobuf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/zebra/zebra_fpm_protobuf.c b/zebra/zebra_fpm_protobuf.c
index beef310b17..702c355f1a 100644
--- a/zebra/zebra_fpm_protobuf.c
+++ b/zebra/zebra_fpm_protobuf.c
@@ -26,6 +26,8 @@
#include "log.h"
#include "rib.h"
+#include "zserv.h"
+#include "zebra_vrf.h"
#include "qpb/qpb.pb-c.h"
#include "qpb/qpb.h"
@@ -91,14 +93,12 @@ add_nexthop (qpb_allocator_t *allocator, Fpm__AddRoute *msg, rib_dest_t *dest,
}
if (nexthop->type == NEXTHOP_TYPE_IPV6
- || nexthop->type == NEXTHOP_TYPE_IPV6_IFNAME
|| nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX)
{
gateway = &nexthop->gate;
}
- if (nexthop->type == NEXTHOP_TYPE_IFINDEX
- || nexthop->type == NEXTHOP_TYPE_IFNAME)
+ if (nexthop->type == NEXTHOP_TYPE_IFINDEX)
{
if (nexthop->src.ipv4.s_addr)
src = &nexthop->src;