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

pimd: Modifying member of pim_instance to accomodate IPv6 changes

Browse Source 
Modifying igmp_watermark_limit of struct pim_instance
to gm_watermark_limit 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-06-30 01:17:26 -07:00
parent fd878267a3
commit 229a20e2ad
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pimd/pim6_cmd.c
View File

@ -687,7 +687,7 @@ DEFPY (ipv6_mld_group_watermark,
{ {
PIM_DECLVAR_CONTEXT_VRF(vrf, pim); PIM_DECLVAR_CONTEXT_VRF(vrf, pim);
/* TBD Depends on MLD data structure changes */ /* TBD Depends on MLD data structure changes */
(void)pim; (void)pim;
return CMD_SUCCESS; return CMD_SUCCESS;

10
pimd/pim_cmd.c
View File

@ -1135,12 +1135,12 @@ static void igmp_show_groups(struct pim_instance *pim, struct vty *vty, bool 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->igmp_group_count);
json_object_int_add(json, "watermarkLimit", json_object_int_add(json, "watermarkLimit",
pim->igmp_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->igmp_group_count);
vty_out(vty, "Watermark warn limit(%s): %u\n", vty_out(vty, "Watermark warn limit(%s): %u\n",
pim->igmp_watermark_limit ? "Set" : "Not Set", pim->gm_watermark_limit ? "Set" : "Not Set",
pim->igmp_watermark_limit); pim->gm_watermark_limit);
vty_out(vty, vty_out(vty,
"Interface Group Mode Timer Srcs V Uptime \n"); "Interface Group Mode Timer Srcs V Uptime \n");
} }
@ -3334,7 +3334,7 @@ DEFPY (ip_igmp_group_watermark,
"Group count to generate watermark warning\n") "Group count to generate watermark warning\n")
{ {
PIM_DECLVAR_CONTEXT_VRF(vrf, pim); PIM_DECLVAR_CONTEXT_VRF(vrf, pim);
pim->igmp_watermark_limit = limit; pim->gm_watermark_limit = limit;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -3349,7 +3349,7 @@ DEFPY (no_ip_igmp_group_watermark,
IGNORED_IN_NO_STR) IGNORED_IN_NO_STR)
{ {
PIM_DECLVAR_CONTEXT_VRF(vrf, pim); PIM_DECLVAR_CONTEXT_VRF(vrf, pim);
pim->igmp_watermark_limit = 0; pim->gm_watermark_limit = 0;
return CMD_SUCCESS; return CMD_SUCCESS;
} }

4
pimd/pim_igmp.c
View File

@ -1009,8 +1009,8 @@ 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->igmp_group_count;
if (pim_ifp->pim->igmp_group_count if (pim_ifp->pim->igmp_group_count ==
== pim_ifp->pim->igmp_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->igmp_group_count,

2
pimd/pim_instance.h
View File

@ -173,7 +173,7 @@ struct pim_instance {
struct thread *t_gm_recv; struct thread *t_gm_recv;
unsigned int igmp_group_count; unsigned int igmp_group_count;
unsigned int igmp_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;

4
pimd/pim_vty.c
View File

@ -260,9 +260,9 @@ int pim_global_config_write_worker(struct pim_instance *pim, struct vty *vty)
++writes; ++writes;
} }
if (pim->igmp_watermark_limit != 0) { if (pim->gm_watermark_limit != 0) {
vty_out(vty, "%sip igmp watermark-warn %u\n", spaces, vty_out(vty, "%sip igmp watermark-warn %u\n", spaces,
pim->igmp_watermark_limit); pim->gm_watermark_limit);
++writes; ++writes;
} }