*: Rename `struct thread` to `struct event`

[mirror_frr.git] / pimd / pim_neighbor.h

diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h
index d71b2b87c30880a6661724317073ea725e11ec95..69e9976de5fb33dbb5ebbedecd4b1aecc200b52c 100644 (file)
--- a/pimd/pim_neighbor.h
+++ b/pimd/pim_neighbor.h
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * PIM for Quagga
  * Copyright (C) 2008  Everton da Silva Marques
- *
- * 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_NEIGHBOR_H
@@ -28,10 +15,11 @@
 
 #include "pim_tlv.h"
 #include "pim_iface.h"
+#include "pim_str.h"
 
 struct pim_neighbor {
        int64_t creation; /* timestamp of creation */
-       struct in_addr source_addr;
+       pim_addr source_addr;
        pim_hello_options hello_options;
        uint16_t holdtime;
        uint16_t propagation_delay_msec;
@@ -39,10 +27,10 @@ struct pim_neighbor {
        uint32_t dr_priority;
        uint32_t generation_id;
        struct list *prefix_list; /* list of struct prefix */
-       struct thread *t_expire_timer;
+       struct event *t_expire_timer;
        struct interface *interface;
 
-       struct thread *jp_timer;
+       struct event *jp_timer;
        struct list *upstream_jp_agg;
        struct bfd_session_params *bfd_session;
 };
@@ -50,7 +38,7 @@ struct pim_neighbor {
 void pim_neighbor_timer_reset(struct pim_neighbor *neigh, uint16_t holdtime);
 void pim_neighbor_free(struct pim_neighbor *neigh);
 struct pim_neighbor *pim_neighbor_find(struct interface *ifp,
-                                      struct in_addr source_addr);
+                                      pim_addr source_addr, bool secondary);
 struct pim_neighbor *pim_neighbor_find_by_secondary(struct interface *ifp,
                                                    struct prefix *src);
 struct pim_neighbor *pim_neighbor_find_if(struct interface *ifp);
@@ -59,7 +47,7 @@ struct pim_neighbor *pim_neighbor_find_if(struct interface *ifp);
 #define PIM_NEIGHBOR_SEND_DELAY 0
 #define PIM_NEIGHBOR_SEND_NOW   1
 struct pim_neighbor *
-pim_neighbor_add(struct interface *ifp, struct in_addr source_addr,
+pim_neighbor_add(struct interface *ifp, pim_addr source_addr,
                 pim_hello_options hello_options, uint16_t holdtime,
                 uint16_t propagation_delay, uint16_t override_interval,
                 uint32_t dr_priority, uint32_t generation_id,