* : 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 <mjs@labn.net>

1 files changed, 9 insertions, 9 deletions

diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c
index e9b19ea0a..07da9a5ec 100644
--- a/ospf6d/ospf6_message.c
+++ b/ospf6d/ospf6_message.c
@@ -535,9 +535,9 @@ static void ospf6_hello_recv(struct in6_addr *src, struct in6_addr *dst,
 	oi->hello_in++;
 
 	/* Execute neighbor events */
-	event_execute(master, hello_received, on, 0);
+	event_execute(master, hello_received, on, 0, NULL);
 	if (twoway)
-		event_execute(master, twoway_received, on, 0);
+		event_execute(master, twoway_received, on, 0, NULL);
 	else {
 		if (OSPF6_GR_IS_ACTIVE_HELPER(on)) {
 			if (IS_DEBUG_OSPF6_GR)
@@ -553,7 +553,7 @@ static void ospf6_hello_recv(struct in6_addr *src, struct in6_addr *dst,
 			 * receives one_way hellow when it acts as HELPER for
 			 * that specific neighbor.
 			 */
-			event_execute(master, oneway_received, on, 0);
+			event_execute(master, oneway_received, on, 0, NULL);
 		}
 	}
 
@@ -624,7 +624,7 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh,
 		return;
 
 	case OSPF6_NEIGHBOR_INIT:
-		event_execute(master, twoway_received, on, 0);
+		event_execute(master, twoway_received, on, 0, NULL);
 		if (on->state != OSPF6_NEIGHBOR_EXSTART) {
 			if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR))
 				zlog_debug(
@@ -640,7 +640,7 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh,
 		    && !CHECK_FLAG(dbdesc->bits, OSPF6_DBDESC_IBIT)
 		    && ntohl(dbdesc->seqnum) == on->dbdesc_seqnum) {
 			/* execute NegotiationDone */
-			event_execute(master, negotiation_done, on, 0);
+			event_execute(master, negotiation_done, on, 0, NULL);
 
 			/* Record neighbor options */
 			memcpy(on->options, dbdesc->options,
@@ -828,7 +828,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh,
 		return;
 
 	case OSPF6_NEIGHBOR_INIT:
-		event_execute(master, twoway_received, on, 0);
+		event_execute(master, twoway_received, on, 0, NULL);
 		if (on->state != OSPF6_NEIGHBOR_EXSTART) {
 			if (IS_OSPF6_DEBUG_MESSAGE(oh->type, RECV_HDR))
 				zlog_debug(
@@ -855,7 +855,7 @@ static void ospf6_dbdesc_recv_slave(struct ospf6_header *oh,
 			on->dbdesc_seqnum = ntohl(dbdesc->seqnum);
 
 			/* schedule NegotiationDone */
-			event_execute(master, negotiation_done, on, 0);
+			event_execute(master, negotiation_done, on, 0, NULL);
 
 			/* Record neighbor options */
 			memcpy(on->options, dbdesc->options,
@@ -2436,7 +2436,7 @@ void ospf6_dbdesc_send_newone(struct event *thread)
 		event_add_event(master, exchange_done, on, 0,
 				&on->thread_exchange_done);
 
-	event_execute(master, ospf6_dbdesc_send, on, 0);
+	event_execute(master, ospf6_dbdesc_send, on, 0, NULL);
 }
 
 static uint16_t ospf6_make_lsreq(struct ospf6_neighbor *on, struct stream *s)
@@ -2623,7 +2623,7 @@ static void ospf6_send_lsupdate(struct ospf6_neighbor *on,
 			 * it will schedule itself again.
 			 */
 			event_cancel(&ospf6->t_write);
-			event_execute(master, ospf6_write, ospf6, 0);
+			event_execute(master, ospf6_write, ospf6, 0, NULL);
 		} else
 			OSPF6_MESSAGE_WRITE_ON(oi);
 	}