Merge pull request #13529 from pguibert6WIND/bgp_vpnv6_per_nexthop_fix

[mirror_frr.git] / ospf6d / ospf6_neighbor.h

diff --git a/ospf6d/ospf6_neighbor.h b/ospf6d/ospf6_neighbor.h
index ea4d4241528ff39142d6b800bf13e77884f3c9d0..5ec754d3a4c23b2b9994f319e24f3fd242b31db1 100644 (file)
--- a/ospf6d/ospf6_neighbor.h
+++ b/ospf6d/ospf6_neighbor.h
@@ -1,21 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2003 Yasuhiro Ohara
- *
- * 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 OSPF6_NEIGHBOR_H
@@ -51,7 +36,7 @@ struct ospf6_helper_info {
         * helper until this timer until
         * this timer expires.
         */
-       struct thread *t_grace_timer;
+       struct event *t_grace_timer;
 
        /* Helper status */
        uint32_t gr_helper_status;
@@ -126,18 +111,18 @@ struct ospf6_neighbor {
        struct ospf6_lsa *last_ls_req;
 
        /* Inactivity timer */
-       struct thread *inactivity_timer;
+       struct event *inactivity_timer;
 
        /* Timer to release the last dbdesc packet */
-       struct thread *last_dbdesc_release_timer;
+       struct event *last_dbdesc_release_timer;
 
        /* Thread for sending message */
-       struct thread *thread_send_dbdesc;
-       struct thread *thread_send_lsreq;
-       struct thread *thread_send_lsupdate;
-       struct thread *thread_send_lsack;
-       struct thread *thread_exchange_done;
-       struct thread *thread_adj_ok;
+       struct event *thread_send_dbdesc;
+       struct event *thread_send_lsreq;
+       struct event *thread_send_lsupdate;
+       struct event *thread_send_lsack;
+       struct event *thread_exchange_done;
+       struct event *thread_adj_ok;
 
        /* BFD information */
        struct bfd_session_params *bfd_session;
@@ -205,16 +190,16 @@ struct ospf6_neighbor *ospf6_neighbor_create(uint32_t router_id,
 void ospf6_neighbor_delete(struct ospf6_neighbor *on);
 
 /* Neighbor event */
-extern void hello_received(struct thread *thread);
-extern void twoway_received(struct thread *thread);
-extern void negotiation_done(struct thread *thread);
-extern void exchange_done(struct thread *thread);
-extern void loading_done(struct thread *thread);
-extern void adj_ok(struct thread *thread);
-extern void seqnumber_mismatch(struct thread *thread);
-extern void bad_lsreq(struct thread *thread);
-extern void oneway_received(struct thread *thread);
-extern void inactivity_timer(struct thread *thread);
+extern void hello_received(struct event *thread);
+extern void twoway_received(struct event *thread);
+extern void negotiation_done(struct event *thread);
+extern void exchange_done(struct event *thread);
+extern void loading_done(struct event *thread);
+extern void adj_ok(struct event *thread);
+extern void seqnumber_mismatch(struct event *thread);
+extern void bad_lsreq(struct event *thread);
+extern void oneway_received(struct event *thread);
+extern void inactivity_timer(struct event *thread);
 extern void ospf6_check_nbr_loading(struct ospf6_neighbor *on);
 
 extern void ospf6_neighbor_init(void);