Merge pull request #13327 from opensourcerouting/fix/rip_status_align

[mirror_frr.git] / ripd / ripd.h

diff --git a/ripd/ripd.h b/ripd/ripd.h
index f26dcd87754d87b9ffef3d30d7f5a3e72117c67b..176a3bfc376766655b4e73b4f3d3c6ca77ffb730 100644 (file)
--- a/ripd/ripd.h
+++ b/ripd/ripd.h
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* RIP related values and structures.
  * Copyright (C) 1997, 1998, 1999 Kunihiro Ishiguro <kunihiro@zebra.org>
- *
- * This file is part of GNU Zebra.
- *
- * GNU Zebra 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, or (at your option) any
- * later version.
- *
- * GNU Zebra 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 _ZEBRA_RIP_H
@@ -132,15 +117,15 @@ struct rip {
        struct list *peer_list;
 
        /* RIP threads. */
-       struct thread *t_read;
+       struct event *t_read;
 
        /* Update and garbage timer. */
-       struct thread *t_update;
+       struct event *t_update;
 
        /* Triggered update hack. */
        int trigger;
-       struct thread *t_triggered_update;
-       struct thread *t_triggered_interval;
+       struct event *t_triggered_update;
+       struct event *t_triggered_interval;
 
        /* RIP timer values. */
        uint32_t update_time;
@@ -254,8 +239,8 @@ struct rip_info {
        uint8_t flags;
 
        /* Garbage collect timer. */
-       struct thread *t_timeout;
-       struct thread *t_garbage_collect;
+       struct event *t_timeout;
+       struct event *t_garbage_collect;
 
        /* Route-map futures - this variables can be changed. */
        struct in_addr nexthop_out;
@@ -324,7 +309,7 @@ struct rip_interface {
        struct route_map *routemap[RIP_FILTER_MAX];
 
        /* Wake up thread. */
-       struct thread *t_wakeup;
+       struct event *t_wakeup;
 
        /* Interface statistics. */
        int recv_badpackets;
@@ -357,7 +342,7 @@ struct rip_peer {
        int recv_badroutes;
 
        /* Timeout thread. */
-       struct thread *t_timeout;
+       struct event *t_timeout;
 };
 
 struct rip_distance {
@@ -402,10 +387,7 @@ enum rip_event {
 };
 
 /* Macro for timer turn on. */
-#define RIP_TIMER_ON(T,F,V) thread_add_timer (master, (F), rinfo, (V), &(T))
-
-/* Macro for timer turn off. */
-#define RIP_TIMER_OFF(X) thread_cancel(&(X))
+#define RIP_TIMER_ON(T, F, V) event_add_timer(master, (F), rinfo, (V), &(T))
 
 #define RIP_OFFSET_LIST_IN  0
 #define RIP_OFFSET_LIST_OUT 1
@@ -436,7 +418,7 @@ extern void rip_if_init(void);
 extern void rip_route_map_init(void);
 extern void rip_zebra_vrf_register(struct vrf *vrf);
 extern void rip_zebra_vrf_deregister(struct vrf *vrf);
-extern void rip_zclient_init(struct thread_master *);
+extern void rip_zclient_init(struct event_loop *e);
 extern void rip_zclient_stop(void);
 extern int if_check_address(struct rip *rip, struct in_addr addr);
 extern struct rip *rip_lookup_by_vrf_id(vrf_id_t vrf_id);
@@ -527,7 +509,7 @@ extern struct zebra_privs_t ripd_privs;
 extern struct rip_instance_head rip_instances;
 
 /* Master thread structure. */
-extern struct thread_master *master;
+extern struct event_loop *master;
 
 DECLARE_HOOK(rip_ifaddr_add, (struct connected * ifc), (ifc));
 DECLARE_HOOK(rip_ifaddr_del, (struct connected * ifc), (ifc));