summaryrefslogtreecommitdiffstats
path: root/pimd/pim_igmp.c
diff options
context:
space:
mode:
authorSai Gomathi N <nsaigomathi@vmware.com>2022-08-02 12:55:09 +0200
committerSai Gomathi N <nsaigomathi@vmware.com>2022-08-26 10:14:08 +0200
commit8934215f65b9b871f97848bb1ac65d4160d2581d (patch)
tree3acfa4b64c14c2d5602ea6a2788f58d983708acc /pimd/pim_igmp.c
parentMerge pull request #11854 from donaldsharp/memory_walk_in_gdb (diff)
downloadfrr-8934215f65b9b871f97848bb1ac65d4160d2581d.tar.xz
frr-8934215f65b9b871f97848bb1ac65d4160d2581d.zip
pimd: Modifying member of pim_instance to accomodate IPv6 changes
Modifying igmp_group_count of struct pim_instance to gm_group_count which is to be used for both IGMP and MLD. Signed-off-by: Sai Gomathi N <nsaigomathi@vmware.com>
Diffstat (limited to 'pimd/pim_igmp.c')
-rw-r--r--pimd/pim_igmp.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 6ffeeb965..fdc56fd3f 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -1008,12 +1008,11 @@ static void igmp_group_count_incr(struct pim_interface *pim_ifp)
{
uint32_t group_count = listcount(pim_ifp->gm_group_list);
- ++pim_ifp->pim->igmp_group_count;
- if (pim_ifp->pim->igmp_group_count ==
- pim_ifp->pim->gm_watermark_limit) {
+ ++pim_ifp->pim->gm_group_count;
+ if (pim_ifp->pim->gm_group_count == pim_ifp->pim->gm_watermark_limit) {
zlog_warn(
"IGMP group count reached watermark limit: %u(vrf: %s)",
- pim_ifp->pim->igmp_group_count,
+ pim_ifp->pim->gm_group_count,
VRF_LOGNAME(pim_ifp->pim->vrf));
}
@@ -1023,13 +1022,13 @@ static void igmp_group_count_incr(struct pim_interface *pim_ifp)
static void igmp_group_count_decr(struct pim_interface *pim_ifp)
{
- if (pim_ifp->pim->igmp_group_count == 0) {
+ if (pim_ifp->pim->gm_group_count == 0) {
zlog_warn("Cannot decrement igmp group count below 0(vrf: %s)",
VRF_LOGNAME(pim_ifp->pim->vrf));
return;
}
- --pim_ifp->pim->igmp_group_count;
+ --pim_ifp->pim->gm_group_count;
}
void igmp_group_delete(struct gm_group *group)