summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2022-02-08 20:06:33 +0100
committerGitHub <noreply@github.com>2022-02-08 20:06:33 +0100
commit12da18e05968f1113c00a1891fe36dddda0dadfa (patch)
tree1df27164c47c6e86be908523b463fd703ce87214
parentMerge pull request #10529 from Jafaral/doc-fix-order (diff)
parentpimd: Querier to non-querier transistion to be ignored in a case (diff)
downloadfrr-12da18e05968f1113c00a1891fe36dddda0dadfa.tar.xz
frr-12da18e05968f1113c00a1891fe36dddda0dadfa.zip
Merge pull request #10509 from mobash-rasool/fixes2
pimd: Querier to non-querier transistion to be ignored in a case
-rw-r--r--pimd/pim_igmp.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index cf7613f4e..512384d64 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -377,6 +377,30 @@ static int igmp_recv_query(struct gm_sock *igmp, int query_version,
*/
if (ntohl(from.s_addr) < ntohl(igmp->ifaddr.s_addr)) {
+ /* As per RFC 2236 section 3:
+ * When a Querier receives a Leave Group message for a group
+ * that has group members on the reception interface, it sends
+ * [Last Member Query Count] Group-Specific Queries every [Last
+ * Member Query Interval] to the group being left. These
+ * Group-Specific Queries have their Max Response time set to
+ * [Last Member Query Interval]. If no Reports are received
+ * after the response time of the last query expires, the
+ * routers assume that the group has no local members, as above.
+ * Any Querier to non-Querier transition is ignored during this
+ * time; the same router keeps sending the Group-Specific
+ * Queries.
+ */
+ struct gm_group *group;
+
+ group = find_group_by_addr(igmp, group_addr);
+ if (group && group->t_group_query_retransmit_timer) {
+ if (PIM_DEBUG_IGMP_TRACE)
+ zlog_debug(
+ "%s: lower address query packet from %s is ignored when last member query interval timer is running",
+ ifp->name, from_str);
+ return 0;
+ }
+
if (PIM_DEBUG_IGMP_TRACE) {
char ifaddr_str[INET_ADDRSTRLEN];
pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str,