Re: [PATCH iproute2-next v2] ip: xfrm: add espintcp encapsulation

[Sabrina Dubroca <sd@queasysnail.net>]

2020-01-19, 09:05:45 -0700, David Ahern wrote:
> On 1/19/20 8:44 AM, Sabrina Dubroca wrote:
> > 2020-01-19, 08:31:32 -0700, David Ahern wrote:
> >> On 1/19/20 3:32 AM, Sabrina Dubroca wrote:
> >>> diff --git a/include/uapi/linux/udp.h b/include/uapi/linux/udp.h
> >>> new file mode 100644
> >>> index 000000000000..2d1f561b89d2
> >>> --- /dev/null
> >>> +++ b/include/uapi/linux/udp.h
> >>> @@ -0,0 +1,47 @@
> >>> +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
> >>> +/*
> >>> + * INET		An implementation of the TCP/IP protocol suite for the LINUX
> >>> + *		operating system.  INET is implemented using the  BSD Socket
> >>> + *		interface as the means of communication with the user level.
> >>> + *
> >>> + *		Definitions for the UDP protocol.
> >>> + *
> >>> + * Version:	@(#)udp.h	1.0.2	04/28/93
> >>> + *
> >>> + * Author:	Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
> >>> + *
> >>> + *		This program is free software; you can redistribute it and/or
> >>> + *		modify it under the terms of the GNU General Public License
> >>> + *		as published by the Free Software Foundation; either version
> >>> + *		2 of the License, or (at your option) any later version.
> >>> + */
> >>> +#ifndef _UDP_H
> >>> +#define _UDP_H
> >>> +
> >>> +#include <linux/types.h>
> >>> +
> >>> +struct udphdr {
> >>> +	__be16	source;
> >>> +	__be16	dest;
> >>> +	__be16	len;
> >>> +	__sum16	check;
> >>> +};
> >>> +
> >>> +/* UDP socket options */
> >>> +#define UDP_CORK	1	/* Never send partially complete segments */
> >>> +#define UDP_ENCAP	100	/* Set the socket to accept encapsulated packets */
> >>> +#define UDP_NO_CHECK6_TX 101	/* Disable sending checksum for UDP6X */
> >>> +#define UDP_NO_CHECK6_RX 102	/* Disable accpeting checksum for UDP6 */
> >>> +#define UDP_SEGMENT	103	/* Set GSO segmentation size */
> >>> +#define UDP_GRO		104	/* This socket can receive UDP GRO packets */
> >>> +
> >>> +/* UDP encapsulation types */
> >>> +#define UDP_ENCAP_ESPINUDP_NON_IKE	1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
> >>> +#define UDP_ENCAP_ESPINUDP	2 /* draft-ietf-ipsec-udp-encaps-06 */
> >>> +#define UDP_ENCAP_L2TPINUDP	3 /* rfc2661 */
> >>> +#define UDP_ENCAP_GTP0		4 /* GSM TS 09.60 */
> >>> +#define UDP_ENCAP_GTP1U		5 /* 3GPP TS 29.060 */
> >>> +#define UDP_ENCAP_RXRPC		6
> >>> +#define TCP_ENCAP_ESPINTCP	7 /* Yikes, this is really xfrm encap types. */
> >>> +
> >>> +#endif /* _UDP_H */
> >>
> >> Hi Sabrina:
> >>
> >> I am confused about this header file. It is not from the kernel's uapi
> >> directory, so the kernel does not care about the values and where did
> >> you get the file?
> > 
> > Uh? It's right there:
> > 
> > https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git/tree/include/uapi/linux/udp.h
> > 
> 
> ah, but not in Dave's net-next which is what I use to sync iproute2 uapi
> headers.

Ah, yes, because I need TCP_ENCAP_ESPINTCP, as I wrote in the commit message:

> add the
> UAPI udp.h header (sync'd from ipsec-next to get the TCP_ENCAP_ESPINTCP
> definition).


> I will hold onto this patch until ipsec-next merges into net-next.

Makes sense, thanks.

-- 
Sabrina