diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-04-20 07:43:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-20 07:43:09 -0400 |
| commit | 831a15d3e3352ffe84e3a30144f4fe96f191dd62 (patch) | |
| tree | 90ff686158935fad6a4080ead6375c038752bb7e /pimd/pim_upstream.c | |
| parent | 3d3c38b1d44f4d6f6f04a81fca70fc7ac195812a (diff) | |
| parent | 80a82b567fd98fa8cf12cbdefab25e13f56d655f (diff) | |
Merge pull request #11023 from AbhishekNR/igmp_flag
pimd: Changing PIM_OIF_FLAG_PROTO_IGMP to PIM_OIF_FLAG_PROTO_GM
Diffstat (limited to 'pimd/pim_upstream.c')
| -rw-r--r-- | pimd/pim_upstream.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index af1254f791..c38acc485f 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -1838,7 +1838,7 @@ int pim_upstream_inherited_olist_decide(struct pim_instance *pim, flag = PIM_OIF_FLAG_PROTO_STAR; else { if (PIM_IF_FLAG_TEST_PROTO_IGMP(ch->flags)) - flag = PIM_OIF_FLAG_PROTO_IGMP; + flag = PIM_OIF_FLAG_PROTO_GM; if (PIM_IF_FLAG_TEST_PROTO_PIM(ch->flags)) flag |= PIM_OIF_FLAG_PROTO_PIM; if (starch) @@ -2116,7 +2116,7 @@ void pim_upstream_add_lhr_star_pimreg(struct pim_instance *pim) continue; pim_channel_add_oif(up->channel_oil, pim->regiface, - PIM_OIF_FLAG_PROTO_IGMP, __func__); + PIM_OIF_FLAG_PROTO_GM, __func__); } } @@ -2161,18 +2161,17 @@ void pim_upstream_remove_lhr_star_pimreg(struct pim_instance *pim, if (!nlist) { pim_channel_del_oif(up->channel_oil, pim->regiface, - PIM_OIF_FLAG_PROTO_IGMP, __func__); + PIM_OIF_FLAG_PROTO_GM, __func__); continue; } pim_addr_to_prefix(&g, up->sg.grp); apply_new = prefix_list_apply(np, &g); if (apply_new == PREFIX_DENY) pim_channel_add_oif(up->channel_oil, pim->regiface, - PIM_OIF_FLAG_PROTO_IGMP, - __func__); + PIM_OIF_FLAG_PROTO_GM, __func__); else pim_channel_del_oif(up->channel_oil, pim->regiface, - PIM_OIF_FLAG_PROTO_IGMP, __func__); + PIM_OIF_FLAG_PROTO_GM, __func__); } } |