We already have all necessary helpers, so process IGMPV3_BLOCK_OLD_SOURCES
as per the RFC.
Signed-off-by: Nikolay Aleksandrov <niko...@cumulusnetworks.com>
---
net/bridge/br_multicast.c | 88 +++++++++++++++++++++++++++++++++++++++
1 file changed, 88 insertions(+)
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 2777e3eb07b9..55c2729c61f4 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1578,6 +1578,91 @@ static bool br_multicast_toex(struct
net_bridge_port_group *pg,
return changed;
}
+/* State Msg type New state Actions
+ * INCLUDE (A) BLOCK (B) INCLUDE (A) Send Q(G,A*B)
+ */
+static void __grp_src_block_incl(struct net_bridge_port_group *pg,
+ __be32 *srcs, u32 nsrcs)
+{
+ struct net_bridge_group_src *ent;
+ u32 src_idx, to_send = 0;
+ struct br_ip src_ip;
+
+ __grp_src_modify_flags_all(pg, 0, BR_SGRP_F_SEND);
+
+ memset(&src_ip, 0, sizeof(src_ip));
+ src_ip.proto = htons(ETH_P_IP);
+ for (src_idx = 0; src_idx < nsrcs; src_idx++) {
+ src_ip.u.ip4 = srcs[src_idx];
+ ent = br_multicast_find_group_src(pg, &src_ip);
+ if (ent) {
+ __grp_src_modify_flags(ent, BR_SGRP_F_SEND, 0);
+ to_send++;
+ }
+ }
+
+ if (to_send)
+ __grp_src_query_marked_and_rexmit(pg);
+
+ if (pg->filter_mode == MCAST_INCLUDE && hlist_empty(&pg->src_list))
+ br_multicast_find_del_pg(pg->port->br, pg);
+}
+
+/* State Msg type New state Actions
+ * EXCLUDE (X,Y) BLOCK (A) EXCLUDE (X+(A-Y),Y) (A-X-Y)=Group Timer
+ * Send Q(G,A-Y)
+ */
+static bool __grp_src_block_excl(struct net_bridge_port_group *pg,
+ __be32 *srcs, u32 nsrcs)
+{
+ struct net_bridge_group_src *ent;
+ u32 src_idx, to_send = 0;
+ bool changed = false;
+ struct br_ip src_ip;
+
+ __grp_src_modify_flags_all(pg, 0, BR_SGRP_F_SEND);
+
+ memset(&src_ip, 0, sizeof(src_ip));
+ src_ip.proto = htons(ETH_P_IP);
+ for (src_idx = 0; src_idx < nsrcs; src_idx++) {
+ src_ip.u.ip4 = srcs[src_idx];
+ ent = br_multicast_find_group_src(pg, &src_ip);
+ if (!ent) {
+ ent = br_multicast_new_group_src(pg, &src_ip);
+ if (ent) {
+ mod_timer(&ent->timer, pg->timer.expires);
+ changed = true;
+ }
+ }
+ if (ent && timer_pending(&ent->timer)) {
+ __grp_src_modify_flags(ent, BR_SGRP_F_SEND, 0);
+ to_send++;
+ }
+ }
+
+ if (to_send)
+ __grp_src_query_marked_and_rexmit(pg);
+
+ return changed;
+}
+
+static bool br_multicast_block(struct net_bridge_port_group *pg,
+ __be32 *srcs, u32 nsrcs)
+{
+ bool changed = false;
+
+ switch (pg->filter_mode) {
+ case MCAST_INCLUDE:
+ __grp_src_block_incl(pg, srcs, nsrcs);
+ break;
+ case MCAST_EXCLUDE:
+ changed = __grp_src_block_excl(pg, srcs, nsrcs);
+ break;
+ }
+
+ return changed;
+}
+
static struct net_bridge_port_group *
br_multicast_find_port(struct net_bridge_mdb_entry *mp,
struct net_bridge_port *p,
@@ -1686,6 +1771,9 @@ static int br_ip4_multicast_igmp3_report(struct
net_bridge *br,
case IGMPV3_CHANGE_TO_EXCLUDE:
changed = br_multicast_toex(pg, grec->grec_src, nsrcs);
break;
+ case IGMPV3_BLOCK_OLD_SOURCES:
+ changed = br_multicast_block(pg, grec->grec_src, nsrcs);
+ break;
}
if (changed)
br_mdb_notify(br->dev, mdst, pg, RTM_NEWMDB);
--
2.25.4
