diff options
Diffstat (limited to 'pimd/pim_msdp.c')
| -rw-r--r-- | pimd/pim_msdp.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c index fa7f1da79a..40d864d1da 100644 --- a/pimd/pim_msdp.c +++ b/pimd/pim_msdp.c @@ -152,7 +152,7 @@ static bool pim_msdp_sa_upstream_add_ok(struct pim_msdp_sa *sa, /* check if we have a (*, G) with a non-empty immediate OIL */ if (!xg_up) { - struct prefix_sg sg; + pim_sgaddr sg; memset(&sg, 0, sizeof(sg)); sg.grp = sa->sg.grp; @@ -237,8 +237,7 @@ static void pim_msdp_sa_free(struct pim_msdp_sa *sa) } static struct pim_msdp_sa *pim_msdp_sa_new(struct pim_instance *pim, - struct prefix_sg *sg, - struct in_addr rp) + pim_sgaddr *sg, struct in_addr rp) { struct pim_msdp_sa *sa; @@ -262,7 +261,7 @@ static struct pim_msdp_sa *pim_msdp_sa_new(struct pim_instance *pim, } static struct pim_msdp_sa *pim_msdp_sa_find(struct pim_instance *pim, - struct prefix_sg *sg) + pim_sgaddr *sg) { struct pim_msdp_sa lookup; @@ -271,8 +270,7 @@ static struct pim_msdp_sa *pim_msdp_sa_find(struct pim_instance *pim, } static struct pim_msdp_sa *pim_msdp_sa_add(struct pim_instance *pim, - struct prefix_sg *sg, - struct in_addr rp) + pim_sgaddr *sg, struct in_addr rp) { struct pim_msdp_sa *sa; @@ -386,7 +384,7 @@ static void pim_msdp_sa_deref(struct pim_msdp_sa *sa, } void pim_msdp_sa_ref(struct pim_instance *pim, struct pim_msdp_peer *mp, - struct prefix_sg *sg, struct in_addr rp) + pim_sgaddr *sg, struct in_addr rp) { struct pim_msdp_sa *sa; @@ -467,15 +465,14 @@ static bool pim_msdp_sa_local_add_ok(struct pim_upstream *up) return false; } -static void pim_msdp_sa_local_add(struct pim_instance *pim, - struct prefix_sg *sg) +static void pim_msdp_sa_local_add(struct pim_instance *pim, pim_sgaddr *sg) { struct in_addr rp; rp.s_addr = INADDR_ANY; pim_msdp_sa_ref(pim, NULL /* mp */, sg, rp); } -void pim_msdp_sa_local_del(struct pim_instance *pim, struct prefix_sg *sg) +void pim_msdp_sa_local_del(struct pim_instance *pim, pim_sgaddr *sg) { struct pim_msdp_sa *sa; @@ -488,7 +485,7 @@ void pim_msdp_sa_local_del(struct pim_instance *pim, struct prefix_sg *sg) /* we need to be very cautious with this API as SA del too can trigger an * upstream del and we will get stuck in a simple loop */ static void pim_msdp_sa_local_del_on_up_del(struct pim_instance *pim, - struct prefix_sg *sg) + pim_sgaddr *sg) { struct pim_msdp_sa *sa; @@ -643,7 +640,7 @@ void pim_msdp_up_join_state_changed(struct pim_instance *pim, } } -static void pim_msdp_up_xg_del(struct pim_instance *pim, struct prefix_sg *sg) +static void pim_msdp_up_xg_del(struct pim_instance *pim, pim_sgaddr *sg) { struct listnode *sanode; struct pim_msdp_sa *sa; @@ -667,7 +664,7 @@ static void pim_msdp_up_xg_del(struct pim_instance *pim, struct prefix_sg *sg) } } -void pim_msdp_up_del(struct pim_instance *pim, struct prefix_sg *sg) +void pim_msdp_up_del(struct pim_instance *pim, pim_sgaddr *sg) { if (PIM_DEBUG_MSDP_INTERNAL) { zlog_debug("MSDP up %s del", pim_str_sg_dump(sg)); |