From: Mat Martineau <mathew.j.martineau@linux.intel.com>
To: netdev@vger.kernel.org, mptcp@lists.01.org
Cc: Mat Martineau <mathew.j.martineau@linux.intel.com>
Subject: [PATCH net-next v5 03/11] tcp: Define IPPROTO_MPTCP
Date: Thu, 19 Dec 2019 14:34:26 -0800 [thread overview]
Message-ID: <20191219223434.19722-4-mathew.j.martineau@linux.intel.com> (raw)
In-Reply-To: <20191219223434.19722-1-mathew.j.martineau@linux.intel.com>
To open a MPTCP socket with socket(AF_INET, SOCK_STREAM, IPPROTO_MPTCP),
IPPROTO_MPTCP needs a value that differs from IPPROTO_TCP. The existing
IPPROTO numbers mostly map directly to IANA-specified protocol numbers.
MPTCP does not have a protocol number allocated because MPTCP packets
use the TCP protocol number. Use private number not used OTA.
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
---
include/trace/events/sock.h | 3 ++-
include/uapi/linux/in.h | 2 ++
tools/include/uapi/linux/in.h | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/trace/events/sock.h b/include/trace/events/sock.h
index 3ff12b90048d..a966d4b5ab37 100644
--- a/include/trace/events/sock.h
+++ b/include/trace/events/sock.h
@@ -19,7 +19,8 @@
#define inet_protocol_names \
EM(IPPROTO_TCP) \
EM(IPPROTO_DCCP) \
- EMe(IPPROTO_SCTP)
+ EM(IPPROTO_SCTP) \
+ EMe(IPPROTO_MPTCP)
#define tcp_state_names \
EM(TCP_ESTABLISHED) \
diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index e7ad9d350a28..1521073b6348 100644
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
@@ -76,6 +76,8 @@ enum {
#define IPPROTO_MPLS IPPROTO_MPLS
IPPROTO_RAW = 255, /* Raw IP packets */
#define IPPROTO_RAW IPPROTO_RAW
+ IPPROTO_MPTCP = 262, /* Multipath TCP connection */
+#define IPPROTO_MPTCP IPPROTO_MPTCP
IPPROTO_MAX
};
#endif
diff --git a/tools/include/uapi/linux/in.h b/tools/include/uapi/linux/in.h
index e7ad9d350a28..1521073b6348 100644
--- a/tools/include/uapi/linux/in.h
+++ b/tools/include/uapi/linux/in.h
@@ -76,6 +76,8 @@ enum {
#define IPPROTO_MPLS IPPROTO_MPLS
IPPROTO_RAW = 255, /* Raw IP packets */
#define IPPROTO_RAW IPPROTO_RAW
+ IPPROTO_MPTCP = 262, /* Multipath TCP connection */
+#define IPPROTO_MPTCP IPPROTO_MPTCP
IPPROTO_MAX
};
#endif
--
2.24.1
next prev parent reply other threads:[~2019-12-19 22:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 22:34 [PATCH net-next v5 00/11] Multipath TCP: Prerequisites Mat Martineau
2019-12-19 22:34 ` [PATCH net-next v5 01/11] net: Make sock protocol value checks more specific Mat Martineau
2019-12-20 15:35 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 02/11] sock: Make sk_protocol a 16-bit value Mat Martineau
2019-12-20 15:37 ` Eric Dumazet
2019-12-19 22:34 ` Mat Martineau [this message]
2019-12-20 15:39 ` [PATCH net-next v5 03/11] tcp: Define IPPROTO_MPTCP Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 04/11] tcp: Add MPTCP option number Mat Martineau
2019-12-20 15:39 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 05/11] tcp, ulp: Add clone operation to tcp_ulp_ops Mat Martineau
2019-12-20 15:26 ` Eric Dumazet
2019-12-20 16:21 ` Paolo Abeni
2019-12-20 16:26 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 06/11] mptcp: Add MPTCP to skb extensions Mat Martineau
2019-12-20 15:33 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 07/11] tcp: coalesce/collapse must respect MPTCP extensions Mat Martineau
2019-12-20 15:25 ` Eric Dumazet
2019-12-20 16:17 ` Mat Martineau
2019-12-19 22:34 ` [PATCH net-next v5 08/11] tcp: Export TCP functions and ops struct Mat Martineau
2019-12-20 15:31 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 09/11] tcp: Check for filled TCP option space before SACK Mat Martineau
2019-12-20 15:27 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 10/11] tcp: clean ext on tx recycle Mat Martineau
2019-12-20 15:29 ` Eric Dumazet
2019-12-19 22:34 ` [PATCH net-next v5 11/11] skb: add helpers to allocate ext independently from sk_buff Mat Martineau
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=20191219223434.19722-4-mathew.j.martineau@linux.intel.com \
--to=mathew.j.martineau@linux.intel.com \
--cc=mptcp@lists.01.org \
--cc=netdev@vger.kernel.org \
/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).