From cb0a3b8c14adce03a43084a0a90a0f7e2a7a62fb Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 1 Jan 2024 07:06:58 +0900 Subject: [PATCH] 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. --- man/systemd.network.xml | 10 ---------- src/network/networkd-network-gperf.gperf | 2 +- src/network/networkd-route.c | 9 --------- src/network/networkd-route.h | 1 - 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 6b210cb341..76f9f4d042 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -2040,16 +2040,6 @@ NFTSet=prefix:netdev:filter:eth_ipv4_prefix - - TTLPropagate= - - Takes a boolean. When true enables TTL propagation at Label Switched Path (LSP) egress. - When unset, the kernel's default will be used. - - - - - MTUBytes= diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index c3f0e64160..ab11047f7e 100644 --- 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 9f93e0f04b..e7cc252243 100644 --- 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 3d85889a2f..2e7f629063 100644 --- 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; -- 2.25.1