diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/log.c | 1 | ||||
| -rw-r--r-- | lib/zclient.c | 76 | ||||
| -rw-r--r-- | lib/zclient.h | 18 |
3 files changed, 62 insertions, 33 deletions
@@ -1041,6 +1041,7 @@ static const struct zebra_desc_table command_types[] = { DESC_ENTRY(ZEBRA_INTERFACE_LINK_PARAMS), DESC_ENTRY(ZEBRA_MPLS_LABELS_ADD), DESC_ENTRY(ZEBRA_MPLS_LABELS_DELETE), + DESC_ENTRY(ZEBRA_MPLS_LABELS_REPLACE), DESC_ENTRY(ZEBRA_IPMR_ROUTE_STATS), DESC_ENTRY(ZEBRA_LABEL_MANAGER_CONNECT), DESC_ENTRY(ZEBRA_LABEL_MANAGER_CONNECT_ASYNC), diff --git a/lib/zclient.c b/lib/zclient.c index a82484e42d..92a495ac61 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -2461,6 +2461,8 @@ int zebra_send_mpls_labels(struct zclient *zclient, int cmd, int zapi_labels_encode(struct stream *s, int cmd, struct zapi_labels *zl) { + struct zapi_nexthop_label *znh; + stream_reset(s); zclient_create_header(s, cmd, VRF_DEFAULT); @@ -2475,20 +2477,34 @@ int zapi_labels_encode(struct stream *s, int cmd, struct zapi_labels *zl) stream_putw(s, zl->route.instance); } - stream_putc(s, zl->nexthop.type); - stream_putw(s, zl->nexthop.family); - switch (zl->nexthop.family) { - case AF_INET: - stream_put_in_addr(s, &zl->nexthop.address.ipv4); - break; - case AF_INET6: - stream_write(s, (uint8_t *)&zl->nexthop.address.ipv6, 16); - break; - default: - break; + if (zl->nexthop_num > MULTIPATH_NUM) { + flog_err( + EC_LIB_ZAPI_ENCODE, + "%s: label %u: can't encode %u nexthops (maximum is %u)", + __func__, zl->local_label, zl->nexthop_num, + MULTIPATH_NUM); + return -1; + } + stream_putw(s, zl->nexthop_num); + + for (int i = 0; i < zl->nexthop_num; i++) { + znh = &zl->nexthops[i]; + + stream_putc(s, znh->type); + stream_putw(s, znh->family); + switch (znh->family) { + case AF_INET: + stream_put_in_addr(s, &znh->address.ipv4); + break; + case AF_INET6: + stream_write(s, (uint8_t *)&znh->address.ipv6, 16); + break; + default: + break; + } + stream_putl(s, znh->ifindex); + stream_putl(s, znh->label); } - stream_putl(s, zl->nexthop.ifindex); - stream_putl(s, zl->nexthop.label); /* Put length at the first point of the stream. */ stream_putw_at(s, 0, stream_get_endp(s)); @@ -2498,6 +2514,8 @@ int zapi_labels_encode(struct stream *s, int cmd, struct zapi_labels *zl) int zapi_labels_decode(struct stream *s, struct zapi_labels *zl) { + struct zapi_nexthop_label *znh; + memset(zl, 0, sizeof(*zl)); /* Get data. */ @@ -2545,20 +2563,26 @@ int zapi_labels_decode(struct stream *s, struct zapi_labels *zl) STREAM_GETW(s, zl->route.instance); } - STREAM_GETC(s, zl->nexthop.type); - STREAM_GETW(s, zl->nexthop.family); - switch (zl->nexthop.family) { - case AF_INET: - STREAM_GET(&zl->nexthop.address.ipv4.s_addr, s, IPV4_MAX_BYTELEN); - break; - case AF_INET6: - STREAM_GET(&zl->nexthop.address.ipv6, s, 16); - break; - default: - break; + STREAM_GETW(s, zl->nexthop_num); + for (int i = 0; i < zl->nexthop_num; i++) { + znh = &zl->nexthops[i]; + + STREAM_GETC(s, znh->type); + STREAM_GETW(s, znh->family); + switch (znh->family) { + case AF_INET: + STREAM_GET(&znh->address.ipv4.s_addr, s, + IPV4_MAX_BYTELEN); + break; + case AF_INET6: + STREAM_GET(&znh->address.ipv6, s, 16); + break; + default: + break; + } + STREAM_GETL(s, znh->ifindex); + STREAM_GETL(s, znh->label); } - STREAM_GETL(s, zl->nexthop.ifindex); - STREAM_GETL(s, zl->nexthop.label); return 0; stream_failure: diff --git a/lib/zclient.h b/lib/zclient.h index e0da1cbe32..eb3c97b111 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -126,6 +126,7 @@ typedef enum { ZEBRA_INTERFACE_LINK_PARAMS, ZEBRA_MPLS_LABELS_ADD, ZEBRA_MPLS_LABELS_DELETE, + ZEBRA_MPLS_LABELS_REPLACE, ZEBRA_IPMR_ROUTE_STATS, ZEBRA_LABEL_MANAGER_CONNECT, ZEBRA_LABEL_MANAGER_CONNECT_ASYNC, @@ -395,6 +396,14 @@ struct zapi_route { uint32_t tableid; }; +struct zapi_nexthop_label { + enum nexthop_types_t type; + int family; + union g_addr address; + ifindex_t ifindex; + mpls_label_t label; +}; + struct zapi_labels { uint8_t message; #define ZAPI_LABELS_FTN 0x01 @@ -405,13 +414,8 @@ struct zapi_labels { uint8_t type; unsigned short instance; } route; - struct { - enum nexthop_types_t type; - int family; - union g_addr address; - ifindex_t ifindex; - mpls_label_t label; - } nexthop; + uint16_t nexthop_num; + struct zapi_nexthop_label nexthops[MULTIPATH_NUM]; }; struct zapi_pw { |