diff options
| author | Jafar Al-Gharaibeh <jafar@atcorp.com> | 2024-12-12 10:57:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-12 10:57:06 -0600 |
| commit | f7720ab68fcfb24e7fa51f682d248086c45ef85a (patch) | |
| tree | 2e20552df88298e4c14a27ff43f3a13c3ae2b019 /pimd/pim_msdp_packet.c | |
| parent | f170e9bba933ea0f4ba7d7000480a7cae97e304d (diff) | |
| parent | e3af4b8c566f22d36b8dc0590d446039f90dbdd7 (diff) | |
Merge pull request #17622 from opensourcerouting/msdp-originator
pimd: MSDP originador ID configuration
Diffstat (limited to 'pimd/pim_msdp_packet.c')
| -rw-r--r-- | pimd/pim_msdp_packet.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pimd/pim_msdp_packet.c b/pimd/pim_msdp_packet.c index c858bad1ad..8c821cb5e5 100644 --- a/pimd/pim_msdp_packet.c +++ b/pimd/pim_msdp_packet.c @@ -409,7 +409,6 @@ static void pim_msdp_pkt_sa_gen(struct pim_instance *pim, { struct listnode *sanode; struct pim_msdp_sa *sa; - struct rp_info *rp_info; struct prefix group_all; struct in_addr rp; int sa_count; @@ -420,14 +419,8 @@ static void pim_msdp_pkt_sa_gen(struct pim_instance *pim, zlog_debug(" sa gen %d", local_cnt); } - rp = pim->msdp.originator_id; - if (pim_get_all_mcast_group(&group_all)) { - rp_info = pim_rp_find_match_group(pim, &group_all); - if (rp_info) { - rp = rp_info->rp.rpf_addr; - } - } - + pim_get_all_mcast_group(&group_all); + pim_msdp_originator_id(pim, &group_all, &rp); local_cnt = pim_msdp_pkt_sa_fill_hdr(pim, local_cnt, rp); for (ALL_LIST_ELEMENTS_RO(pim->msdp.sa_list, sanode, sa)) { @@ -457,8 +450,7 @@ static void pim_msdp_pkt_sa_gen(struct pim_instance *pim, zlog_debug(" sa gen for remainder %d", local_cnt); } - local_cnt = pim_msdp_pkt_sa_fill_hdr( - pim, local_cnt, rp); + local_cnt = pim_msdp_pkt_sa_fill_hdr(pim, local_cnt, rp); } } |