proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 14:04:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Modifying member of pim_instance to accomodate IPv6 changes

Browse Source 
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>
This commit is contained in:
Sai Gomathi N 2022-08-02 03:55:09 -07:00
parent 1823510862
commit 8934215f65
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pimd/pim_cmd.c
View File

@ -1129,11 +1129,11 @@ static void igmp_show_groups(struct pim_instance *pim, struct vty *vty, bool uj)
if (uj) { if (uj) {
json = json_object_new_object(); json = json_object_new_object();
json_object_int_add(json, "totalGroups", pim->igmp_group_count); json_object_int_add(json, "totalGroups", pim->gm_group_count);
json_object_int_add(json, "watermarkLimit", json_object_int_add(json, "watermarkLimit",
pim->gm_watermark_limit); pim->gm_watermark_limit);
} else { } else {
vty_out(vty, "Total IGMP groups: %u\n", pim->igmp_group_count); vty_out(vty, "Total IGMP groups: %u\n", pim->gm_group_count);
vty_out(vty, "Watermark warn limit(%s): %u\n", vty_out(vty, "Watermark warn limit(%s): %u\n",
pim->gm_watermark_limit ? "Set" : "Not Set", pim->gm_watermark_limit ? "Set" : "Not Set",
pim->gm_watermark_limit); pim->gm_watermark_limit);

11
pimd/pim_igmp.c
View File

@ -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); uint32_t group_count = listcount(pim_ifp->gm_group_list);
++pim_ifp->pim->igmp_group_count; ++pim_ifp->pim->gm_group_count;
if (pim_ifp->pim->igmp_group_count == if (pim_ifp->pim->gm_group_count == pim_ifp->pim->gm_watermark_limit) {
pim_ifp->pim->gm_watermark_limit) {
zlog_warn( zlog_warn(
"IGMP group count reached watermark limit: %u(vrf: %s)", "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)); 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) 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)", zlog_warn("Cannot decrement igmp group count below 0(vrf: %s)",
VRF_LOGNAME(pim_ifp->pim->vrf)); VRF_LOGNAME(pim_ifp->pim->vrf));
return; return;
} }
--pim_ifp->pim->igmp_group_count; --pim_ifp->pim->gm_group_count;
} }
void igmp_group_delete(struct gm_group *group) void igmp_group_delete(struct gm_group *group)

2
pimd/pim_instance.h
View File

@ -173,7 +173,7 @@ struct pim_instance {
int gm_socket; int gm_socket;
struct thread *t_gm_recv; struct thread *t_gm_recv;
unsigned int igmp_group_count; unsigned int gm_group_count;
unsigned int gm_watermark_limit; unsigned int gm_watermark_limit;
unsigned int keep_alive_time; unsigned int keep_alive_time;
unsigned int rp_keep_alive_time; unsigned int rp_keep_alive_time;