networkd: VXLan Make group and remote variable separate

VXLAN Document Group=

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 3841ad54b72a8b1217b5a4f2b8231b32e42fb600..1f2f4bd9c88ef53b735b61886ca5c5a5fd8281d7 100644 (file)
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -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>

diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
index 163d7d01d2abe53a7592dfce3e74bb430fc28609..e71c9d00daa8b40890cb93e788931cecfff3dd2b 100644 (file)
--- a/src/network/netdev/netdev-gperf.gperf
+++ b/src/network/netdev/netdev-gperf.gperf
@@ -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)

diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c
index c8d9cd4675713a873131d7a98a14c546c8cbbf77..6c18debe3dc50f64a903d3a00767ee66a9cf4150 100644 (file)
--- a/src/network/netdev/vxlan.c
+++ b/src/network/netdev/vxlan.c
@@ -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);

diff --git a/src/network/netdev/vxlan.h b/src/network/netdev/vxlan.h
index 99d16c1ab91832b2bd910c7af49f1ab4b380df04..03716f6f8958e71280615714c515bfe6949625b9 100644 (file)
--- a/src/network/netdev/vxlan.h
+++ b/src/network/netdev/vxlan.h
@@ -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;