From ea6b290bf6a29aa06888c93dae9bec4581ce686f Mon Sep 17 00:00:00 2001 From: Renato Westphal Date: Thu, 8 Aug 2019 15:57:13 -0300 Subject: lib, zebra: add new MPLS zapi message with route replace semantics This new message makes it possible to install/reinstall LSPs with multiple nexthops using a single ZAPI message. Signed-off-by: Renato Westphal --- ldpd/ldp_zebra.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'ldpd/ldp_zebra.c') diff --git a/ldpd/ldp_zebra.c b/ldpd/ldp_zebra.c index 5582b95c83..884ae159be 100644 --- a/ldpd/ldp_zebra.c +++ b/ldpd/ldp_zebra.c @@ -109,6 +109,7 @@ static int ldp_zebra_send_mpls_labels(int cmd, struct kroute *kr) { struct zapi_labels zl = {}; + struct zapi_nexthop_label *znh; if (kr->local_label < MPLS_LABEL_RESERVED_MAX || kr->remote_label == NO_LABEL) @@ -141,28 +142,30 @@ ldp_zebra_send_mpls_labels(int cmd, struct kroute *kr) zl.route.instance = kr->route_instance; /* Set nexthop. */ + zl.nexthop_num = 1; + znh = &zl.nexthops[0]; switch (kr->af) { case AF_INET: - zl.nexthop.family = AF_INET; - zl.nexthop.address.ipv4 = kr->nexthop.v4; + znh->family = AF_INET; + znh->address.ipv4 = kr->nexthop.v4; if (kr->ifindex) - zl.nexthop.type = NEXTHOP_TYPE_IPV4_IFINDEX; + znh->type = NEXTHOP_TYPE_IPV4_IFINDEX; else - zl.nexthop.type = NEXTHOP_TYPE_IPV4; + znh->type = NEXTHOP_TYPE_IPV4; break; case AF_INET6: - zl.nexthop.family = AF_INET6; - zl.nexthop.address.ipv6 = kr->nexthop.v6; + znh->family = AF_INET6; + znh->address.ipv6 = kr->nexthop.v6; if (kr->ifindex) - zl.nexthop.type = NEXTHOP_TYPE_IPV6_IFINDEX; + znh->type = NEXTHOP_TYPE_IPV6_IFINDEX; else - zl.nexthop.type = NEXTHOP_TYPE_IPV6; + znh->type = NEXTHOP_TYPE_IPV6; break; default: break; } - zl.nexthop.ifindex = kr->ifindex; - zl.nexthop.label = kr->remote_label; + znh->ifindex = kr->ifindex; + znh->label = kr->remote_label; return zebra_send_mpls_labels(zclient, cmd, &zl); } -- cgit v1.2.3