network/route: drop TTL propagate support for MPLS routes

This effectively reverts 9b88f20aba.

We do not support MPLS routes, only IPv4 or IPv6 routes are supported.
This commit is contained in:
Yu Watanabe 2024-01-01 07:06:58 +09:00
parent 6ba147485e
commit cb0a3b8c14
4 changed files with 1 additions and 21 deletions

View file

@ -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>

View file

@ -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

View file

@ -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();

View file

@ -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;