Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #12355 from mobash-rasool/pim6-conformance 

pim6d, pimd: RFC conformance - Discard join/prune msg when WC bit is set but RPT bit is unset
This commit is contained in:
Donatas Abraitis 2022-11-23 11:07:05 +02:00 committed by GitHub
parent 2387dca4dc a23a485cbf
commit 89f74214e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pimd/pim_join.c
View File

@ -72,8 +72,21 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh,
* If the RPT and WC are set it's a (*,G)
* and the source is the RP
*/
if ((source_flags & PIM_RPT_BIT_MASK)
&& (source_flags & PIM_WILDCARD_BIT_MASK)) {
if (CHECK_FLAG(source_flags, PIM_WILDCARD_BIT_MASK)) {
/* As per RFC 7761 Section 4.9.1:
* The RPT (or Rendezvous Point Tree) bit is a 1-bit value for
* use with PIM Join/Prune messages (see Section 4.9.5.1). If
* the WC bit is 1, the RPT bit MUST be 1.
*/
if (!CHECK_FLAG(source_flags, PIM_RPT_BIT_MASK)) {
if (PIM_DEBUG_PIM_J_P)
zlog_debug(
"Discarding (*,G)=%pSG join since WC bit is set but RPT bit is unset",
sg);
return;
}
struct pim_rpf *rp = RP(pim_ifp->pim, sg->grp);
pim_addr rpf_addr;
@ -127,8 +140,21 @@ static void recv_prune(struct interface *ifp, struct pim_neighbor *neigh,
++pim_ifp->pim_ifstat_prune_recv;
if ((source_flags & PIM_RPT_BIT_MASK)
&& (source_flags & PIM_WILDCARD_BIT_MASK)) {
if (CHECK_FLAG(source_flags, PIM_WILDCARD_BIT_MASK)) {
/* As per RFC 7761 Section 4.9.1:
* The RPT (or Rendezvous Point Tree) bit is a 1-bit value for
* use with PIM Join/Prune messages (see Section 4.9.5.1). If
* the WC bit is 1, the RPT bit MUST be 1.
*/
if (!CHECK_FLAG(source_flags, PIM_RPT_BIT_MASK)) {
if (PIM_DEBUG_PIM_J_P)
zlog_debug(
"Discarding (*,G)=%pSG prune since WC bit is set but RPT bit is unset",
sg);
return;
}
/*
* RFC 4601 Section 4.5.2:
* Received Prune(*,G) messages are processed even if the