network/route: drop TTL propagate support for MPLS routes

This effectively reverts 9b88f20aba6a78baf18d89e99ff31d5ee40856b8.

We do not support MPLS routes, only IPv4 or IPv6 routes are supported.

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 6b210cb341766c01f4c7ed4a1bddacc3ef060fec..76f9f4d042c584f33ad563eb3d9f90ad4fdeff17 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -2040,16 +2040,6 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix</programlisting>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><varname>TTLPropagate=</varname></term>
-        <listitem>
-          <para>Takes a boolean. When true enables TTL propagation at Label Switched Path (LSP) egress.
-          When unset, the kernel's default will be used.</para>
-
-          <xi:include href="version-info.xml" xpointer="v243"/>
-        </listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><varname>MTUBytes=</varname></term>
         <listitem>

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index c3f0e6416044a9854ba7f5744e20c089baeb3fa7..ab11047f7e807266233aad2a6adeb5179bcd00d0 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -206,7 +206,7 @@ Route.TCPAdvertisedMaximumSegmentSize,       config_parse_tcp_advmss,
 Route.TCPCongestionControlAlgorithm,         config_parse_tcp_congestion,                              0,                             0
 Route.QuickAck,                              config_parse_route_boolean,                               0,                             0
 Route.FastOpenNoCookie,                      config_parse_route_boolean,                               0,                             0
-Route.TTLPropagate,                          config_parse_route_boolean,                               0,                             0
+Route.TTLPropagate,                          config_parse_warn_compat,                                 DISABLED_LEGACY,               0
 Route.MultiPathRoute,                        config_parse_multipath_route,                             0,                             0
 Route.NextHop,                               config_parse_route_nexthop,                               0,                             0
 NextHop.Id,                                  config_parse_nexthop_id,                                  0,                             0

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 9f93e0f04bbb3e0958682ab66e5759a5746da4da..e7cc252243b7f76bcbb61e99c6acb49f062cfa28 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -38,7 +38,6 @@ int route_new(Route **ret) {
                 .quickack = -1,
                 .fast_open_no_cookie = -1,
                 .gateway_onlink = -1,
-                .ttl_propagate = -1,
         };
 
         *ret = TAKE_PTR(route);
@@ -1188,12 +1187,6 @@ static int route_configure(const Route *route, uint32_t lifetime_sec, Link *link
                         return r;
         }
 
-        if (route->ttl_propagate >= 0) {
-                r = sd_netlink_message_append_u8(m, RTA_TTL_PROPAGATE, route->ttl_propagate);
-                if (r < 0)
-                        return r;
-        }
-
         r = sd_netlink_message_open_container(m, RTA_METRICS);
         if (r < 0)
                 return r;
@@ -2417,8 +2410,6 @@ int config_parse_route_boolean(
                 n->quickack = r;
         else if (streq(lvalue, "FastOpenNoCookie"))
                 n->fast_open_no_cookie = r;
-        else if (streq(lvalue, "TTLPropagate"))
-                n->ttl_propagate = r;
         else
                 assert_not_reached();
 

diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h
index 3d85889a2fa753291a123ee1b3724f946b8cc146..2e7f6290630dcb6fe51a6ec3ebf3e3e40ddbefe3 100644 (file)
--- a/src/network/networkd-route.h
+++ b/src/network/networkd-route.h
@@ -36,7 +36,6 @@ struct Route {
         uint32_t gw_weight;
         int quickack;
         int fast_open_no_cookie;
-        int ttl_propagate;
 
         unsigned char dst_prefixlen;
         unsigned char src_prefixlen;