summaryrefslogtreecommitdiffstats
path: root/sharpd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2019-09-19 05:07:44 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2019-09-19 19:34:06 +0200
commitddbf3e60604019d4b38d51226700e2244cc531b6 (patch)
treed3403922091432832dfffe8b86e8c6610691e177 /sharpd
parent*: Switch all zclient->interface_add to interface create callback (diff)
downloadfrr-ddbf3e60604019d4b38d51226700e2244cc531b6.tar.xz
frr-ddbf3e60604019d4b38d51226700e2244cc531b6.zip
*: Convert from ->interface_up to the interface callback
For all the places we have a zclient->interface_up convert them to use the interface ifp_up callback instead. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'sharpd')
-rw-r--r--sharpd/sharp_zebra.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/sharpd/sharp_zebra.c b/sharpd/sharp_zebra.c
index 343ac67d0..76bfae254 100644
--- a/sharpd/sharp_zebra.c
+++ b/sharpd/sharp_zebra.c
@@ -46,17 +46,6 @@ struct zclient *zclient = NULL;
/* For registering threads. */
extern struct thread_master *master;
-static struct interface *zebra_interface_if_lookup(struct stream *s)
-{
- char ifname_tmp[INTERFACE_NAMSIZ];
-
- /* Read interface name. */
- stream_get(ifname_tmp, s, INTERFACE_NAMSIZ);
-
- /* And look it up. */
- return if_lookup_by_name(ifname_tmp, VRF_DEFAULT);
-}
-
/* Inteface addition message from zebra. */
static int sharp_ifp_create(struct interface *ifp)
{
@@ -102,11 +91,8 @@ static int interface_address_delete(ZAPI_CALLBACK_ARGS)
return 0;
}
-static int interface_state_up(ZAPI_CALLBACK_ARGS)
+static int sharp_ifp_up(struct interface *ifp)
{
-
- zebra_interface_if_lookup(zclient->ibuf);
-
return 0;
}
@@ -385,11 +371,6 @@ static int sharp_nexthop_update(ZAPI_CALLBACK_ARGS)
return 0;
}
-static int sharp_ifp_up(struct interface *ifp)
-{
- return 0;
-}
-
static int sharp_ifp_down(struct interface *ifp)
{
return 0;
@@ -414,7 +395,6 @@ void sharp_zebra_init(void)
zclient_init(zclient, ZEBRA_ROUTE_SHARP, 0, &sharp_privs);
zclient->zebra_connected = zebra_connected;
zclient->interface_delete = interface_delete;
- zclient->interface_up = interface_state_up;
zclient->interface_down = interface_state_down;
zclient->interface_address_add = interface_address_add;
zclient->interface_address_delete = interface_address_delete;