diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-19 05:55:34 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2019-09-19 19:34:06 +0200 |
| commit | b0b69e59f463b696d0e20f30c46c59c9cf0044b1 (patch) | |
| tree | 479eb980f6eb740d6399daa383a20d175a93ff0f /ldpd | |
| parent | *: Convert from ->interface_up to the interface callback (diff) | |
| download | frr-b0b69e59f463b696d0e20f30c46c59c9cf0044b1.tar.xz frr-b0b69e59f463b696d0e20f30c46c59c9cf0044b1.zip | |
*: Convert interface_down to interface down callback
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'ldpd')
| -rw-r--r-- | ldpd/ldp_zebra.c | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/ldpd/ldp_zebra.c b/ldpd/ldp_zebra.c index d3eac6017..37ecc0673 100644 --- a/ldpd/ldp_zebra.c +++ b/ldpd/ldp_zebra.c @@ -40,7 +40,6 @@ static void ifc2kaddr(struct interface *, struct connected *, static int ldp_zebra_send_mpls_labels(int, struct kroute *); static int ldp_router_id_update(ZAPI_CALLBACK_ARGS); static int ldp_interface_delete(ZAPI_CALLBACK_ARGS); -static int ldp_interface_status_change(ZAPI_CALLBACK_ARGS); static int ldp_interface_address_add(ZAPI_CALLBACK_ARGS); static int ldp_interface_address_delete(ZAPI_CALLBACK_ARGS); static int ldp_zebra_read_route(ZAPI_CALLBACK_ARGS); @@ -329,19 +328,14 @@ ldp_interface_status_change_helper(struct interface *ifp) return (0); } -static int -ldp_interface_status_change(ZAPI_CALLBACK_ARGS) -{ - struct interface *ifp; - /* - * zebra_interface_state_read() updates interface structure in - * iflist. - */ - ifp = zebra_interface_state_read(zclient->ibuf, vrf_id); - if (ifp == NULL) - return (0); +static int ldp_ifp_up(struct interface *ifp) +{ + return ldp_interface_status_change_helper(ifp); +} +static int ldp_ifp_down(struct interface *ifp) +{ return ldp_interface_status_change_helper(ifp); } @@ -535,16 +529,6 @@ ldp_zebra_connected(struct zclient *zclient) extern struct zebra_privs_t ldpd_privs; -static int ldp_ifp_up(struct interface *ifp) -{ - return ldp_interface_status_change_helper(ifp); -} - -static int ldp_ifp_down(struct interface *ifp) -{ - return 0; -} - static int ldp_ifp_destroy(struct interface *ifp) { return 0; @@ -564,7 +548,6 @@ ldp_zebra_init(struct thread_master *master) zclient->zebra_connected = ldp_zebra_connected; zclient->router_id_update = ldp_router_id_update; zclient->interface_delete = ldp_interface_delete; - zclient->interface_down = ldp_interface_status_change; zclient->interface_address_add = ldp_interface_address_add; zclient->interface_address_delete = ldp_interface_address_delete; zclient->redistribute_route_add = ldp_zebra_read_route; |