network: rename DiffServiceCodePoint to CopyDSCP

Old name was slightly misleading, because this flag does not determine
whether DSCP is used overall, but only if it is copied to the
decapsulated packet. Rename to better reflect that.

"Copy" does not imply direction. This is on purpose, because we might
later on enhance the setting to allow/disallow copying in the other
direction, to the encapsulated packet. If that is implemented,
CopyDSCP could understand additional values. This is nicer than
having two separate settings and follows the example of DHCP=.

Also, we try to avoid abbreviations, but we allow acronyms
like MTU, in DiscoverPathMTU=.

This setting was recently added, so it's fine to rename it without
backwards compat.

diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index 00d1de30c7187d86ca94c7aab4efed77d8c93be8..7e92d1d99c646b1e9436ddb29c368fd9251c7334 100644 (file)
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -504,11 +504,11 @@
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>DiffServiceCodePoint=</varname></term>
+        <term><varname>CopyDSCP=</varname></term>
         <listitem>
           <para>A boolean. When true, the Differentiated Service Code
           Point (DSCP) field will be copied to the inner header from
-          outer header during the decapsulation on an IPv6 tunnel
+          outer header during the decapsulation of an IPv6 tunnel
           packet. DSCP is a field in an IP packet that enables different
           levels of service to be assigned to network traffic.
           Defaults to <literal>no</literal>.

diff --git a/src/network/networkd-netdev-gperf.gperf b/src/network/networkd-netdev-gperf.gperf
index bdc43e87f6ecaacf317215085dcea69593902b1d..be76022bc771d9734ad25b16e43f70b5bd61c5aa 100644 (file)
--- a/src/network/networkd-netdev-gperf.gperf
+++ b/src/network/networkd-netdev-gperf.gperf
@@ -37,7 +37,7 @@ Tunnel.TTL,                  config_parse_unsigned,              0,
 Tunnel.DiscoverPathMTU,      config_parse_bool,                  0,                             offsetof(Tunnel, pmtudisc)
 Tunnel.Mode,                 config_parse_ip6tnl_mode,           0,                             offsetof(Tunnel, ip6tnl_mode)
 Tunnel.IPv6FlowLabel,        config_parse_ipv6_flowlabel,        0,                             offsetof(Tunnel, ipv6_flowlabel)
-Tunnel.DiffServiceCodePoint, config_parse_bool,                  0,                             offsetof(Tunnel, dscp)
+Tunnel.CopyDSCP,             config_parse_bool,                  0,                             offsetof(Tunnel, copy_dscp)
 Peer.Name,                   config_parse_ifname,                0,                             offsetof(Veth, ifname_peer)
 Peer.MACAddress,             config_parse_hwaddr,                0,                             offsetof(Veth, mac_peer)
 VXLAN.Id,                    config_parse_uint64,                0,                             offsetof(VxLan, id)

diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c
index 1af234aba32422dd14613cb0efb13932c5e1e4a9..7fd9ef584bac0dac46bd823e5368f9233b51f41e 100644 (file)
--- a/src/network/networkd-netdev-tunnel.c
+++ b/src/network/networkd-netdev-tunnel.c
@@ -281,7 +281,7 @@ static int netdev_ip6tnl_fill_message_create(NetDev *netdev, Link *link, sd_netl
                         return log_netdev_error_errno(netdev, r, "Could not append IFLA_IPTUN_FLOWINFO attribute: %m");
         }
 
-        if (t->dscp)
+        if (t->copy_dscp)
                 t->flags |= IP6_TNL_F_RCV_DSCP_COPY;
 
         r = sd_netlink_message_append_u32(m, IFLA_IPTUN_FLAGS, t->flags);

diff --git a/src/network/networkd-netdev-tunnel.h b/src/network/networkd-netdev-tunnel.h
index e08e2891e7a12fd0d5f8c07dacf1821b27f93532..1fd2b94ae16785316562963903ffd3b2bd094b6d 100644 (file)
--- a/src/network/networkd-netdev-tunnel.h
+++ b/src/network/networkd-netdev-tunnel.h
@@ -57,7 +57,7 @@ struct Tunnel {
         IPv6FlowLabel ipv6_flowlabel;
 
         bool pmtudisc;
-        bool dscp;
+        bool copy_dscp;
 };
 
 extern const NetDevVTable ipip_vtable;