*: Convert thread_add_XXX functions to event_add_XXX

[mirror_frr.git] / ospfd / ospf_packet.c

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index c4bccb3bc4f2f1c814e508014707159e319addc3..d53f65e9465991c72f43525d57eb0a02c2707305 100644 (file)
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -7,7 +7,7 @@
 #include <zebra.h>
 
 #include "monotime.h"
-#include "thread.h"
+#include "event.h"
 #include "memory.h"
 #include "linklist.h"
 #include "prefix.h"
@@ -439,7 +439,7 @@ static int ospf_make_md5_digest(struct ospf_interface *oi,
 }
 
 
-static void ospf_ls_req_timer(struct thread *thread)
+static void ospf_ls_req_timer(struct event *thread)
 {
        struct ospf_neighbor *nbr;
 
@@ -457,12 +457,12 @@ static void ospf_ls_req_timer(struct thread *thread)
 void ospf_ls_req_event(struct ospf_neighbor *nbr)
 {
        THREAD_OFF(nbr->t_ls_req);
-       thread_add_event(master, ospf_ls_req_timer, nbr, 0, &nbr->t_ls_req);
+       event_add_event(master, ospf_ls_req_timer, nbr, 0, &nbr->t_ls_req);
 }
 
 /* Cyclic timer function.  Fist registered in ospf_nbr_new () in
    ospf_neighbor.c  */
-void ospf_ls_upd_timer(struct thread *thread)
+void ospf_ls_upd_timer(struct event *thread)
 {
        struct ospf_neighbor *nbr;
 
@@ -520,7 +520,7 @@ void ospf_ls_upd_timer(struct thread *thread)
        OSPF_NSM_TIMER_ON(nbr->t_ls_upd, ospf_ls_upd_timer, nbr->v_ls_upd);
 }
 
-void ospf_ls_ack_timer(struct thread *thread)
+void ospf_ls_ack_timer(struct event *thread)
 {
        struct ospf_interface *oi;
 
@@ -608,7 +608,7 @@ static void ospf_write_frags(int fd, struct ospf_packet *op, struct ip *iph,
 }
 #endif /* WANT_OSPF_WRITE_FRAGMENT */
 
-static void ospf_write(struct thread *thread)
+static void ospf_write(struct event *thread)
 {
        struct ospf *ospf = THREAD_ARG(thread);
        struct ospf_interface *oi;
@@ -847,8 +847,8 @@ static void ospf_write(struct thread *thread)
 
        /* If packets still remain in queue, call write thread. */
        if (!list_isempty(ospf->oi_write_q))
-               thread_add_write(master, ospf_write, ospf, ospf->fd,
-                                &ospf->t_write);
+               event_add_write(master, ospf_write, ospf, ospf->fd,
+                               &ospf->t_write);
 }
 
 /* OSPF Hello message read -- RFC2328 Section 10.5. */
@@ -3203,7 +3203,7 @@ static enum ospf_read_return_enum ospf_read_helper(struct ospf *ospf)
 }
 
 /* Starting point of packet process function. */
-void ospf_read(struct thread *thread)
+void ospf_read(struct event *thread)
 {
        struct ospf *ospf;
        int32_t count = 0;
@@ -3213,7 +3213,7 @@ void ospf_read(struct thread *thread)
        ospf = THREAD_ARG(thread);
 
        /* prepare for next packet. */
-       thread_add_read(master, ospf_read, ospf, ospf->fd, &ospf->t_read);
+       event_add_read(master, ospf_read, ospf, ospf->fd, &ospf->t_read);
 
        while (count < ospf->write_oi_count) {
                count++;
@@ -3738,7 +3738,7 @@ static void ospf_poll_send(struct ospf_nbr_nbma *nbr_nbma)
        ospf_hello_send_sub(oi, nbr_nbma->addr.s_addr);
 }
 
-void ospf_poll_timer(struct thread *thread)
+void ospf_poll_timer(struct event *thread)
 {
        struct ospf_nbr_nbma *nbr_nbma;
 
@@ -3757,7 +3757,7 @@ void ospf_poll_timer(struct thread *thread)
 }
 
 
-void ospf_hello_reply_timer(struct thread *thread)
+void ospf_hello_reply_timer(struct event *thread)
 {
        struct ospf_neighbor *nbr;
 
@@ -4072,7 +4072,7 @@ static void ospf_ls_upd_queue_send(struct ospf_interface *oi,
        ospf_packet_add(oi, op);
        /* Call ospf_write() right away to send ospf packets to neighbors */
        if (send_lsupd_now) {
-               struct thread os_packet_thd;
+               struct event os_packet_thd;
 
                os_packet_thd.arg = (void *)oi->ospf;
                if (oi->on_write_q == 0) {
@@ -4103,7 +4103,7 @@ static void ospf_ls_upd_queue_send(struct ospf_interface *oi,
        }
 }
 
-static void ospf_ls_upd_send_queue_event(struct thread *thread)
+static void ospf_ls_upd_send_queue_event(struct event *thread)
 {
        struct ospf_interface *oi = THREAD_ARG(thread);
        struct route_node *rn;
@@ -4140,8 +4140,8 @@ static void ospf_ls_upd_send_queue_event(struct thread *thread)
                                "%s: update lists not cleared, %d nodes to try again, raising new event",
                                __func__, again);
                oi->t_ls_upd_event = NULL;
-               thread_add_event(master, ospf_ls_upd_send_queue_event, oi, 0,
-                                &oi->t_ls_upd_event);
+               event_add_event(master, ospf_ls_upd_send_queue_event, oi, 0,
+                               &oi->t_ls_upd_event);
        }
 
        if (IS_DEBUG_OSPF_EVENT)
@@ -4212,8 +4212,8 @@ void ospf_ls_upd_send(struct ospf_neighbor *nbr, struct list *update, int flag,
                                               rn->p.u.prefix4, 1);
                }
        } else
-               thread_add_event(master, ospf_ls_upd_send_queue_event, oi, 0,
-                                &oi->t_ls_upd_event);
+               event_add_event(master, ospf_ls_upd_send_queue_event, oi, 0,
+                               &oi->t_ls_upd_event);
 }
 
 static void ospf_ls_ack_send_list(struct ospf_interface *oi, struct list *ack,
@@ -4250,7 +4250,7 @@ static void ospf_ls_ack_send_list(struct ospf_interface *oi, struct list *ack,
        OSPF_ISM_WRITE_ON(oi->ospf);
 }
 
-static void ospf_ls_ack_send_event(struct thread *thread)
+static void ospf_ls_ack_send_event(struct event *thread)
 {
        struct ospf_interface *oi = THREAD_ARG(thread);
 
@@ -4276,8 +4276,8 @@ void ospf_ls_ack_send(struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
 
        listnode_add(oi->ls_ack_direct.ls_ack, ospf_lsa_lock(lsa));
 
-       thread_add_event(master, ospf_ls_ack_send_event, oi, 0,
-                        &oi->t_ls_ack_direct);
+       event_add_event(master, ospf_ls_ack_send_event, oi, 0,
+                       &oi->t_ls_ack_direct);
 }
 
 /* Send Link State Acknowledgment delayed. */