Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / pimd / pim_ifchannel.h

diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index 332d40d926bc7b468fb01800993335d0bbd31868..7ab491e99bd8852df21a5ce853cf99f813007655 100644 (file)
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.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_IFCHANNEL_H
@@ -89,7 +76,7 @@ struct pim_ifchannel {
 
        struct pim_ifchannel *parent;
        struct list *sources;
-       struct prefix_sg sg;
+       pim_sgaddr sg;
        char sg_str[PIM_SG_LEN];
        struct interface *interface; /* backpointer to interface */
        uint32_t flags;
@@ -106,7 +93,7 @@ struct pim_ifchannel {
        /* Per-interface (S,G) Assert State (Section 4.6.1 of RFC4601) */
        enum pim_ifassert_state ifassert_state;
        struct thread *t_ifassert_timer;
-       struct in_addr ifassert_winner;
+       pim_addr ifassert_winner;
        struct pim_assert_metric ifassert_winner_metric;
        int64_t ifassert_creation; /* Record uptime of ifassert state */
        struct pim_assert_metric ifassert_my_metric;
@@ -123,21 +110,18 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch);
 void pim_ifchannel_delete_all(struct interface *ifp);
 void pim_ifchannel_membership_clear(struct interface *ifp);
 void pim_ifchannel_delete_on_noinfo(struct interface *ifp);
-struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp,
-                                        struct prefix_sg *sg);
-struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp,
-                                       struct prefix_sg *sg, uint8_t ch_flags,
-                                       int up_flags);
-void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr,
-                           struct in_addr upstream, struct prefix_sg *sg,
+struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp, pim_sgaddr *sg);
+struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, pim_sgaddr *sg,
+                                       uint8_t ch_flags, int up_flags);
+void pim_ifchannel_join_add(struct interface *ifp, pim_addr neigh_addr,
+                           pim_addr upstream, pim_sgaddr *sg,
                            uint8_t source_flags, uint16_t holdtime);
-void pim_ifchannel_prune(struct interface *ifp, struct in_addr upstream,
-                        struct prefix_sg *sg, uint8_t source_flags,
+void pim_ifchannel_prune(struct interface *ifp, pim_addr upstream,
+                        pim_sgaddr *sg, uint8_t source_flags,
                         uint16_t holdtime);
-int pim_ifchannel_local_membership_add(struct interface *ifp,
-               struct prefix_sg *sg, bool is_vxlan);
-void pim_ifchannel_local_membership_del(struct interface *ifp,
-                                       struct prefix_sg *sg);
+int pim_ifchannel_local_membership_add(struct interface *ifp, pim_sgaddr *sg,
+                                      bool is_vxlan);
+void pim_ifchannel_local_membership_del(struct interface *ifp, pim_sgaddr *sg);
 
 void pim_ifchannel_ifjoin_switch(const char *caller, struct pim_ifchannel *ch,
                                 enum pim_ifjoin_state new_state);