summaryrefslogtreecommitdiffstats
path: root/ripd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2019-09-19 04:26:55 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2019-09-19 19:34:06 +0200
commitef7bd2a3d5ecab37018f4035391f99c25ddadeab (patch)
treee5fb8c3b974e01a2f1ad848b6337583b49efe374 /ripd
parent*: Add infrastructure to support zapi interface callbacks (diff)
downloadfrr-ef7bd2a3d5ecab37018f4035391f99c25ddadeab.tar.xz
frr-ef7bd2a3d5ecab37018f4035391f99c25ddadeab.zip
*: Switch all zclient->interface_add to interface create callback
Switch the zclient->interface_add functionality to have everyone use the interface create callback in lib/if.c Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'ripd')
-rw-r--r--ripd/rip_interface.c10
-rw-r--r--ripd/rip_zebra.c1
2 files changed, 1 insertions, 10 deletions
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index f20058a17..11657536b 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -405,11 +405,8 @@ int rip_interface_up(ZAPI_CALLBACK_ARGS)
}
/* Inteface addition message from zebra. */
-int rip_interface_add(ZAPI_CALLBACK_ARGS)
+static int rip_ifp_create(struct interface *ifp)
{
- struct interface *ifp;
-
- ifp = zebra_interface_add_read(zclient->ibuf, vrf_id);
rip_interface_sync(ifp);
if (IS_RIP_DEBUG_ZEBRA)
@@ -1253,11 +1250,6 @@ static int rip_interface_delete_hook(struct interface *ifp)
return 0;
}
-static int rip_ifp_create(struct interface *ifp)
-{
- return 0;
-}
-
static int rip_ifp_up(struct interface *ifp)
{
return 0;
diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c
index 0c88cb202..92d37bdca 100644
--- a/ripd/rip_zebra.c
+++ b/ripd/rip_zebra.c
@@ -238,7 +238,6 @@ void rip_zclient_init(struct thread_master *master)
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;
zclient->interface_delete = rip_interface_delete;
zclient->interface_address_add = rip_interface_address_add;
zclient->interface_address_delete = rip_interface_address_delete;