[net-next,v2,03/11] tcp: Define IPPROTO_MPTCP

Message ID	20191217002455.24849-4-mathew.j.martineau@linux.intel.com
State	Deferred, archived
Headers	show Return-Path: <mptcp-bounces@lists.01.org> Received-SPF: None (mailfrom) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=mathew.j.martineau@linux.intel.com; receiver=<UNKNOWN> 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> Date: Mon, 16 Dec 2019 16:24:47 -0800 Message-Id: <20191217002455.24849-4-mathew.j.martineau@linux.intel.com> In-Reply-To: <20191217002455.24849-1-mathew.j.martineau@linux.intel.com> References: <20191217002455.24849-1-mathew.j.martineau@linux.intel.com> MIME-Version: 1.0 Message-ID-Hash: NAHVK4XYCJYKZ4IICA2GSLPBNEHHICZE Precedence: list Subject: [MPTCP] [PATCH net-next v2 03/11] tcp: Define IPPROTO_MPTCP Archived-At: <https://lists.01.org/hyperkitty/list/mptcp@lists.01.org/message/NAHVK4XYCJYKZ4IICA2GSLPBNEHHICZE/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	Multipath TCP: Prerequisites \| expand [net-next,v2,00/11] Multipath TCP: Prerequisites [net-next,v2,01/11] net: Make sock protocol value checks more specific [net-next,v2,02/11] sock: Make sk_protocol a 16-bit value [net-next,v2,03/11] tcp: Define IPPROTO_MPTCP [net-next,v2,04/11] tcp: Add MPTCP option number [net-next,v2,05/11] tcp, ulp: Add clone operation to tcp_ulp_ops [net-next,v2,06/11] mptcp: Add MPTCP to skb extensions [net-next,v2,07/11] tcp: Prevent coalesce/collapse when skb has MPTCP extensions [net-next,v2,08/11] tcp: Export TCP functions and ops struct [net-next,v2,09/11] tcp: Check for filled TCP option space before SACK [net-next,v2,10/11] tcp: clean ext on tx recycle [net-next,v2,11/11] skb: add helpers to allocate ext independently from sk_buff

Message ID

20191217002455.24849-4-mathew.j.martineau@linux.intel.com

State

Deferred, archived

Headers

Received-SPF: None (mailfrom) identity=mailfrom; client-ip=134.134.136.65;
	helo=mga03.intel.com;
	envelope-from=mathew.j.martineau@linux.intel.com;
	receiver=<UNKNOWN> 
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>
Date: Mon, 16 Dec 2019 16:24:47 -0800
Message-Id: <20191217002455.24849-4-mathew.j.martineau@linux.intel.com>
In-Reply-To: <20191217002455.24849-1-mathew.j.martineau@linux.intel.com>
References: <20191217002455.24849-1-mathew.j.martineau@linux.intel.com>
MIME-Version: 1.0
Message-ID-Hash: NAHVK4XYCJYKZ4IICA2GSLPBNEHHICZE
Precedence: list
Subject: [MPTCP] [PATCH net-next v2 03/11] tcp: Define IPPROTO_MPTCP
Archived-At: <https://lists.01.org/hyperkitty/list/mptcp@lists.01.org/message/NAHVK4XYCJYKZ4IICA2GSLPBNEHHICZE/>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

Series

Multipath TCP: Prerequisites | expand

Commit Message

Mat Martineau Dec. 17, 2019, 12:24 a.m. UTC

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

[net-next,v2,03/11] tcp: Define IPPROTO_MPTCP

Commit Message

Patch