Merge pull request #3465 from donaldsharp/nexthop_active_update

[mirror_frr.git] / zebra / zebra_fpm_protobuf.c

diff --git a/zebra/zebra_fpm_protobuf.c b/zebra/zebra_fpm_protobuf.c
index b850f1fb1e12f3ad3c862a9199c3c2b700273c93..be0f6a23be74224f4a83756306b5b30e784d4323 100644 (file)
--- a/zebra/zebra_fpm_protobuf.c
+++ b/zebra/zebra_fpm_protobuf.c
@@ -129,6 +129,7 @@ static inline int add_nexthop(qpb_allocator_t *allocator, Fpm__AddRoute *msg,
        }
 
        // TODO: Use src.
+       (void)src;
 
        return 1;
 }
@@ -163,6 +164,7 @@ static Fpm__AddRoute *create_add_route_message(qpb_allocator_t *allocator,
        msg->sub_address_family = QPB__SUB_ADDRESS_FAMILY__UNICAST;
        msg->key = fpm_route_key_create(allocator, rib_dest_prefix(dest));
        qpb_protocol_set(&msg->protocol, re->type);
+       msg->has_route_type = 1;
        msg->route_type = FPM__ROUTE_TYPE__NORMAL;
        msg->metric = re->metric;
 
@@ -170,7 +172,7 @@ static Fpm__AddRoute *create_add_route_message(qpb_allocator_t *allocator,
         * Figure out the set of nexthops to be added to the message.
         */
        num_nhs = 0;
-       for (ALL_NEXTHOPS(re->nexthop, nexthop)) {
+       for (ALL_NEXTHOPS(re->ng, nexthop)) {
                if (num_nhs >= multipath_num)
                        break;
 
@@ -245,6 +247,7 @@ static Fpm__Message *create_route_message(qpb_allocator_t *allocator,
        fpm__message__init(msg);
 
        if (!re) {
+               msg->has_type = 1;
                msg->type = FPM__MESSAGE__TYPE__DELETE_ROUTE;
                msg->delete_route =
                        create_delete_route_message(allocator, dest, re);
@@ -255,6 +258,7 @@ static Fpm__Message *create_route_message(qpb_allocator_t *allocator,
                return msg;
        }
 
+       msg->has_type = 1;
        msg->type = FPM__MESSAGE__TYPE__ADD_ROUTE;
        msg->add_route = create_add_route_message(allocator, dest, re);
        if (!msg->add_route) {