From adca5c22c573f17b09b96a0994953c8f643fd301 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Tue, 11 Jul 2023 16:03:38 -0400 Subject: * : include event ptr in event_execute api Include an event ptr-to-ptr in the event_execute() api call, like the various schedule api calls. This allows the execute() api to cancel an existing scheduled task if that task is being executed inline. Signed-off-by: Mark Stapp --- ospf6d/ospf6_interface.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'ospf6d/ospf6_interface.c') diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 0fb3d29e25..a20ddf6c10 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -309,7 +309,7 @@ void ospf6_interface_disable(struct ospf6_interface *oi) { SET_FLAG(oi->flag, OSPF6_INTERFACE_DISABLE); - event_execute(master, interface_down, oi, 0); + event_execute(master, interface_down, oi, 0, NULL); ospf6_lsdb_remove_all(oi->lsdb); ospf6_lsdb_remove_all(oi->lsdb_self); @@ -387,9 +387,9 @@ void ospf6_interface_state_update(struct interface *ifp) if (if_is_operative(ifp) && (ospf6_interface_get_linklocal_address(oi->interface) || if_is_loopback(oi->interface))) - event_execute(master, interface_up, oi, 0); + event_execute(master, interface_up, oi, 0, NULL); else - event_execute(master, interface_down, oi, 0); + event_execute(master, interface_down, oi, 0, NULL); return; } @@ -2584,8 +2584,8 @@ DEFUN (ipv6_ospf6_network, } /* Reset the interface */ - event_execute(master, interface_down, oi, 0); - event_execute(master, interface_up, oi, 0); + event_execute(master, interface_down, oi, 0, NULL); + event_execute(master, interface_up, oi, 0, NULL); return CMD_SUCCESS; } @@ -2620,8 +2620,8 @@ DEFUN (no_ipv6_ospf6_network, oi->type = type; /* Reset the interface */ - event_execute(master, interface_down, oi, 0); - event_execute(master, interface_up, oi, 0); + event_execute(master, interface_down, oi, 0, NULL); + event_execute(master, interface_up, oi, 0, NULL); return CMD_SUCCESS; } @@ -2844,8 +2844,8 @@ void ospf6_interface_clear(struct interface *ifp) zlog_debug("Interface %s: clear by reset", ifp->name); /* Reset the interface */ - event_execute(master, interface_down, oi, 0); - event_execute(master, interface_up, oi, 0); + event_execute(master, interface_down, oi, 0, NULL); + event_execute(master, interface_up, oi, 0, NULL); } /* Clear interface */ -- cgit v1.2.3