From: Florian Westphal <fw at strlen.de>
To: mptcp at lists.01.org
Subject: [MPTCP] [PATCH mptcp-next 9/9] mptcp: sockopt: handle TCP_INFO
Date: Wed, 17 Mar 2021 17:38:28 +0100 [thread overview]
Message-ID: <20210317163828.27406-10-fw@strlen.de> (raw)
In-Reply-To: 20210317163828.27406-1-fw@strlen.de
[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]
Tries to follow the subflow most recently used from transmit.
Signed-off-by: Florian Westphal <fw(a)strlen.de>
---
net/mptcp/sockopt.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c
index c1ffc3603b4f..27ea5b1ea57e 100644
--- a/net/mptcp/sockopt.c
+++ b/net/mptcp/sockopt.c
@@ -657,6 +657,28 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_sock *msk, int level, int
return ret;
}
+static int mptcp_getsockopt_tcp_info(struct mptcp_sock *msk, char __user *optval, int __user *optlen)
+{
+ struct mptcp_subflow_context *subflow;
+ struct sock *sk = (struct sock *)msk;
+ struct sock *ssk = NULL;
+ int ret = -EOPNOTSUPP;
+
+ lock_sock(sk);
+ mptcp_for_each_subflow(msk, subflow) {
+ ssk = mptcp_subflow_tcp_sock(subflow);
+
+ if (ssk == msk->last_snd)
+ break;
+ }
+
+ if (ssk)
+ ret = tcp_getsockopt(ssk, SOL_TCP, TCP_INFO, optval, optlen);
+
+ release_sock(sk);
+ return ret;
+}
+
static int mptcp_getsockopt_sol_tcp(struct mptcp_sock *msk, int optname,
char __user *optval, int __user *optlen)
{
@@ -665,6 +687,8 @@ static int mptcp_getsockopt_sol_tcp(struct mptcp_sock *msk, int optname,
case TCP_CONGESTION:
return mptcp_getsockopt_first_sf_only(msk, SOL_TCP, optname,
optval, optlen);
+ case TCP_INFO:
+ return mptcp_getsockopt_tcp_info(msk, optval, optlen);
}
return -EOPNOTSUPP;
}
--
2.26.2
next prev reply other threads:[~2021-03-17 16:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-17 16:38 [MPTCP] [RFC PATCH mptcp-next 0/9] initial SOL_SOCKET support Florian Westphal
2021-03-17 16:38 ` [MPTCP] [PATCH mptcp-next 1/9] mptcp: add skeleton to sync msk socket options to subflows Florian Westphal
2021-03-19 11:33 ` [MPTCP] " Paolo Abeni
2021-03-19 12:34 ` Florian Westphal
2021-03-19 14:36 ` Paolo Abeni
2021-03-17 16:38 ` [MPTCP] [PATCH mptcp-next 2/9] mptcp: setsockopt: handle SO_KEEPALIVE and SO_PRIORITY Florian Westphal
2021-03-19 11:43 ` [MPTCP] " Paolo Abeni
2021-03-19 12:35 ` Florian Westphal
2021-03-17 16:38 ` [MPTCP] [PATCH mptcp-next 3/9] mptcp: setsockopt: handle receive/send buffer and device bind Florian Westphal
2021-03-19 11:44 ` [MPTCP] " Paolo Abeni
2021-03-19 12:37 ` Florian Westphal
2021-03-17 16:38 ` [MPTCP] [PATCH mptcp-next 8/9] mptcp: sockopt: add TCP_CONGESTION Florian Westphal
2021-03-19 11:54 ` [MPTCP] " Paolo Abeni
2021-03-19 12:19 ` Paolo Abeni
2021-03-17 16:38 ` Florian Westphal [this message]
2021-03-19 12:00 ` [MPTCP] Re: [PATCH mptcp-next 9/9] mptcp: sockopt: handle TCP_INFO Paolo Abeni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210317163828.27406-10-fw@strlen.de \
--to=mptcp@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox