summaryrefslogtreecommitdiffstats
path: root/sharpd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2019-09-19 15:40:57 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2019-09-19 19:34:06 +0200
commit3c3c325203848994bae83a85cb606d4e4deeeb25 (patch)
treeac8447eb389883d0f009599cb4ea460401f5af8b /sharpd
parent*: Convert interface_down to interface down callback (diff)
downloadfrr-3c3c325203848994bae83a85cb606d4e4deeeb25.tar.xz
frr-3c3c325203848994bae83a85cb606d4e4deeeb25.zip
*: Convert zapi->interface_delete to ifp callback
Convert the callback of the interface_delete to the new ifp callback. 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 5991b84c6..14220830c 100644
--- a/sharpd/sharp_zebra.c
+++ b/sharpd/sharp_zebra.c
@@ -52,27 +52,13 @@ static int sharp_ifp_create(struct interface *ifp)
return 0;
}
-static int interface_delete(ZAPI_CALLBACK_ARGS)
+static int sharp_ifp_destroy(struct interface *ifp)
{
- struct interface *ifp;
- struct stream *s;
-
- s = zclient->ibuf;
- /* zebra_interface_state_read () updates interface structure in iflist
- */
- ifp = zebra_interface_state_read(s, vrf_id);
-
- if (ifp == NULL)
- return 0;
-
- if_set_index(ifp, IFINDEX_INTERNAL);
-
return 0;
}
static int interface_address_add(ZAPI_CALLBACK_ARGS)
{
-
zebra_interface_address_read(cmd, zclient->ibuf, vrf_id);
return 0;
@@ -368,11 +354,6 @@ static int sharp_nexthop_update(ZAPI_CALLBACK_ARGS)
return 0;
}
-static int sharp_ifp_destroy(struct interface *ifp)
-{
- return 0;
-}
-
extern struct zebra_privs_t sharp_privs;
void sharp_zebra_init(void)
@@ -386,7 +367,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_address_add = interface_address_add;
zclient->interface_address_delete = interface_address_delete;
zclient->route_notify_owner = route_notify_owner;