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

pimd: modifications in PIM joins

Browse Source 
Problem :
=======
(*,G) created on transit node where same groups are defined as SSM
At present FRR has SSM checks for IGMP report, but SSM check is missing for PIM join.

Fix :
===
When an interface receives the PIM (*,G)join with G as SSM group, then PIMd supposed to discard that join.
There is no need to maintain PIM state for this group.

Signed-off-by: Sai Gomathi <nsaigomathi@vmware.com>
This commit is contained in:
Sai Gomathi 2021-10-26 05:55:23 -07:00
parent 95bbb5e652
commit 34abbcc4b1
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pimd/pim_join.c
View File

@ -39,6 +39,7 @@
#include "pim_rp.h" #include "pim_rp.h"
#include "pim_jp_agg.h" #include "pim_jp_agg.h"
#include "pim_util.h" #include "pim_util.h"
#include "pim_ssm.h"
static void on_trace(const char *label, struct interface *ifp, static void on_trace(const char *label, struct interface *ifp,
struct in_addr src) struct in_addr src)
@ -55,6 +56,7 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
struct prefix_sg *sg, uint8_t source_flags) struct prefix_sg *sg, uint8_t source_flags)
{ {
struct pim_interface *pim_ifp = NULL; struct pim_interface *pim_ifp = NULL;
char buf[PREFIX_STRLEN];
if (PIM_DEBUG_PIM_TRACE) { if (PIM_DEBUG_PIM_TRACE) {
char up_str[INET_ADDRSTRLEN]; char up_str[INET_ADDRSTRLEN];
@ -105,6 +107,14 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
return; return;
} }
if (pim_is_grp_ssm(pim_ifp->pim, sg->grp)) {
zlog_warn(
"%s: Specified Group(%s) in join is now in SSM, not allowed to create PIM state",
__func__,
inet_ntop(AF_INET, &sg->grp, buf, sizeof(buf)));
return;
}
sg->src.s_addr = INADDR_ANY; sg->src.s_addr = INADDR_ANY;
} }

12
pimd/pim_register.c
View File

@ -323,6 +323,7 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr,
int i_am_rp = 0; int i_am_rp = 0;
struct pim_interface *pim_ifp = ifp->info; struct pim_interface *pim_ifp = ifp->info;
struct pim_instance *pim = pim_ifp->pim; struct pim_instance *pim = pim_ifp->pim;
char buf[PREFIX_STRLEN];
#define PIM_MSG_REGISTER_BIT_RESERVED_LEN 4 #define PIM_MSG_REGISTER_BIT_RESERVED_LEN 4
ip_hdr = (struct ip *)(tlv_buf + PIM_MSG_REGISTER_BIT_RESERVED_LEN); ip_hdr = (struct ip *)(tlv_buf + PIM_MSG_REGISTER_BIT_RESERVED_LEN);
@ -381,6 +382,17 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr,
pim_str_sg_dump(&sg), src_str, ifp->name, i_am_rp); pim_str_sg_dump(&sg), src_str, ifp->name, i_am_rp);
} }
if (pim_is_grp_ssm(pim_ifp->pim, sg.grp)) {
if (sg.src.s_addr == INADDR_ANY) {
zlog_warn(
"%s: Received Register message for Group(%s) is now in SSM, dropping the packet",
__func__,
inet_ntop(AF_INET, &sg.grp, buf, sizeof(buf)));
/* Drop Packet Silently */
return 0;
}
}
if (i_am_rp if (i_am_rp
&& (dest_addr.s_addr && (dest_addr.s_addr
== ((RP(pim, sg.grp))->rpf_addr.u.prefix4.s_addr))) { == ((RP(pim, sg.grp))->rpf_addr.u.prefix4.s_addr))) {