[PATCH net-next v2 00/11] net: bridge: split IPv4/v6 mc router state and export for batman-adv

Linus Lüssing
2021-05-09T19:45:41Z

Hi,

The following patches are splitting the so far combined multicast router
state in the Linux bridge into two ones, one for IPv4 and one for IPv6,
for a more fine-grained detection of multicast routers. This avoids
sending IPv4 multicast packets to an IPv6-only multicast router and
avoids sending IPv6 multicast packets to an IPv4-only multicast router.
This also allows batman-adv to make use of the now split information in
the final patch.

The first eight patches prepare the bridge code to avoid duplicate
code or IPv6-#ifdef clutter for the multicast router state split. And
contain no functional changes yet.

The ninth patch then implements the IPv4+IPv6 multicast router state
split.

Patch number ten adds IPv4+IPv6 specific timers to the mdb netlink
router port dump, so that the timers validity can be checked individually
from userspace.

The final, eleventh patch exports this now per protocol family multicast
router state so that batman-adv can then later make full use of the
Multicast Router Discovery (MRD) support in the Linux bridge. The
batman-adv protocol format currently expects separate multicast router
states for IPv4 and IPv6, therefore it depends on the first patch.
batman-adv will then make use of this newly exported functions like
this[0].

Regards, Linus

[0]: https://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/linus/multicast-routeable-mrd
-> https://git.open-mesh.org/batman-adv.git/commit/d4bed3a92427445708baeb1f2d1841c5fb816fd4

Changelog v2:

* split into multiple patches as suggested by Nikolay
* added helper functions to br_multicast_flood(), avoiding
IPv6 #ifdef clutter
* fixed reverse xmas tree ordering in br_rports_fill_info() and
added helper functions to avoid IPv6 #ifdef clutter
* Added a common br_multicast_add_router() and a helper function
to retrieve the correct slot to avoid duplicate code for an
ip4 and ip6 variant
* replaced the "1" and "2" constants in br_multicast_is_router()
with the appropriate enums
* added br_{ip4,ip6}_multicast_rport_del() wrappers to reduce
IPv6 #ifdef clutter
* added return values to br_*multicast_rport_del() to only notify
if the port was actually removed and did not race with a readdition
somewhere else
* added empty, void br_ip6_multicast_mark_router() if compiled
without IPv6, to reduce IPv6 #ifdef clutter