shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-02 09:47:03 +03:00
Code

networkd: VXLan Make group and remote variable separate

Browse Source 
VXLAN Document Group=
This commit is contained in:
Susant Sahani 2019-05-07 10:44:06 +05:30 committed by Zbigniew Jędrzejewski-Szmek
parent 6f213e4a34
commit 83cb24ac20
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/systemd.netdev.xml
View File

@ -543,6 +543,12 @@
<listitem>
<para>Configures local IP address.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>Group=</varname></term>
<listitem>
<para>Configures VXLAN multicast group IP address. All members of a VXLAN must use the same multicast group address.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>TOS=</varname></term>

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

@ -98,7 +98,7 @@ Peer.MACAddress, config_parse_hwaddr,
VXCAN.Peer, config_parse_ifname, 0, offsetof(VxCan, ifname_peer)
VXLAN.VNI, config_parse_uint64, 0, offsetof(VxLan, vni)
VXLAN.Id, config_parse_uint64, 0, offsetof(VxLan, vni) /* deprecated */
VXLAN.Group, config_parse_vxlan_address, 0, offsetof(VxLan, remote)
VXLAN.Group, config_parse_vxlan_address, 0, offsetof(VxLan, group)
VXLAN.Local, config_parse_vxlan_address, 0, offsetof(VxLan, local)
VXLAN.Remote, config_parse_vxlan_address, 0, offsetof(VxLan, remote)
VXLAN.TOS, config_parse_unsigned, 0, offsetof(VxLan, tos)

2
src/network/netdev/vxlan.c
View File

@ -180,7 +180,7 @@ int config_parse_vxlan_address(const char *unit,
return 0;
}
v->remote_family = f;
v->group_family = f;
} else {
if (r > 0) {
log_syntax(unit, LOG_ERR, filename, line, 0, "vxlan %s cannot be a multicast address, ignoring assignment: %s", lvalue, rvalue);

2
src/network/netdev/vxlan.h
View File

@ -16,9 +16,11 @@ struct VxLan {
int remote_family;
int local_family;
int group_family;
union in_addr_union remote;
union in_addr_union local;
union in_addr_union group;
unsigned tos;
unsigned ttl;