[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20251124-iproute-mptcp-laminar-v1-6-e56437483fdf@kernel.org>
Date: Mon, 24 Nov 2025 12:19:26 +0100
From: "Matthieu Baerts (NGI0)" <matttbe@...nel.org>
To: Stephen Hemminger <stephen@...workplumber.org>
Cc: netdev@...r.kernel.org, MPTCP Linux <mptcp@...ts.linux.dev>,
Mat Martineau <martineau@...nel.org>, Geliang Tang <geliang@...nel.org>,
"Matthieu Baerts (NGI0)" <matttbe@...nel.org>,
David Ahern <dsahern@...nel.org>
Subject: [PATCH iproute2-net 6/6] mptcp: monitor: support 'server side' as
a flag
In the v6.18 kernel, the 'server side' attribute has been deprecated [1]
in favour of the 'server side' flag [2].
Support both: first checking the new flag, then the old attribute to
continue supporting older kernels.
Link: https://git.kernel.org/torvalds/c/c8bc168f5f3d [1]
Link: https://git.kernel.org/torvalds/c/3d7ae91107b8 [2]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@...nel.org>
---
ip/ipmptcp.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c
index 01f6906f..acd008f3 100644
--- a/ip/ipmptcp.c
+++ b/ip/ipmptcp.c
@@ -535,11 +535,14 @@ static int mptcp_monitor_msg(struct rtnl_ctrl_data *ctrl,
printf(" reset_reason=%u", rta_getattr_u32(tb[MPTCP_ATTR_RESET_REASON]));
if (tb[MPTCP_ATTR_RESET_FLAGS])
printf(" reset_flags=0x%x", rta_getattr_u32(tb[MPTCP_ATTR_RESET_FLAGS]));
- if (tb[MPTCP_ATTR_SERVER_SIDE] && rta_getattr_u8(tb[MPTCP_ATTR_SERVER_SIDE]))
- printf(" server_side");
if (tb[MPTCP_ATTR_FLAGS])
flags = rta_getattr_u16(tb[MPTCP_ATTR_FLAGS]);
+ if ((flags & MPTCP_PM_EV_FLAG_SERVER_SIDE) ||
+ (tb[MPTCP_ATTR_SERVER_SIDE] && rta_getattr_u8(tb[MPTCP_ATTR_SERVER_SIDE]))) {
+ flags &= ~MPTCP_PM_EV_FLAG_SERVER_SIDE;
+ printf(" server_side");
+ }
if (flags & MPTCP_PM_EV_FLAG_DENY_JOIN_ID0) {
flags &= ~MPTCP_PM_EV_FLAG_DENY_JOIN_ID0;
printf(" deny_join_id0");
--
2.51.0
Powered by blists - more mailing lists