From: Florian Westphal <fw@strlen.de>
To: <netdev@vger.kernel.org>
Cc: edumazet@google.com, mathew.j.martineau@linux.intel.com,
matthieu.baerts@tessares.net, pabeni@redhat.com,
Florian Westphal <fw@strlen.de>
Subject: [PATCH net-next 03/10] mptcp: subflow: split subflow_init_req
Date: Thu, 30 Jul 2020 19:15:22 +0200 [thread overview]
Message-ID: <20200730171529.22582-4-fw@strlen.de> (raw)
In-Reply-To: <20200730171529.22582-1-fw@strlen.de>
When syncookie support is added, we will need to add a variant of
subflow_init_req() helper. It will do almost same thing except
that it will not compute/add a token to the mptcp token tree.
To avoid excess copy&paste, this commit splits away part of the
code into a new helper, __subflow_init_req, that can then be re-used
from the 'no insert' function added in a followup change.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
net/mptcp/subflow.c | 32 ++++++++++++++++++++++----------
1 file changed, 22 insertions(+), 10 deletions(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 9feb87880d1c..091e305a81c8 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -91,17 +91,9 @@ static struct mptcp_sock *subflow_token_join_request(struct request_sock *req,
return msk;
}
-static void subflow_init_req(struct request_sock *req,
- const struct sock *sk_listener,
- struct sk_buff *skb)
+static int __subflow_init_req(struct request_sock *req, const struct sock *sk_listener)
{
- struct mptcp_subflow_context *listener = mptcp_subflow_ctx(sk_listener);
struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
- struct mptcp_options_received mp_opt;
-
- pr_debug("subflow_req=%p, listener=%p", subflow_req, listener);
-
- mptcp_get_options(skb, &mp_opt);
subflow_req->mp_capable = 0;
subflow_req->mp_join = 0;
@@ -113,9 +105,29 @@ static void subflow_init_req(struct request_sock *req,
* TCP option space.
*/
if (rcu_access_pointer(tcp_sk(sk_listener)->md5sig_info))
- return;
+ return -EINVAL;
#endif
+ return 0;
+}
+
+static void subflow_init_req(struct request_sock *req,
+ const struct sock *sk_listener,
+ struct sk_buff *skb)
+{
+ struct mptcp_subflow_context *listener = mptcp_subflow_ctx(sk_listener);
+ struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
+ struct mptcp_options_received mp_opt;
+ int ret;
+
+ pr_debug("subflow_req=%p, listener=%p", subflow_req, listener);
+
+ ret = __subflow_init_req(req, sk_listener);
+ if (ret)
+ return;
+
+ mptcp_get_options(skb, &mp_opt);
+
if (mp_opt.mp_capable) {
SUBFLOW_REQ_INC_STATS(req, MPTCP_MIB_MPCAPABLEPASSIVE);
--
2.26.2
next prev parent reply other threads:[~2020-07-30 17:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-30 17:15 [PATCH net-next 00/10] mptcp: add syncookie support Florian Westphal
2020-07-30 17:15 ` [PATCH net-next 01/10] tcp: remove cookie_ts bit from request_sock Florian Westphal
2020-07-30 17:25 ` Eric Dumazet
2020-07-30 17:15 ` [PATCH net-next 02/10] mptcp: token: move retry to caller Florian Westphal
2020-07-30 17:15 ` Florian Westphal [this message]
2020-07-30 17:15 ` [PATCH net-next 04/10] mptcp: rename and export mptcp_subflow_request_sock_ops Florian Westphal
2020-07-30 17:15 ` [PATCH net-next 05/10] tcp: pass want_cookie down to req_init function Florian Westphal
2020-07-30 17:38 ` Eric Dumazet
2020-07-30 17:58 ` Florian Westphal
2020-07-30 17:15 ` [PATCH net-next 06/10] mptcp: subflow: add mptcp_subflow_init_cookie_req helper Florian Westphal
2020-07-30 17:15 ` [PATCH net-next 07/10] tcp: syncookies: create mptcp request socket for ACK cookies with MPTCP option Florian Westphal
2020-07-30 17:15 ` [PATCH net-next 08/10] mptcp: enable JOIN requests even if cookies are in use Florian Westphal
2020-07-30 17:15 ` [PATCH net-next 09/10] selftests: mptcp: make 2nd net namespace use tcp syn cookies unconditionally Florian Westphal
2020-07-30 17:15 ` [PATCH net-next 10/10] selftests: mptcp: add test cases for mptcp join tests with syn cookies Florian Westphal
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=20200730171529.22582-4-fw@strlen.de \
--to=fw@strlen.de \
--cc=edumazet@google.com \
--cc=mathew.j.martineau@linux.intel.com \
--cc=matthieu.baerts@tessares.net \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/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;
as well as URLs for NNTP newsgroup(s).