*: Convert thread_cancelXXX to event_cancelXXX

[mirror_frr.git] / pimd / pim_msdp.h

diff --git a/pimd/pim_msdp.h b/pimd/pim_msdp.h
index 4e1114aff2870d064dbca5183203e84ee6760cea..753279a700b6c4c9399d4497eab74f0ae20d3e26 100644 (file)
--- a/pimd/pim_msdp.h
+++ b/pimd/pim_msdp.h
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * IP MSDP for Quagga
  * Copyright (C) 2016 Cumulus Networks, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #ifndef PIM_MSDP_H
 #define PIM_MSDP_H
@@ -87,7 +74,7 @@ struct pim_msdp_sa {
 /* rfc-3618 is missing default value for SA-hold-down-Period. pulled
  * this number from industry-standards */
 #define PIM_MSDP_SA_HOLD_TIME ((3*60)+30)
-       struct thread *sa_state_timer; // 5.6
+       struct event *sa_state_timer; // 5.6
        int64_t uptime;
 
        struct pim_upstream *up;
@@ -122,18 +109,18 @@ struct pim_msdp_peer {
 
 /* protocol timers */
 #define PIM_MSDP_PEER_HOLD_TIME 75
-       struct thread *hold_timer; // 5.4
+       struct event *hold_timer; // 5.4
 #define PIM_MSDP_PEER_KA_TIME 60
-       struct thread *ka_timer; // 5.5
+       struct event *ka_timer; // 5.5
 #define PIM_MSDP_PEER_CONNECT_RETRY_TIME 30
-       struct thread *cr_timer; // 5.6
+       struct event *cr_timer; // 5.6
 
        /* packet thread and buffers */
        uint32_t packet_size;
        struct stream *ibuf;
        struct stream_fifo *obuf;
-       struct thread *t_read;
-       struct thread *t_write;
+       struct event *t_read;
+       struct event *t_write;
 
        /* stats */
        uint32_t conn_attempts;
@@ -180,7 +167,7 @@ enum pim_msdp_flags {
 struct pim_msdp_listener {
        int fd;
        union sockunion su;
-       struct thread *thread;
+       struct event *thread;
 };
 
 struct pim_msdp {
@@ -195,7 +182,7 @@ struct pim_msdp {
 
 /* MSDP active-source info */
 #define PIM_MSDP_SA_ADVERTISMENT_TIME 60
-       struct thread *sa_adv_timer; // 5.6
+       struct event *sa_adv_timer; // 5.6
        struct hash *sa_hash;
        struct list *sa_list;
        uint32_t local_cnt;
@@ -217,15 +204,15 @@ struct pim_msdp {
 };
 
 #define PIM_MSDP_PEER_READ_ON(mp)                                              \
-       thread_add_read(mp->pim->msdp.master, pim_msdp_read, mp, mp->fd,       \
-                       &mp->t_read)
+       event_add_read(mp->pim->msdp.master, pim_msdp_read, mp, mp->fd,        \
+                      &mp->t_read)
 
 #define PIM_MSDP_PEER_WRITE_ON(mp)                                             \
-       thread_add_write(mp->pim->msdp.master, pim_msdp_write, mp, mp->fd,     \
-                        &mp->t_write)
+       event_add_write(mp->pim->msdp.master, pim_msdp_write, mp, mp->fd,      \
+                       &mp->t_write)
 
-#define PIM_MSDP_PEER_READ_OFF(mp) thread_cancel(&mp->t_read)
-#define PIM_MSDP_PEER_WRITE_OFF(mp) thread_cancel(&mp->t_write)
+#define PIM_MSDP_PEER_READ_OFF(mp) event_cancel(&mp->t_read)
+#define PIM_MSDP_PEER_WRITE_OFF(mp) event_cancel(&mp->t_write)
 
 #if PIM_IPV != 6
 // struct pim_msdp *msdp;
@@ -240,7 +227,7 @@ void pim_msdp_peer_established(struct pim_msdp_peer *mp);
 void pim_msdp_peer_pkt_rxed(struct pim_msdp_peer *mp);
 void pim_msdp_peer_stop_tcp_conn(struct pim_msdp_peer *mp, bool chg_state);
 void pim_msdp_peer_reset_tcp_conn(struct pim_msdp_peer *mp, const char *rc_str);
-void pim_msdp_write(struct thread *thread);
+void pim_msdp_write(struct event *thread);
 int pim_msdp_config_write(struct pim_instance *pim, struct vty *vty,
                          const char *spaces);
 bool pim_msdp_peer_config_write(struct vty *vty, struct pim_instance *pim,