From 25a1dccc56a7e544a855bfeda5751c91b53a03fb Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Thu, 23 Nov 2023 15:03:35 +0100 Subject: [PATCH] lib: remove `.receive_notify` zclient option This should just be set with `ZEBRA_ROUTE_NOTIFY_REQUEST` instead. Signed-off-by: David Lamparter --- lib/zclient.c | 11 ++++------- lib/zclient.h | 4 ---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/zclient.c b/lib/zclient.c index 9f261e2f29..47ce111b33 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -41,8 +41,9 @@ static void zclient_event(enum zclient_event, struct zclient *); static void zebra_interface_if_set_value(struct stream *s, struct interface *ifp); -struct zclient_options zclient_options_default = {.receive_notify = false, - .synchronous = false}; +struct zclient_options zclient_options_default = { + .synchronous = false, +}; struct sockaddr_storage zclient_addr; socklen_t zclient_addr_len; @@ -69,7 +70,6 @@ struct zclient *zclient_new(struct event_loop *master, zclient->handlers = handlers; zclient->n_handlers = n_handlers; - zclient->receive_notify = opt->receive_notify; zclient->synchronous = opt->synchronous; return zclient; @@ -392,10 +392,7 @@ enum zclient_send_status zclient_send_hello(struct zclient *zclient) stream_putc(s, zclient->redist_default); stream_putw(s, zclient->instance); stream_putl(s, zclient->session_id); - if (zclient->receive_notify) - stream_putc(s, 1); - else - stream_putc(s, 0); + stream_putc(s, 0); /* receive_notify - removed */ if (zclient->synchronous) stream_putc(s, 1); else diff --git a/lib/zclient.h b/lib/zclient.h index 9b709ea64b..8332f2a057 100644 --- a/lib/zclient.h +++ b/lib/zclient.h @@ -303,9 +303,6 @@ struct zclient { /* Privileges to change socket values */ struct zebra_privs_t *privs; - /* Do we care about failure events for route install? */ - bool receive_notify; - /* Is this a synchronous client? */ bool synchronous; @@ -834,7 +831,6 @@ extern char *zclient_evpn_dump_macip_flags(uint8_t flags, char *buf, enum zebra_neigh_state { ZEBRA_NEIGH_INACTIVE = 0, ZEBRA_NEIGH_ACTIVE = 1 }; struct zclient_options { - bool receive_notify; bool synchronous; }; -- 2.39.5