picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #13188 from yuwata/news-igmp-version

Browse source 
network: rename `IGMPVersion=` to `MulticastIGMPVersion=`
This commit is contained in:
Lennart Poettering 2019-07-26 09:40:21 +02:00 committed by GitHub
parent 13cb62af22 9f0d45e402
commit 8deeef94e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -233,7 +233,9 @@ CHANGES WITH 243 in spe:
* systemd-networkd's bridging support gained two new options ProxyARP= * systemd-networkd's bridging support gained two new options ProxyARP=
and ProxyARPWifi= for configuring proxy ARP behaviour as well as 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 * systemd-networkd's FooOverUDP support gained the ability to configure
local and peer IP addresses via Local= and Peer=. A new option local and peer IP addresses via Local= and Peer=. A new option

2
man/systemd.netdev.xml
View file

@ -413,7 +413,7 @@
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><varname>IGMPVersion=</varname></term> <term><varname>MulticastIGMPVersion=</varname></term>
<listitem> <listitem>
<para>Allows to change bridge's multicast Internet Group Management Protocol (IGMP) version. <para>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. Takes an interger 2 or 3. When unset, the kernel's default will be used.

4
src/network/netdev/bridge.c
View file

@ -322,13 +322,13 @@ int config_parse_bridge_igmp_version(
r = safe_atou8(rvalue, &u); r = safe_atou8(rvalue, &u);
if (r < 0) { if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, 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); rvalue);
return 0; return 0;
} }
if (!IN_SET(u, 2, 3)) { if (!IN_SET(u, 2, 3)) {
log_syntax(unit, LOG_ERR, filename, line, 0, 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; return 0;
} }

2
src/network/netdev/netdev-gperf.gperf
View file

@ -207,7 +207,7 @@ Bridge.MulticastQuerier, config_parse_tristate,
Bridge.MulticastSnooping, config_parse_tristate, 0, offsetof(Bridge, mcast_snooping) Bridge.MulticastSnooping, config_parse_tristate, 0, offsetof(Bridge, mcast_snooping)
Bridge.VLANFiltering, config_parse_tristate, 0, offsetof(Bridge, vlan_filtering) Bridge.VLANFiltering, config_parse_tristate, 0, offsetof(Bridge, vlan_filtering)
Bridge.STP, config_parse_tristate, 0, offsetof(Bridge, stp) 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.TableId, config_parse_uint32, 0, offsetof(Vrf, table) /* deprecated */
VRF.Table, config_parse_uint32, 0, offsetof(Vrf, table) VRF.Table, config_parse_uint32, 0, offsetof(Vrf, table)
WireGuard.FirewallMark, config_parse_unsigned, 0, offsetof(Wireguard, fwmark) WireGuard.FirewallMark, config_parse_unsigned, 0, offsetof(Wireguard, fwmark)

2
test/fuzz/fuzz-netdev-parser/directives.netdev
View file

@ -45,7 +45,7 @@ AgeingTimeSec=
Priority= Priority=
GroupForwardMask= GroupForwardMask=
VLANFiltering= VLANFiltering=
IGMPVersion= MulticastIGMPVersion=
[VRF] [VRF]
TableId= TableId=
Table= Table=

2
test/test-network/conf/25-bridge.netdev
View file

@ -11,4 +11,4 @@ Priority=9
MulticastQuerier= true MulticastQuerier= true
MulticastSnooping=true MulticastSnooping=true
STP=true STP=true
IGMPVersion=3 MulticastIGMPVersion=3