diff options
| -rw-r--r-- | qpb/qpb.h | 3 | ||||
| -rw-r--r-- | zebra/zebra_fpm_protobuf.c | 6 | ||||
| -rw-r--r-- | zebra/zserv.c | 1 |
3 files changed, 6 insertions, 4 deletions
@@ -78,6 +78,8 @@ qpb__address_family__get (Qpb__AddressFamily pb_family, u_char *family) case QPB__ADDRESS_FAMILY__UNKNOWN_AF: return 0; + default: /* protobuf "magic value" _QPB__ADDRESS_FAMILY_IS_INT_SIZE */ + return 0; } return 0; @@ -184,7 +186,6 @@ qpb__protocol__set (Qpb__Protocol *pb_proto, int route_type) case ZEBRA_ROUTE_HSLS: case ZEBRA_ROUTE_OLSR: - case ZEBRA_ROUTE_BABEL: case ZEBRA_ROUTE_MAX: case ZEBRA_ROUTE_SYSTEM: default: 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; diff --git a/zebra/zserv.c b/zebra/zserv.c index 27d10a1718..8fcc837c53 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -53,6 +53,7 @@ #include "zebra/zebra_ptm.h" #include "zebra/rtadv.h" #include "zebra/zebra_mpls.h" +#include "zebra/zebra_fpm.h" /* Event list of zebra. */ enum event { ZEBRA_SERV, ZEBRA_READ, ZEBRA_WRITE }; |