Merge pull request #10447 from ton31337/fix/json_with_whitespaces

[mirror_frr.git] / pimd / pim_rp.h

diff --git a/pimd/pim_rp.h b/pimd/pim_rp.h
index 595025e5c97740ca707dedfc22a7e2acfbba7ad6..04faeb5f26b30a6179ea2394c5e7b7cbafad907d 100644 (file)
--- a/pimd/pim_rp.h
+++ b/pimd/pim_rp.h
@@ -47,15 +47,13 @@ void pim_rp_free(struct pim_instance *pim);
 
 void pim_rp_list_hash_clean(void *data);
 
-int pim_rp_new(struct pim_instance *pim, struct in_addr rp_addr,
-              struct prefix group, const char *plist,
-              enum rp_source rp_src_flag);
-int pim_rp_del_config(struct pim_instance *pim, const char *rp,
-                     const char *group, const char *plist);
-int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
-              struct prefix group, const char *plist,
-              enum rp_source rp_src_flag);
-int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
+int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
+              const char *plist, enum rp_source rp_src_flag);
+void pim_rp_del_config(struct pim_instance *pim, pim_addr rp_addr,
+                      const char *group, const char *plist);
+int pim_rp_del(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
+              const char *plist, enum rp_source rp_src_flag);
+int pim_rp_change(struct pim_instance *pim, pim_addr new_rp_addr,
                  struct prefix group, enum rp_source rp_src_flag);
 void pim_rp_prefix_list_update(struct pim_instance *pim,
                               struct prefix_list *plist);
@@ -65,23 +63,23 @@ int pim_rp_config_write(struct pim_instance *pim, struct vty *vty,
 
 void pim_rp_setup(struct pim_instance *pim);
 
-int pim_rp_i_am_rp(struct pim_instance *pim, struct in_addr group);
+int pim_rp_i_am_rp(struct pim_instance *pim, pim_addr group);
 void pim_rp_check_on_if_add(struct pim_interface *pim_ifp);
 void pim_i_am_rp_re_evaluate(struct pim_instance *pim);
 
 bool pim_rp_check_is_my_ip_address(struct pim_instance *pim,
                                   struct in_addr dest_addr);
 
-int pim_rp_set_upstream_addr(struct pim_instance *pim, struct in_addr *up,
-                            struct in_addr source, struct in_addr group);
+int pim_rp_set_upstream_addr(struct pim_instance *pim, pim_addr *up,
+                            pim_addr source, pim_addr group);
 
-struct pim_rpf *pim_rp_g(struct pim_instance *pim, struct in_addr group);
+struct pim_rpf *pim_rp_g(struct pim_instance *pim, pim_addr group);
 
 #define I_am_RP(P, G)  pim_rp_i_am_rp ((P), (G))
 #define RP(P, G)       pim_rp_g ((P), (G))
 
-void pim_rp_show_information(struct pim_instance *pim, struct vty *vty,
-                            bool uj);
+void pim_rp_show_information(struct pim_instance *pim, struct prefix *range,
+                            struct vty *vty, bool uj);
 void pim_resolve_rp_nh(struct pim_instance *pim, struct pim_neighbor *nbr);
 int pim_rp_list_cmp(void *v1, void *v2);
 struct rp_info *pim_rp_find_match_group(struct pim_instance *pim,