From: Joseph Myers Date: Wed, 3 Aug 2016 12:13:16 +0000 (+0000) Subject: Define UDP_ENCAP_* from Linux 4.7 in netinet/udp.h. X-Git-Tag: glibc-2.25~661 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7516580ecabdc09861b5e38cec25db91331c3bc;p=thirdparty%2Fglibc.git Define UDP_ENCAP_* from Linux 4.7 in netinet/udp.h. This patch adds the new UDP_ENCAP_GTP0 and UDP_ENCAP_GTP1U from Linux 4.7 to sysdeps/gnu/netinet/udp.h. Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). * sysdeps/gnu/netinet/udp.h (UDP_ENCAP_GTP0): New macro. (UDP_ENCAP_GTP1U): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 63673cfd32e..d34d6728605 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2016-08-03 Joseph Myers + * sysdeps/gnu/netinet/udp.h (UDP_ENCAP_GTP0): New macro. + (UDP_ENCAP_GTP1U): Likewise. + * sysdeps/unix/sysv/linux/bits/socket.h (PF_QIPCRTR): New macro. (PF_MAX): Update value. (AF_QIPCRTR): New macro. diff --git a/sysdeps/gnu/netinet/udp.h b/sysdeps/gnu/netinet/udp.h index bcc3213dc26..e3d4492c8ab 100644 --- a/sysdeps/gnu/netinet/udp.h +++ b/sysdeps/gnu/netinet/udp.h @@ -87,6 +87,8 @@ struct udphdr #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 SOL_UDP 17 /* sockopt level for UDP */