Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / pimd / pim_jp_agg.h

diff --git a/pimd/pim_jp_agg.h b/pimd/pim_jp_agg.h
index ed6d6ae52919a2ad052e813d8759a79b61e38b23..926d21157fc6b9860e1b0ab03af7412713cdd275 100644 (file)
--- a/pimd/pim_jp_agg.h
+++ b/pimd/pim_jp_agg.h
@@ -1,33 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * PIM for FRR - J/P Aggregation
  * Copyright (C) 2017 Cumulus Networks, Inc.
  * Donald Sharp
- *
- * 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_JP_AGG_H__
 #define __PIM_JP_AGG_H__
 
+#include "pim_rpf.h"
+
 struct pim_jp_sources {
        struct pim_upstream *up;
        int is_join;
 };
 
 struct pim_jp_agg_group {
-       struct in_addr group;
+       pim_addr group;
        struct list *sources;
 };
 
@@ -38,10 +26,11 @@ void pim_jp_agg_group_list_free(struct pim_jp_agg_group *jag);
 int pim_jp_agg_group_list_cmp(void *arg1, void *arg2);
 
 void pim_jp_agg_clear_group(struct list *group);
-void pim_jp_agg_remove_group(struct list *group, struct pim_upstream *up);
+void pim_jp_agg_remove_group(struct list *group, struct pim_upstream *up,
+               struct pim_neighbor *nbr);
 
 void pim_jp_agg_add_group(struct list *group, struct pim_upstream *up,
-                         bool is_join);
+               bool is_join, struct pim_neighbor *nbr);
 
 void pim_jp_agg_switch_interface(struct pim_rpf *orpf, struct pim_rpf *nrpf,
                                 struct pim_upstream *up);