diff --git a/NEWS b/NEWS index 21c9e6ec31..238ea4a032 100644 --- a/NEWS +++ b/NEWS @@ -233,7 +233,9 @@ CHANGES WITH 243 in spe: * systemd-networkd's bridging support gained two new options ProxyARP= and ProxyARPWifi= for configuring proxy ARP behaviour as well as - MulticastRouter= for configuring multicast routing behaviour. + MulticastRouter= for configuring multicast routing behaviour. A new + option MulticastIGMPVersion= may be used to change bridge's multicast + Internet Group Management Protocol (IGMP) version. * systemd-networkd's FooOverUDP support gained the ability to configure local and peer IP addresses via Local= and Peer=. A new option diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 515560f14e..0775e00bd2 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -413,7 +413,7 @@ - IGMPVersion= + MulticastIGMPVersion= Allows to change bridge's multicast Internet Group Management Protocol (IGMP) version. Takes an interger 2 or 3. When unset, the kernel's default will be used. diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c index 71a7ac7a43..011c2c3040 100644 --- a/src/network/netdev/bridge.c +++ b/src/network/netdev/bridge.c @@ -322,13 +322,13 @@ int config_parse_bridge_igmp_version( r = safe_atou8(rvalue, &u); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, r, - "Failed to parse bridge IGMP version number '%s', ignoring assignment: %m", + "Failed to parse bridge's multicast IGMP version number '%s', ignoring assignment: %m", rvalue); return 0; } if (!IN_SET(u, 2, 3)) { log_syntax(unit, LOG_ERR, filename, line, 0, - "Invalid bridge IGMP version number '%s', ignoring assignment.", rvalue); + "Invalid bridge's multicast IGMP version number '%s', ignoring assignment.", rvalue); return 0; } diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf index b017ac8ec7..47566f63a8 100644 --- a/src/network/netdev/netdev-gperf.gperf +++ b/src/network/netdev/netdev-gperf.gperf @@ -207,7 +207,7 @@ Bridge.MulticastQuerier, config_parse_tristate, Bridge.MulticastSnooping, config_parse_tristate, 0, offsetof(Bridge, mcast_snooping) Bridge.VLANFiltering, config_parse_tristate, 0, offsetof(Bridge, vlan_filtering) Bridge.STP, config_parse_tristate, 0, offsetof(Bridge, stp) -Bridge.IGMPVersion, config_parse_uint8, 0, offsetof(Bridge, igmp_version) +Bridge.MulticastIGMPVersion, config_parse_uint8, 0, offsetof(Bridge, igmp_version) VRF.TableId, config_parse_uint32, 0, offsetof(Vrf, table) /* deprecated */ VRF.Table, config_parse_uint32, 0, offsetof(Vrf, table) WireGuard.FirewallMark, config_parse_unsigned, 0, offsetof(Wireguard, fwmark) diff --git a/test/fuzz/fuzz-netdev-parser/directives.netdev b/test/fuzz/fuzz-netdev-parser/directives.netdev index 78ffcead1c..e8391dab78 100644 --- a/test/fuzz/fuzz-netdev-parser/directives.netdev +++ b/test/fuzz/fuzz-netdev-parser/directives.netdev @@ -45,7 +45,7 @@ AgeingTimeSec= Priority= GroupForwardMask= VLANFiltering= -IGMPVersion= +MulticastIGMPVersion= [VRF] TableId= Table= diff --git a/test/test-network/conf/25-bridge.netdev b/test/test-network/conf/25-bridge.netdev index a52b9d02fb..f5c9351637 100644 --- a/test/test-network/conf/25-bridge.netdev +++ b/test/test-network/conf/25-bridge.netdev @@ -11,4 +11,4 @@ Priority=9 MulticastQuerier= true MulticastSnooping=true STP=true -IGMPVersion=3 +MulticastIGMPVersion=3