diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bfd.c | 6 | ||||
| -rw-r--r-- | lib/ferr.c | 6 | ||||
| -rw-r--r-- | lib/prefix.h | 4 | ||||
| -rw-r--r-- | lib/zclient.c | 245 | ||||
| -rw-r--r-- | lib/zclient.h | 153 |
5 files changed, 219 insertions, 195 deletions
@@ -405,7 +405,7 @@ void bfd_client_sendmsg(struct zclient *zclient, int command, vrf_id_t vrf_id) { struct stream *s; - int ret; + enum zclient_send_status ret; /* Check socket. */ if (!zclient || zclient->sock < 0) { @@ -426,7 +426,7 @@ void bfd_client_sendmsg(struct zclient *zclient, int command, ret = zclient_send_message(zclient); - if (ret < 0) { + if (ret == ZCLIENT_SEND_FAILURE) { if (bfd_debug) zlog_debug( "bfd_client_sendmsg %ld: zclient_send_message() failed", @@ -542,7 +542,7 @@ int zclient_bfd_command(struct zclient *zc, struct bfd_session_arg *args) stream_putw_at(s, 0, stream_get_endp(s)); /* Send message to zebra. */ - if (zclient_send_message(zc) == -1) { + if (zclient_send_message(zc) == ZCLIENT_SEND_FAILURE) { if (bfd_debug) zlog_debug("%s: zclient_send_message failed", __func__); return -1; diff --git a/lib/ferr.c b/lib/ferr.c index 7b923da177..691da495cf 100644 --- a/lib/ferr.c +++ b/lib/ferr.c @@ -121,8 +121,12 @@ void log_ref_display(struct vty *vty, uint32_t code, bool json) if (code) { ref = log_ref_get(code); - if (!ref) + if (!ref) { + if (top) + json_object_free(top); + list_delete(&errlist); return; + } listnode_add(errlist, ref); } diff --git a/lib/prefix.h b/lib/prefix.h index d2cabf3104..b7fdc26369 100644 --- a/lib/prefix.h +++ b/lib/prefix.h @@ -479,7 +479,7 @@ extern void apply_mask_ipv4(struct prefix_ipv4 *); #define PREFIX_COPY(DST, SRC) \ *((struct prefix *)(DST)) = *((const struct prefix *)(SRC)) #define PREFIX_COPY_IPV4(DST, SRC) \ - *((struct prefix_ipv4 *)(DST)) = *((const struct prefix_ipv4 *)(SRC)); + *((struct prefix_ipv4 *)(DST)) = *((const struct prefix_ipv4 *)(SRC)) extern int prefix_ipv4_any(const struct prefix_ipv4 *); extern void apply_classful_mask_ipv4(struct prefix_ipv4 *); @@ -499,7 +499,7 @@ extern int str2prefix_ipv6(const char *, struct prefix_ipv6 *); extern void apply_mask_ipv6(struct prefix_ipv6 *); #define PREFIX_COPY_IPV6(DST, SRC) \ - *((struct prefix_ipv6 *)(DST)) = *((const struct prefix_ipv6 *)(SRC)); + *((struct prefix_ipv6 *)(DST)) = *((const struct prefix_ipv6 *)(SRC)) extern int ip6_masklen(struct in6_addr); extern void masklen2ip6(const int, struct in6_addr *); diff --git a/lib/zclient.c b/lib/zclient.c index bab1acf667..053014f86d 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -249,12 +249,12 @@ int zclient_socket_connect(struct zclient *zclient) return sock; } -static int zclient_failed(struct zclient *zclient) +static enum zclient_send_status zclient_failed(struct zclient *zclient) { zclient->fail++; zclient_stop(zclient); zclient_event(ZCLIENT_CONNECT, zclient); - return -1; + return ZCLIENT_SEND_FAILURE; } static int zclient_flush_data(struct thread *thread) @@ -277,15 +277,23 @@ static int zclient_flush_data(struct thread *thread) zclient->sock, &zclient->t_write); break; case BUFFER_EMPTY: + if (zclient->zebra_buffer_write_ready) + (*zclient->zebra_buffer_write_ready)(); break; } return 0; } -int zclient_send_message(struct zclient *zclient) +/* + * Returns: + * ZCLIENT_SEND_FAILED - is a failure + * ZCLIENT_SEND_SUCCESS - means we sent data to zebra + * ZCLIENT_SEND_BUFFERED - means we are buffering + */ +enum zclient_send_status zclient_send_message(struct zclient *zclient) { if (zclient->sock < 0) - return -1; + return ZCLIENT_SEND_FAILURE; switch (buffer_write(zclient->wb, zclient->sock, STREAM_DATA(zclient->obuf), stream_get_endp(zclient->obuf))) { @@ -296,13 +304,15 @@ int zclient_send_message(struct zclient *zclient) return zclient_failed(zclient); case BUFFER_EMPTY: THREAD_OFF(zclient->t_write); - break; + return ZCLIENT_SEND_SUCCESS; case BUFFER_PENDING: thread_add_write(zclient->master, zclient_flush_data, zclient, zclient->sock, &zclient->t_write); - break; + return ZCLIENT_SEND_BUFFERED; } - return 0; + + /* should not get here */ + return ZCLIENT_SEND_SUCCESS; } /* @@ -362,8 +372,8 @@ stream_failure: } /* Send simple Zebra message. */ -static int zebra_message_send(struct zclient *zclient, int command, - vrf_id_t vrf_id) +static enum zclient_send_status zebra_message_send(struct zclient *zclient, + int command, vrf_id_t vrf_id) { struct stream *s; @@ -377,7 +387,7 @@ static int zebra_message_send(struct zclient *zclient, int command, return zclient_send_message(zclient); } -int zclient_send_hello(struct zclient *zclient) +enum zclient_send_status zclient_send_hello(struct zclient *zclient) { struct stream *s; @@ -403,11 +413,13 @@ int zclient_send_hello(struct zclient *zclient) return zclient_send_message(zclient); } - return 0; + return ZCLIENT_SEND_SUCCESS; } -void zclient_send_vrf_label(struct zclient *zclient, vrf_id_t vrf_id, afi_t afi, - mpls_label_t label, enum lsp_types_t ltype) +enum zclient_send_status zclient_send_vrf_label(struct zclient *zclient, + vrf_id_t vrf_id, afi_t afi, + mpls_label_t label, + enum lsp_types_t ltype) { struct stream *s; @@ -419,7 +431,7 @@ void zclient_send_vrf_label(struct zclient *zclient, vrf_id_t vrf_id, afi_t afi, stream_putc(s, afi); stream_putc(s, ltype); stream_putw_at(s, 0, stream_get_endp(s)); - zclient_send_message(zclient); + return zclient_send_message(zclient); } /* Send register requests to zebra daemon for the information in a VRF. */ @@ -557,9 +569,10 @@ void zclient_send_dereg_requests(struct zclient *zclient, vrf_id_t vrf_id) } } -int zclient_send_router_id_update(struct zclient *zclient, - zebra_message_types_t type, afi_t afi, - vrf_id_t vrf_id) +enum zclient_send_status +zclient_send_router_id_update(struct zclient *zclient, + zebra_message_types_t type, afi_t afi, + vrf_id_t vrf_id) { struct stream *s = zclient->obuf; stream_reset(s); @@ -570,15 +583,16 @@ int zclient_send_router_id_update(struct zclient *zclient, } /* Send request to zebra daemon to start or stop RA. */ -void zclient_send_interface_radv_req(struct zclient *zclient, vrf_id_t vrf_id, - struct interface *ifp, int enable, - int ra_interval) +enum zclient_send_status +zclient_send_interface_radv_req(struct zclient *zclient, vrf_id_t vrf_id, + struct interface *ifp, int enable, + int ra_interval) { struct stream *s; /* If not connected to the zebra yet. */ if (zclient->sock < 0) - return; + return ZCLIENT_SEND_FAILURE; /* Form and send message. */ s = zclient->obuf; @@ -594,16 +608,17 @@ void zclient_send_interface_radv_req(struct zclient *zclient, vrf_id_t vrf_id, stream_putw_at(s, 0, stream_get_endp(s)); - zclient_send_message(zclient); + return zclient_send_message(zclient); } -int zclient_send_interface_protodown(struct zclient *zclient, vrf_id_t vrf_id, - struct interface *ifp, bool down) +enum zclient_send_status +zclient_send_interface_protodown(struct zclient *zclient, vrf_id_t vrf_id, + struct interface *ifp, bool down) { struct stream *s; if (zclient->sock < 0) - return -1; + return ZCLIENT_SEND_FAILURE; s = zclient->obuf; stream_reset(s); @@ -611,9 +626,7 @@ int zclient_send_interface_protodown(struct zclient *zclient, vrf_id_t vrf_id, stream_putl(s, ifp->ifindex); stream_putc(s, !!down); stream_putw_at(s, 0, stream_get_endp(s)); - zclient_send_message(zclient); - - return 0; + return zclient_send_message(zclient); } /* Make connection to zebra daemon. */ @@ -712,9 +725,9 @@ static int zclient_connect(struct thread *t) return zclient_start(zclient); } -int zclient_send_rnh(struct zclient *zclient, int command, - const struct prefix *p, bool exact_match, - vrf_id_t vrf_id) +enum zclient_send_status zclient_send_rnh(struct zclient *zclient, int command, + const struct prefix *p, + bool exact_match, vrf_id_t vrf_id) { struct stream *s; @@ -750,45 +763,10 @@ int zclient_send_rnh(struct zclient *zclient, int command, * The corresponding read ("xdr_decode") function on the server * side is zapi_route_decode(). * - * 0 1 2 3 4 5 6 7 8 9 A B C D E F 0 1 2 3 4 5 6 7 8 9 A B C D E F - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | Length (2) | Command | Route Type | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | ZEBRA Flags | Message Flags | Prefix length | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | Destination IPv4 Prefix for route | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | Nexthop count | - * +-+-+-+-+-+-+-+-+ - * - * - * A number of IPv4 nexthop(s) or nexthop interface index(es) are then - * described, as per the Nexthop count. Each nexthop described as: - * - * +-+-+-+-+-+-+-+-+ - * | Nexthop Type | Set to one of ZEBRA_NEXTHOP_* - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * | IPv4 Nexthop address or Interface Index number | - * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - * - * Alternatively, if the route is a blackhole route, then Nexthop count - * is set to 1 and a nexthop of type NEXTHOP_TYPE_BLACKHOLE is the sole - * nexthop. - * - * The original struct zapi_route_*() infrastructure was built around - * the traditional (32-bit "gate OR ifindex") nexthop data unit. - * A special encoding can be used to feed onlink (64-bit "gate AND ifindex") - * nexthops into zapi_route_encode() using the same zapi_route structure. - * This is done by setting zapi_route fields as follows: - * - .message |= ZAPI_MESSAGE_NEXTHOP | ZAPI_MESSAGE_ONLINK - * - .nexthop_num == .ifindex_num - * - .nexthop and .ifindex are filled with gate and ifindex parts of - * each compound nexthop, both in the same order - * * If ZAPI_MESSAGE_DISTANCE is set, the distance value is written as a 1 * byte value. * - * If ZAPI_MESSAGE_METRIC is set, the metric value is written as an 8 + * If ZAPI_MESSAGE_METRIC is set, the metric value is written as a 4 * byte value. * * If ZAPI_MESSAGE_TAG is set, the tag value is written as a 4 byte value @@ -797,11 +775,11 @@ int zclient_send_rnh(struct zclient *zclient, int command, * * XXX: No attention paid to alignment. */ -int zclient_route_send(uint8_t cmd, struct zclient *zclient, - struct zapi_route *api) +enum zclient_send_status +zclient_route_send(uint8_t cmd, struct zclient *zclient, struct zapi_route *api) { if (zapi_route_encode(cmd, zclient->obuf, api) < 0) - return -1; + return ZCLIENT_SEND_FAILURE; return zclient_send_message(zclient); } @@ -1058,7 +1036,8 @@ int zapi_nhg_encode(struct stream *s, int cmd, struct zapi_nhg *api_nhg) return 0; } -int zclient_nhg_send(struct zclient *zclient, int cmd, struct zapi_nhg *api_nhg) +enum zclient_send_status zclient_nhg_send(struct zclient *zclient, int cmd, + struct zapi_nhg *api_nhg) { api_nhg->proto = zclient->redist_default; @@ -1791,8 +1770,9 @@ stream_failure: * then set/unset redist[type] in the client handle (a struct zserv) for the * sending client */ -int zebra_redistribute_send(int command, struct zclient *zclient, afi_t afi, - int type, unsigned short instance, vrf_id_t vrf_id) +enum zclient_send_status +zebra_redistribute_send(int command, struct zclient *zclient, afi_t afi, + int type, unsigned short instance, vrf_id_t vrf_id) { struct stream *s; @@ -1809,8 +1789,9 @@ int zebra_redistribute_send(int command, struct zclient *zclient, afi_t afi, return zclient_send_message(zclient); } -int zebra_redistribute_default_send(int command, struct zclient *zclient, - afi_t afi, vrf_id_t vrf_id) +enum zclient_send_status +zebra_redistribute_default_send(int command, struct zclient *zclient, afi_t afi, + vrf_id_t vrf_id) { struct stream *s; @@ -2601,8 +2582,10 @@ stream_failure: * @param base Base for the label chunk. if MPLS_LABEL_BASE_ANY we do not care * @result 0 on success, -1 otherwise */ -int zclient_send_get_label_chunk(struct zclient *zclient, uint8_t keep, - uint32_t chunk_size, uint32_t base) +enum zclient_send_status zclient_send_get_label_chunk(struct zclient *zclient, + uint8_t keep, + uint32_t chunk_size, + uint32_t base) { struct stream *s; @@ -2610,7 +2593,7 @@ int zclient_send_get_label_chunk(struct zclient *zclient, uint8_t keep, zlog_debug("Getting Label Chunk"); if (zclient->sock < 0) - return -1; + return ZCLIENT_SEND_FAILURE; s = zclient->obuf; stream_reset(s); @@ -2826,7 +2809,7 @@ int tm_table_manager_connect(struct zclient *zclient) zlog_debug("Connecting to Table Manager"); if (zclient->sock < 0) - return -1; + return ZCLIENT_SEND_FAILURE; /* send request */ s = zclient->obuf; @@ -2842,7 +2825,7 @@ int tm_table_manager_connect(struct zclient *zclient) stream_putw_at(s, 0, stream_get_endp(s)); ret = zclient_send_message(zclient); - if (ret < 0) + if (ret == ZCLIENT_SEND_FAILURE) return -1; if (zclient_debug) @@ -2967,14 +2950,17 @@ int tm_release_table_chunk(struct zclient *zclient, uint32_t start, /* Put length at the first point of the stream. */ stream_putw_at(s, 0, stream_get_endp(s)); - return zclient_send_message(zclient); + if (zclient_send_message(zclient) == ZCLIENT_SEND_FAILURE) + return -1; + + return 0; } -int zebra_send_sr_policy(struct zclient *zclient, int cmd, - struct zapi_sr_policy *zp) +enum zclient_send_status zebra_send_sr_policy(struct zclient *zclient, int cmd, + struct zapi_sr_policy *zp) { if (zapi_sr_policy_encode(zclient->obuf, cmd, zp) < 0) - return -1; + return ZCLIENT_SEND_FAILURE; return zclient_send_message(zclient); } @@ -3056,11 +3042,11 @@ stream_failure: return -1; } -int zebra_send_mpls_labels(struct zclient *zclient, int cmd, - struct zapi_labels *zl) +enum zclient_send_status zebra_send_mpls_labels(struct zclient *zclient, + int cmd, struct zapi_labels *zl) { if (zapi_labels_encode(zclient->obuf, cmd, zl) < 0) - return -1; + return ZCLIENT_SEND_FAILURE; return zclient_send_message(zclient); } @@ -3221,7 +3207,8 @@ stream_failure: return -1; } -int zebra_send_pw(struct zclient *zclient, int command, struct zapi_pw *pw) +enum zclient_send_status zebra_send_pw(struct zclient *zclient, int command, + struct zapi_pw *pw) { struct stream *s; @@ -3247,7 +3234,7 @@ int zebra_send_pw(struct zclient *zclient, int command, struct zapi_pw *pw) break; default: flog_err(EC_LIB_ZAPI_ENCODE, "%s: unknown af", __func__); - return -1; + return ZCLIENT_SEND_FAILURE; } /* Put labels */ @@ -3316,7 +3303,8 @@ stream_failure: return; } -void zclient_send_mlag_register(struct zclient *client, uint32_t bit_map) +enum zclient_send_status zclient_send_mlag_register(struct zclient *client, + uint32_t bit_map) { struct stream *s; @@ -3327,15 +3315,16 @@ void zclient_send_mlag_register(struct zclient *client, uint32_t bit_map) stream_putl(s, bit_map); stream_putw_at(s, 0, stream_get_endp(s)); - zclient_send_message(client); + return zclient_send_message(client); } -void zclient_send_mlag_deregister(struct zclient *client) +enum zclient_send_status zclient_send_mlag_deregister(struct zclient *client) { - zebra_message_send(client, ZEBRA_MLAG_CLIENT_UNREGISTER, VRF_DEFAULT); + return zebra_message_send(client, ZEBRA_MLAG_CLIENT_UNREGISTER, VRF_DEFAULT); } -void zclient_send_mlag_data(struct zclient *client, struct stream *client_s) +enum zclient_send_status zclient_send_mlag_data(struct zclient *client, + struct stream *client_s) { struct stream *s; @@ -3346,7 +3335,7 @@ void zclient_send_mlag_data(struct zclient *client, struct stream *client_s) stream_put(s, client_s->data, client_s->endp); stream_putw_at(s, 0, stream_get_endp(s)); - zclient_send_message(client); + return zclient_send_message(client); } static void zclient_mlag_process_up(ZAPI_CALLBACK_ARGS) @@ -3371,17 +3360,17 @@ static void zclient_mlag_handle_msg(ZAPI_CALLBACK_ARGS) * Send an OPAQUE message, contents opaque to zebra. The message header * is a message subtype. */ -int zclient_send_opaque(struct zclient *zclient, uint32_t type, - const uint8_t *data, size_t datasize) +enum zclient_send_status zclient_send_opaque(struct zclient *zclient, + uint32_t type, const uint8_t *data, + size_t datasize) { - int ret; struct stream *s; uint16_t flags = 0; /* Check buffer size */ if (STREAM_SIZE(zclient->obuf) < (ZEBRA_HEADER_SIZE + sizeof(type) + datasize)) - return -1; + return ZCLIENT_SEND_FAILURE; s = zclient->obuf; stream_reset(s); @@ -3398,28 +3387,26 @@ int zclient_send_opaque(struct zclient *zclient, uint32_t type, /* Put length into the header at the start of the stream. */ stream_putw_at(s, 0, stream_get_endp(s)); - ret = zclient_send_message(zclient); - - return ret; + return zclient_send_message(zclient); } /* * Send an OPAQUE message to a specific zclient. The contents are opaque * to zebra. */ -int zclient_send_opaque_unicast(struct zclient *zclient, uint32_t type, - uint8_t proto, uint16_t instance, - uint32_t session_id, const uint8_t *data, - size_t datasize) +enum zclient_send_status +zclient_send_opaque_unicast(struct zclient *zclient, uint32_t type, + uint8_t proto, uint16_t instance, + uint32_t session_id, const uint8_t *data, + size_t datasize) { - int ret; struct stream *s; uint16_t flags = 0; /* Check buffer size */ if (STREAM_SIZE(zclient->obuf) < (ZEBRA_HEADER_SIZE + sizeof(struct zapi_opaque_msg) + datasize)) - return -1; + return ZCLIENT_SEND_FAILURE; s = zclient->obuf; stream_reset(s); @@ -3442,9 +3429,7 @@ int zclient_send_opaque_unicast(struct zclient *zclient, uint32_t type, /* Put length into the header at the start of the stream. */ stream_putw_at(s, 0, stream_get_endp(s)); - ret = zclient_send_message(zclient); - - return ret; + return zclient_send_message(zclient); } /* @@ -3477,9 +3462,9 @@ stream_failure: /* * Send a registration request for opaque messages with a specified subtype. */ -int zclient_register_opaque(struct zclient *zclient, uint32_t type) +enum zclient_send_status zclient_register_opaque(struct zclient *zclient, + uint32_t type) { - int ret; struct stream *s; s = zclient->obuf; @@ -3498,17 +3483,15 @@ int zclient_register_opaque(struct zclient *zclient, uint32_t type) /* Put length at the first point of the stream. */ stream_putw_at(s, 0, stream_get_endp(s)); - ret = zclient_send_message(zclient); - - return ret; + return zclient_send_message(zclient); } /* * Send an un-registration request for a specified opaque subtype. */ -int zclient_unregister_opaque(struct zclient *zclient, uint32_t type) +enum zclient_send_status zclient_unregister_opaque(struct zclient *zclient, + uint32_t type) { - int ret; struct stream *s; s = zclient->obuf; @@ -3527,9 +3510,7 @@ int zclient_unregister_opaque(struct zclient *zclient, uint32_t type) /* Put length at the first point of the stream. */ stream_putw_at(s, 0, stream_get_endp(s)); - ret = zclient_send_message(zclient); - - return ret; + return zclient_send_message(zclient); } /* Utility to decode opaque registration info */ @@ -3984,9 +3965,9 @@ static void zclient_event(enum event event, struct zclient *zclient) } } -void zclient_interface_set_master(struct zclient *client, - struct interface *master, - struct interface *slave) +enum zclient_send_status zclient_interface_set_master(struct zclient *client, + struct interface *master, + struct interface *slave) { struct stream *s; @@ -4001,20 +3982,21 @@ void zclient_interface_set_master(struct zclient *client, stream_putl(s, slave->ifindex); stream_putw_at(s, 0, stream_get_endp(s)); - zclient_send_message(client); + return zclient_send_message(client); } /* * Send capabilities message to zebra */ -int32_t zclient_capabilities_send(uint32_t cmd, struct zclient *zclient, - struct zapi_cap *api) +enum zclient_send_status zclient_capabilities_send(uint32_t cmd, + struct zclient *zclient, + struct zapi_cap *api) { struct stream *s; if (zclient == NULL) - return -1; + return ZCLIENT_SEND_FAILURE; s = zclient->obuf; stream_reset(s); @@ -4073,9 +4055,10 @@ stream_failure: return 0; } -int zclient_send_neigh_discovery_req(struct zclient *zclient, - const struct interface *ifp, - const struct prefix *p) +enum zclient_send_status +zclient_send_neigh_discovery_req(struct zclient *zclient, + const struct interface *ifp, + const struct prefix *p) { struct stream *s; diff --git a/lib/zclient.h b/lib/zclient.h index 3c80ba7efa..ae94237b76 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -54,6 +54,7 @@ typedef uint16_t zebra_size_t; /* For input/output buffer to zebra. */ #define ZEBRA_MAX_PACKET_SIZ 16384U +#define ZEBRA_SMALL_PACKET_SIZE 200U /* Zebra header size. */ #define ZEBRA_HEADER_SIZE 10 @@ -320,6 +321,18 @@ struct zclient { /* Pointer to the callback functions. */ void (*zebra_connected)(struct zclient *); void (*zebra_capabilities)(struct zclient_capabilities *cap); + + /* + * When the zclient attempts to write the stream data to + * it's named pipe to/from zebra, we may have a situation + * where the other daemon has not fully drained the data + * from the socket. In this case provide a mechanism + * where we will *still* buffer the data to be sent + * and also provide a callback mechanism to the appropriate + * place where we can signal that we're ready to receive + * more data. + */ + void (*zebra_buffer_write_ready)(void); int (*router_id_update)(ZAPI_CALLBACK_ARGS); int (*interface_address_add)(ZAPI_CALLBACK_ARGS); int (*interface_address_delete)(ZAPI_CALLBACK_ARGS); @@ -663,6 +676,12 @@ enum zapi_iptable_notify_owner { ZAPI_IPTABLE_FAIL_REMOVE, }; +enum zclient_send_status { + ZCLIENT_SEND_FAILURE = -1, + ZCLIENT_SEND_SUCCESS = 0, + ZCLIENT_SEND_BUFFERED = 1 +}; + static inline const char * zapi_rule_notify_owner2str(enum zapi_rule_notify_owner note) { @@ -760,31 +779,33 @@ extern void redist_del_all_instances(struct redist_proto *red); * we have installed and play some special games * to get them both installed. */ -extern void zclient_send_vrf_label(struct zclient *zclient, vrf_id_t vrf_id, - afi_t afi, mpls_label_t label, - enum lsp_types_t ltype); +extern enum zclient_send_status +zclient_send_vrf_label(struct zclient *zclient, vrf_id_t vrf_id, afi_t afi, + mpls_label_t label, enum lsp_types_t ltype); extern void zclient_send_reg_requests(struct zclient *, vrf_id_t); extern void zclient_send_dereg_requests(struct zclient *, vrf_id_t); -extern int zclient_send_router_id_update(struct zclient *zclient, - zebra_message_types_t type, afi_t afi, - vrf_id_t vrf_id); - -extern void zclient_send_interface_radv_req(struct zclient *zclient, - vrf_id_t vrf_id, - struct interface *ifp, int enable, - int ra_interval); -extern int zclient_send_interface_protodown(struct zclient *zclient, - vrf_id_t vrf_id, - struct interface *ifp, bool down); +extern enum zclient_send_status +zclient_send_router_id_update(struct zclient *zclient, + zebra_message_types_t type, afi_t afi, + vrf_id_t vrf_id); + +extern enum zclient_send_status +zclient_send_interface_radv_req(struct zclient *zclient, vrf_id_t vrf_id, + struct interface *ifp, int enable, + int ra_interval); +extern enum zclient_send_status +zclient_send_interface_protodown(struct zclient *zclient, vrf_id_t vrf_id, + struct interface *ifp, bool down); /* Send redistribute command to zebra daemon. Do not update zclient state. */ -extern int zebra_redistribute_send(int command, struct zclient *, afi_t, - int type, unsigned short instance, - vrf_id_t vrf_id); +extern enum zclient_send_status +zebra_redistribute_send(int command, struct zclient *, afi_t, int type, + unsigned short instance, vrf_id_t vrf_id); -extern int zebra_redistribute_default_send(int command, struct zclient *zclient, - afi_t afi, vrf_id_t vrf_id); +extern enum zclient_send_status +zebra_redistribute_default_send(int command, struct zclient *zclient, afi_t afi, + vrf_id_t vrf_id); /* Send route notify request to zebra */ extern int zebra_route_notify_send(int command, struct zclient *zclient, @@ -798,9 +819,14 @@ extern void zclient_redistribute(int command, struct zclient *, afi_t, int type, extern void zclient_redistribute_default(int command, struct zclient *, afi_t, vrf_id_t vrf_id); -/* Send the message in zclient->obuf to the zebra daemon (or enqueue it). - Returns 0 for success or -1 on an I/O error. */ -extern int zclient_send_message(struct zclient *); +/* + * Send the message in zclient->obuf to the zebra daemon (or enqueue it). + * Returns: + * -1 on a I/O error + * 0 data was successfully sent + * 1 data was buffered for future usage + */ +extern enum zclient_send_status zclient_send_message(struct zclient *); /* create header for command, length to be filled in by user later */ extern void zclient_create_header(struct stream *, uint16_t, vrf_id_t); @@ -857,9 +883,9 @@ extern int zclient_read_header(struct stream *s, int sock, uint16_t *size, */ extern bool zapi_parse_header(struct stream *zmsg, struct zmsghdr *hdr); -extern void zclient_interface_set_master(struct zclient *client, - struct interface *master, - struct interface *slave); +extern enum zclient_send_status +zclient_interface_set_master(struct zclient *client, struct interface *master, + struct interface *slave); extern struct interface *zebra_interface_state_read(struct stream *s, vrf_id_t); extern struct connected *zebra_interface_address_read(int, struct stream *, vrf_id_t); @@ -874,8 +900,9 @@ extern struct interface *zebra_interface_link_params_read(struct stream *s, vrf_id_t vrf_id); extern size_t zebra_interface_link_params_write(struct stream *, struct interface *); -extern int zclient_send_get_label_chunk(struct zclient *zclient, uint8_t keep, - uint32_t chunk_size, uint32_t base); +extern enum zclient_send_status +zclient_send_get_label_chunk(struct zclient *zclient, uint8_t keep, + uint32_t chunk_size, uint32_t base); extern int lm_label_manager_connect(struct zclient *zclient, int async); extern int lm_get_label_chunk(struct zclient *zclient, uint8_t keep, @@ -889,29 +916,32 @@ extern int tm_get_table_chunk(struct zclient *zclient, uint32_t chunk_size, extern int tm_release_table_chunk(struct zclient *zclient, uint32_t start, uint32_t end); -extern int zebra_send_sr_policy(struct zclient *zclient, int cmd, - struct zapi_sr_policy *zp); +extern enum zclient_send_status zebra_send_sr_policy(struct zclient *zclient, + int cmd, + struct zapi_sr_policy *zp); extern int zapi_sr_policy_encode(struct stream *s, int cmd, struct zapi_sr_policy *zp); extern int zapi_sr_policy_decode(struct stream *s, struct zapi_sr_policy *zp); extern int zapi_sr_policy_notify_status_decode(struct stream *s, struct zapi_sr_policy *zp); -extern int zebra_send_mpls_labels(struct zclient *zclient, int cmd, - struct zapi_labels *zl); +extern enum zclient_send_status zebra_send_mpls_labels(struct zclient *zclient, + int cmd, + struct zapi_labels *zl); extern int zapi_labels_encode(struct stream *s, int cmd, struct zapi_labels *zl); extern int zapi_labels_decode(struct stream *s, struct zapi_labels *zl); -extern int zebra_send_pw(struct zclient *zclient, int command, - struct zapi_pw *pw); +extern enum zclient_send_status zebra_send_pw(struct zclient *zclient, + int command, struct zapi_pw *pw); extern int zebra_read_pw_status_update(ZAPI_CALLBACK_ARGS, struct zapi_pw_status *pw); -extern int zclient_route_send(uint8_t, struct zclient *, struct zapi_route *); -extern int zclient_send_rnh(struct zclient *zclient, int command, - const struct prefix *p, bool exact_match, - vrf_id_t vrf_id); +extern enum zclient_send_status zclient_route_send(uint8_t, struct zclient *, + struct zapi_route *); +extern enum zclient_send_status +zclient_send_rnh(struct zclient *zclient, int command, const struct prefix *p, + bool exact_match, vrf_id_t vrf_id); int zapi_nexthop_encode(struct stream *s, const struct zapi_nexthop *api_nh, uint32_t api_flags, uint32_t api_message); extern int zapi_route_encode(uint8_t, struct stream *, struct zapi_route *); @@ -934,8 +964,8 @@ bool zapi_ipset_notify_decode(struct stream *s, extern int zapi_nhg_encode(struct stream *s, int cmd, struct zapi_nhg *api_nhg); extern int zapi_nhg_decode(struct stream *s, int cmd, struct zapi_nhg *api_nhg); -extern int zclient_nhg_send(struct zclient *zclient, int cmd, - struct zapi_nhg *api_nhg); +extern enum zclient_send_status +zclient_nhg_send(struct zclient *zclient, int cmd, struct zapi_nhg *api_nhg); #define ZEBRA_IPSET_NAME_SIZE 32 @@ -962,8 +992,9 @@ const char *zapi_nexthop2str(const struct zapi_nexthop *znh, char *buf, extern bool zapi_error_decode(struct stream *s, enum zebra_error_types *error); /* Encode and decode restart capabilities */ -extern int32_t zclient_capabilities_send(uint32_t cmd, struct zclient *zclient, - struct zapi_cap *api); +extern enum zclient_send_status +zclient_capabilities_send(uint32_t cmd, struct zclient *zclient, + struct zapi_cap *api); extern int32_t zapi_capabilities_decode(struct stream *s, struct zapi_cap *api); static inline void zapi_route_set_blackhole(struct zapi_route *api, @@ -976,12 +1007,13 @@ static inline void zapi_route_set_blackhole(struct zapi_route *api, SET_FLAG(api->message, ZAPI_MESSAGE_NEXTHOP); }; -extern void zclient_send_mlag_register(struct zclient *client, - uint32_t bit_map); -extern void zclient_send_mlag_deregister(struct zclient *client); +extern enum zclient_send_status +zclient_send_mlag_register(struct zclient *client, uint32_t bit_map); +extern enum zclient_send_status +zclient_send_mlag_deregister(struct zclient *client); -extern void zclient_send_mlag_data(struct zclient *client, - struct stream *client_s); +extern enum zclient_send_status zclient_send_mlag_data(struct zclient *client, + struct stream *client_s); /* * Send an OPAQUE message, contents opaque to zebra - but note that @@ -991,13 +1023,15 @@ extern void zclient_send_mlag_data(struct zclient *client, * below to avoid sub-type collisions. Clients use the registration * apis to manage the specific opaque subtypes they want to receive. */ -int zclient_send_opaque(struct zclient *zclient, uint32_t type, - const uint8_t *data, size_t datasize); +enum zclient_send_status zclient_send_opaque(struct zclient *zclient, + uint32_t type, const uint8_t *data, + size_t datasize); -int zclient_send_opaque_unicast(struct zclient *zclient, uint32_t type, - uint8_t proto, uint16_t instance, - uint32_t session_id, const uint8_t *data, - size_t datasize); +enum zclient_send_status +zclient_send_opaque_unicast(struct zclient *zclient, uint32_t type, + uint8_t proto, uint16_t instance, + uint32_t session_id, const uint8_t *data, + size_t datasize); /* Struct representing the decoded opaque header info */ struct zapi_opaque_msg { @@ -1027,8 +1061,10 @@ struct zapi_opaque_reg_info { /* Decode incoming opaque */ int zclient_opaque_decode(struct stream *msg, struct zapi_opaque_msg *info); -int zclient_register_opaque(struct zclient *zclient, uint32_t type); -int zclient_unregister_opaque(struct zclient *zclient, uint32_t type); +enum zclient_send_status zclient_register_opaque(struct zclient *zclient, + uint32_t type); +enum zclient_send_status zclient_unregister_opaque(struct zclient *zclient, + uint32_t type); int zapi_opaque_reg_decode(struct stream *msg, struct zapi_opaque_reg_info *info); @@ -1054,11 +1090,12 @@ enum zapi_opaque_registry { /* Send the hello message. * Returns 0 for success or -1 on an I/O error. */ -extern int zclient_send_hello(struct zclient *client); +extern enum zclient_send_status zclient_send_hello(struct zclient *client); -extern int zclient_send_neigh_discovery_req(struct zclient *zclient, - const struct interface *ifp, - const struct prefix *p); +extern enum zclient_send_status +zclient_send_neigh_discovery_req(struct zclient *zclient, + const struct interface *ifp, + const struct prefix *p); #ifdef __cplusplus } |