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 /isisd | |
| 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 'isisd')
| -rw-r--r-- | isisd/isis_circuit.c | 7 | ||||
| -rw-r--r-- | isisd/isis_zebra.c | 19 |
2 files changed, 7 insertions, 19 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index ce3e972e4..153e7ec26 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -1411,6 +1411,13 @@ static int isis_ifp_up(struct interface *ifp) static int isis_ifp_down(struct interface *ifp) { + struct isis_circuit *circuit; + + circuit = isis_csm_state_change(IF_DOWN_FROM_Z, + circuit_scan_by_ifp(ifp), ifp); + if (circuit) + SET_FLAG(circuit->flags, ISIS_CIRCUIT_FLAPPED_AFTER_SPF); + return 0; } diff --git a/isisd/isis_zebra.c b/isisd/isis_zebra.c index 5309a220a..2299354b1 100644 --- a/isisd/isis_zebra.c +++ b/isisd/isis_zebra.c @@ -98,24 +98,6 @@ static int isis_zebra_if_del(ZAPI_CALLBACK_ARGS) return 0; } -static int isis_zebra_if_state_down(ZAPI_CALLBACK_ARGS) -{ - struct interface *ifp; - struct isis_circuit *circuit; - - ifp = zebra_interface_state_read(zclient->ibuf, vrf_id); - - if (ifp == NULL) - return 0; - - circuit = isis_csm_state_change(IF_DOWN_FROM_Z, - circuit_scan_by_ifp(ifp), ifp); - if (circuit) - SET_FLAG(circuit->flags, ISIS_CIRCUIT_FLAPPED_AFTER_SPF); - - return 0; -} - static int isis_zebra_if_address_add(ZAPI_CALLBACK_ARGS) { struct connected *c; @@ -358,7 +340,6 @@ void isis_zebra_init(struct thread_master *master) zclient->zebra_connected = isis_zebra_connected; zclient->router_id_update = isis_router_id_update_zebra; zclient->interface_delete = isis_zebra_if_del; - zclient->interface_down = isis_zebra_if_state_down; zclient->interface_address_add = isis_zebra_if_address_add; zclient->interface_address_delete = isis_zebra_if_address_del; zclient->interface_link_params = isis_zebra_link_params; |