*: Replace zclient_new with zclient_new_notify

It's been a year since we added the new optional parameters
to instantiation.  Let's switch over to the new name.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/babeld/babel_zebra.c b/babeld/babel_zebra.c
index 8dea1431e2eb0429007bd1ac35128ab8043d1033..e909f8ea7a4e81880654fe0cf7d13747772ba2ea 100644 (file)
--- a/babeld/babel_zebra.c
+++ b/babeld/babel_zebra.c
@@ -237,7 +237,7 @@ babel_zebra_connected (struct zclient *zclient)
 
 void babelz_zebra_init(void)
 {
-    zclient = zclient_new_notify(master, &zclient_options_default);
+    zclient = zclient_new(master, &zclient_options_default);
     zclient_init(zclient, ZEBRA_ROUTE_BABEL, 0, &babeld_privs);
 
     zclient->zebra_connected = babel_zebra_connected;

diff --git a/bfdd/ptm_adapter.c b/bfdd/ptm_adapter.c
index a5fae3383cd7248ba0994f318e2e877dd90f283f..a6be28dbd910c43983bfc4c8c356f7dea5dd1ff4 100644 (file)
--- a/bfdd/ptm_adapter.c
+++ b/bfdd/ptm_adapter.c
@@ -566,7 +566,7 @@ static void bfdd_zebra_connected(struct zclient *zc)
 
 void bfdd_zclient_init(struct zebra_privs_t *bfdd_priv)
 {
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        assert(zclient != NULL);
        zclient_init(zclient, ZEBRA_ROUTE_BFD, 0, bfdd_priv);
 

diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 50b790eb118a4ddd59491546133c94c8cd87ca3c..62f977eee14b370b0c8d873217383412252bc535 100644 (file)
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -2574,7 +2574,7 @@ void bgp_zebra_init(struct thread_master *master, unsigned short instance)
        zclient_num_connects = 0;
 
        /* Set default values. */
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient_init(zclient, ZEBRA_ROUTE_BGP, 0, &bgpd_privs);
        zclient->zebra_connected = bgp_zebra_connected;
        zclient->router_id_update = bgp_router_id_update;

diff --git a/bgpd/rfapi/vnc_zebra.c b/bgpd/rfapi/vnc_zebra.c
index 97d520eda76ce3d6d553296028815866ee9a75b6..a43cf1f6a98ccac4e8f182fab16b485b87e7d5eb 100644 (file)
--- a/bgpd/rfapi/vnc_zebra.c
+++ b/bgpd/rfapi/vnc_zebra.c
@@ -913,7 +913,7 @@ extern struct zebra_privs_t bgpd_privs;
 void vnc_zebra_init(struct thread_master *master)
 {
        /* Set default values. */
-       zclient_vnc = zclient_new_notify(master, &zclient_options_default);
+       zclient_vnc = zclient_new(master, &zclient_options_default);
        zclient_init(zclient_vnc, ZEBRA_ROUTE_VNC, 0, &bgpd_privs);
 
        zclient_vnc->redistribute_route_add = vnc_zebra_read_route;

diff --git a/eigrpd/eigrp_zebra.c b/eigrpd/eigrp_zebra.c
index 3a3d6aae1223278c755c1c9f3e6a51acfc90bab5..29bd23b5141dc4212e7587fe63c3f793e814ea57 100644 (file)
--- a/eigrpd/eigrp_zebra.c
+++ b/eigrpd/eigrp_zebra.c
@@ -116,7 +116,7 @@ void eigrp_zebra_init(void)
 {
        struct zclient_options opt = {.receive_notify = false};
 
-       zclient = zclient_new_notify(master, &opt);
+       zclient = zclient_new(master, &opt);
 
        zclient_init(zclient, ZEBRA_ROUTE_EIGRP, 0, &eigrpd_privs);
        zclient->zebra_connected = eigrp_zebra_connected;

diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c
index 9363dbcedf28ec8dc2ae08c67bd933c91d20d776..101bd57cc932f0049b7b462141d56510a57e1cc6 100644 (file)
--- a/isisd/isis_zebra.c
+++ b/isisd/isis_zebra.c
@@ -413,7 +413,7 @@ static void isis_zebra_connected(struct zclient *zclient)
 
 void isis_zebra_init(struct thread_master *master)
 {
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient_init(zclient, PROTO_TYPE, 0, &isisd_privs);
        zclient->zebra_connected = isis_zebra_connected;
        zclient->router_id_update = isis_router_id_update_zebra;

diff --git a/ldpd/lde.c b/ldpd/lde.c
index 4f74d93044376cc3983f64887bb04d2d5d56b0f8..2aa96546ecfb269f23c4c7011f5baf99a1f15847 100644 (file)
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -1627,7 +1627,7 @@ lde_address_list_free(struct lde_nbr *ln)
 static void zclient_sync_init(unsigned short instance)
 {
        /* Initialize special zclient for synchronous message exchanges. */
-       zclient_sync = zclient_new_notify(master, &zclient_options_default);
+       zclient_sync = zclient_new(master, &zclient_options_default);
        zclient_sync->sock = -1;
        zclient_sync->redist_default = ZEBRA_ROUTE_LDP;
        zclient_sync->instance = instance;

diff --git a/ldpd/ldp_zebra.c b/ldpd/ldp_zebra.c
index c8b775cb8e8bf96416a8703cf9aa52a62fbb198b..9dc56773584aae7fb8d59a8aa2b3d32e70cda066 100644 (file)
--- a/ldpd/ldp_zebra.c
+++ b/ldpd/ldp_zebra.c
@@ -533,7 +533,7 @@ void
 ldp_zebra_init(struct thread_master *master)
 {
        /* Set default values. */
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient_init(zclient, ZEBRA_ROUTE_LDP, 0, &ldpd_privs);
 
        /* set callbacks */

diff --git a/lib/zclient.c b/lib/zclient.c
index 45a9f7be9e5ba392c23a9f61c56c35d7df728018..b879326d71b56deeb5dbc0fe6f9f041bdbec52b2 100644 (file)
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -58,8 +58,8 @@ int zclient_debug = 0;
 struct zclient_options zclient_options_default = {.receive_notify = false};
 
 /* Allocate zclient structure. */
-struct zclient *zclient_new_notify(struct thread_master *master,
-                                  struct zclient_options *opt)
+struct zclient *zclient_new(struct thread_master *master,
+                           struct zclient_options *opt)
 {
        struct zclient *zclient;
        zclient = XCALLOC(MTYPE_ZCLIENT, sizeof(struct zclient));
@@ -199,7 +199,7 @@ void zclient_reset(struct zclient *zclient)
  * @param zclient a pointer to zclient structure
  * @return socket fd just to make sure that connection established
  * @see zclient_init
- * @see zclient_new_notify
+ * @see zclient_new
  */
 int zclient_socket_connect(struct zclient *zclient)
 {

diff --git a/lib/zclient.h b/lib/zclient.h
index 97ebb0811c26647acb64001d653ea6dd7b1d78d1..07fe512a3cc5ea7fe091e9659bf54b5a1065e31c 100644 (file)
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -422,23 +422,10 @@ struct zclient_options {
        bool receive_notify;
 };
 
-/* Prototypes of zebra client service functions. */
-extern struct zclient *zclient_new(struct thread_master *);
-
-/* clang-format off */
-#if CONFDATE > 20181101
-CPP_NOTICE("zclient_new_notify can take over or zclient_new now");
-#endif
-/* clang-format on */
-
 extern struct zclient_options zclient_options_default;
 
-extern struct zclient *zclient_new_notify(struct thread_master *m,
-                                         struct zclient_options *opt);
-
-#define zclient_new(A)                                                         \
-       zclient_new_notify((A), &zclient_options_default);                     \
-       CPP_WARN("Please transition to using zclient_new_notify");
+extern struct zclient *zclient_new(struct thread_master *m,
+                                  struct zclient_options *opt);
 
 extern void zclient_init(struct zclient *, int, unsigned short,
                         struct zebra_privs_t *privs);

diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c
index e7b187f3b607eeac0f747fcdca6a29c118923d85..dae00bbcea00d3e0005becebd9c54dfbfa5afef4 100644 (file)
--- a/nhrpd/nhrp_route.c
+++ b/nhrpd/nhrp_route.c
@@ -344,7 +344,7 @@ void nhrp_zebra_init(void)
        zebra_rib[AFI_IP] = route_table_init();
        zebra_rib[AFI_IP6] = route_table_init();
 
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient->zebra_connected = nhrp_zebra_connected;
        zclient->interface_add = nhrp_interface_add;
        zclient->interface_delete = nhrp_interface_delete;

diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
index c968b35d904805ed4a12edb989cca63e86747ba4..5db9b529efe3cdbb73427c0679fa2c50110d2c39 100644 (file)
--- a/ospf6d/ospf6_zebra.c
+++ b/ospf6d/ospf6_zebra.c
@@ -586,7 +586,7 @@ static void ospf6_zebra_connected(struct zclient *zclient)
 void ospf6_zebra_init(struct thread_master *master)
 {
        /* Allocate zebra structure. */
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient_init(zclient, ZEBRA_ROUTE_OSPF6, 0, &ospf6d_privs);
        zclient->zebra_connected = ospf6_zebra_connected;
        zclient->router_id_update = ospf6_router_id_update_zebra;

diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index ed19ae4f316d0b7241a0218b3f4e03159ea2a171..c7bde55cd9d12c10ebd0e87a8586ec5c916cb386 100644 (file)
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -1577,7 +1577,7 @@ static void ospf_zebra_connected(struct zclient *zclient)
 void ospf_zebra_init(struct thread_master *master, unsigned short instance)
 {
        /* Allocate zebra structure. */
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient_init(zclient, ZEBRA_ROUTE_OSPF, instance, &ospfd_privs);
        zclient->zebra_connected = ospf_zebra_connected;
        zclient->router_id_update = ospf_router_id_update_zebra;

diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c
index b7391a171a653215e09d8b23bb99485bd82a3ae4..9db3edacb9bf4ce43dbcc6e382c0403b7aa8f026 100644 (file)
--- a/pbrd/pbr_zebra.c
+++ b/pbrd/pbr_zebra.c
@@ -391,7 +391,7 @@ void pbr_zebra_init(void)
 {
        struct zclient_options opt = { .receive_notify = true };
 
-       zclient = zclient_new_notify(master, &opt);
+       zclient = zclient_new(master, &opt);
 
        zclient_init(zclient, ZEBRA_ROUTE_PBR, 0, &pbr_privs);
        zclient->zebra_connected = zebra_connected;

diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 23001031e350ece1b3db07b94a91c0caf6f9e8b7..3dfc36a0c2e8ae18d060741031786a267522f0b5 100644 (file)
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -746,7 +746,7 @@ static void pim_zebra_connected(struct zclient *zclient)
 void pim_zebra_init(void)
 {
        /* Socket for receiving updates from Zebra daemon */
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
 
        zclient->zebra_connected = pim_zebra_connected;
        zclient->router_id_update = pim_router_id_update_zebra;

diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index 0e74866117fe1c73b8930e0e8964ee262a60cc52..6b45313081d9fa75d111bbeba764a16c423d2b25 100644 (file)
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -120,7 +120,7 @@ void zclient_lookup_free(void)
 
 void zclient_lookup_new(void)
 {
-       zlookup = zclient_new_notify(master, &zclient_options_default);
+       zlookup = zclient_new(master, &zclient_options_default);
        if (!zlookup) {
                flog_err(EC_LIB_ZAPI_SOCKET, "%s: zclient_new() failure",
                         __PRETTY_FUNCTION__);

diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c
index 2a56cd7b1b15750263b019757f0afe42558025e8..20f543a2588981b91bf8fe5faa34a9da4b0202cf 100644 (file)
--- a/ripd/rip_zebra.c
+++ b/ripd/rip_zebra.c
@@ -211,7 +211,7 @@ static void rip_zebra_connected(struct zclient *zclient)
 void rip_zclient_init(struct thread_master *master)
 {
        /* Set default value to the zebra client structure. */
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient_init(zclient, ZEBRA_ROUTE_RIP, 0, &ripd_privs);
        zclient->zebra_connected = rip_zebra_connected;
        zclient->interface_add = rip_interface_add;

diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index a8cc9ee128b4977288fb71bf13c597b4455bb9b9..f2b69c85a796ae54d59f841fbf63288d35be0395 100644 (file)
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.c
@@ -414,7 +414,7 @@ static void ripng_zebra_connected(struct zclient *zclient)
 void zebra_init(struct thread_master *master)
 {
        /* Allocate zebra structure. */
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        zclient_init(zclient, ZEBRA_ROUTE_RIPNG, 0, &ripngd_privs);
 
        zclient->zebra_connected = ripng_zebra_connected;

diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c
index 286f320874ca3a80727eec1770f0ad8593203348..12bab73c5e3c31b3fd4f26125d6af85a2f9059f5 100644 (file)
--- a/sharpd/sharp_zebra.c
+++ b/sharpd/sharp_zebra.c
@@ -281,7 +281,7 @@ void sharp_zebra_init(void)
 {
        struct zclient_options opt = {.receive_notify = true};
 
-       zclient = zclient_new_notify(master, &opt);
+       zclient = zclient_new(master, &opt);
 
        zclient_init(zclient, ZEBRA_ROUTE_SHARP, 0, &sharp_privs);
        zclient->zebra_connected = zebra_connected;

diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c
index 4e168e142cc09ef1d5658b3c33b01b5124786eda..fd4201e5625218e01deb2224c40c959ef7ebca60 100644 (file)
--- a/staticd/static_zebra.c
+++ b/staticd/static_zebra.c
@@ -465,7 +465,7 @@ void static_zebra_init(void)
 {
        struct zclient_options opt = { .receive_notify = true };
 
-       zclient = zclient_new_notify(master, &opt);
+       zclient = zclient_new(master, &opt);
 
        zclient_init(zclient, ZEBRA_ROUTE_STATIC, 0, &static_privs);
        zclient->zebra_capabilities = static_zebra_capabilities;

diff --git a/tests/bgpd/test_mpath.c b/tests/bgpd/test_mpath.c
index f0797827ce65e8e9a620d79282330dc7cf3b335c..04fbda42ebde788e5e1416eaa78739333d8fc25a 100644 (file)
--- a/tests/bgpd/test_mpath.c
+++ b/tests/bgpd/test_mpath.c
@@ -379,7 +379,7 @@ static int global_test_init(void)
 {
        qobj_init();
        master = thread_master_create(NULL);
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        bgp_master_init(master);
        vrf_init(NULL, NULL, NULL, NULL, NULL);
        bgp_option_set(BGP_OPT_NO_LISTEN);

diff --git a/tests/test_lblmgr.c b/tests/test_lblmgr.c
index 9d1c05436c2a42b26ea03c58761cb0ea2bc5a1bd..e71e680fad5983c49eaf9eaf7caa7b68f9ee0216 100644 (file)
--- a/tests/test_lblmgr.c
+++ b/tests/test_lblmgr.c
@@ -119,7 +119,7 @@ void init_zclient(struct thread_master *master, char *lm_zserv_path)
 {
        frr_zclient_addr(&zclient_addr, &zclient_addr_len, lm_zserv_path);
 
-       zclient = zclient_new_notify(master, &zclient_options_default);
+       zclient = zclient_new(master, &zclient_options_default);
        /* zclient_init(zclient, ZEBRA_LABEL_MANAGER, 0); */
        zclient->sock = -1;
        zclient->redist_default = ZEBRA_ROUTE_LDP;

diff --git a/zebra/label_manager.c b/zebra/label_manager.c
index 8afb1a0b79f452bfb2a688baa9fa47eed60a709d..bfad8ea643f7aac5cec4e4e43211aa0639644387 100644 (file)
--- a/zebra/label_manager.c
+++ b/zebra/label_manager.c
@@ -318,7 +318,7 @@ static void lm_zclient_init(char *lm_zserv_path)
                                 lm_zserv_path);
 
        /* Set default values. */
-       zclient = zclient_new_notify(zebrad.master, &zclient_options_default);
+       zclient = zclient_new(zebrad.master, &zclient_options_default);
        zclient->privs = &zserv_privs;
        zclient->sock = -1;
        zclient->t_connect = NULL;