diff options
Diffstat (limited to 'pimd/pim_ifchannel.c')
| -rw-r--r-- | pimd/pim_ifchannel.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index a17e8e89b2..c0d693071f 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -446,8 +446,7 @@ void reset_ifassert_state(struct pim_ifchannel *ch) router->infinite_assert_metric); } -struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp, - struct prefix_sg *sg) +struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp, pim_sgaddr *sg) { struct pim_interface *pim_ifp; struct pim_ifchannel *ch; @@ -524,7 +523,7 @@ void pim_ifchannel_delete_on_noinfo(struct interface *ifp) */ static struct pim_ifchannel *pim_ifchannel_find_parent(struct pim_ifchannel *ch) { - struct prefix_sg parent_sg = ch->sg; + pim_sgaddr parent_sg = ch->sg; struct pim_ifchannel *parent = NULL; // (S,G) @@ -541,8 +540,7 @@ static struct pim_ifchannel *pim_ifchannel_find_parent(struct pim_ifchannel *ch) return NULL; } -struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, - struct prefix_sg *sg, +struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, pim_sgaddr *sg, uint8_t source_flags, int up_flags) { struct pim_interface *pim_ifp; @@ -752,7 +750,7 @@ static int on_ifjoin_prune_pending_timer(struct thread *t) } static void check_recv_upstream(int is_join, struct interface *recv_ifp, - struct in_addr upstream, struct prefix_sg *sg, + struct in_addr upstream, pim_sgaddr *sg, uint8_t source_flags, int holdtime) { struct pim_upstream *up; @@ -817,7 +815,7 @@ static void check_recv_upstream(int is_join, struct interface *recv_ifp, } static int nonlocal_upstream(int is_join, struct interface *recv_ifp, - struct in_addr upstream, struct prefix_sg *sg, + struct in_addr upstream, pim_sgaddr *sg, uint8_t source_flags, uint16_t holdtime) { struct pim_interface *recv_pim_ifp; @@ -871,7 +869,7 @@ static void pim_ifchannel_ifjoin_handler(struct pim_ifchannel *ch, void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr, - struct in_addr upstream, struct prefix_sg *sg, + struct in_addr upstream, pim_sgaddr *sg, uint8_t source_flags, uint16_t holdtime) { struct pim_interface *pim_ifp; @@ -1036,7 +1034,7 @@ void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr, } void pim_ifchannel_prune(struct interface *ifp, struct in_addr upstream, - struct prefix_sg *sg, uint8_t source_flags, + pim_sgaddr *sg, uint8_t source_flags, uint16_t holdtime) { struct pim_ifchannel *ch; @@ -1172,8 +1170,8 @@ void pim_ifchannel_prune(struct interface *ifp, struct in_addr upstream, } } -int pim_ifchannel_local_membership_add(struct interface *ifp, - struct prefix_sg *sg, bool is_vxlan) +int pim_ifchannel_local_membership_add(struct interface *ifp, pim_sgaddr *sg, + bool is_vxlan) { struct pim_ifchannel *ch, *starch; struct pim_interface *pim_ifp; @@ -1278,8 +1276,7 @@ int pim_ifchannel_local_membership_add(struct interface *ifp, return 1; } -void pim_ifchannel_local_membership_del(struct interface *ifp, - struct prefix_sg *sg) +void pim_ifchannel_local_membership_del(struct interface *ifp, pim_sgaddr *sg) { struct pim_ifchannel *starch, *ch, *orig; struct pim_interface *pim_ifp; |