This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26-311-g5c23ee6
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 Sep 2017 14:29:58 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26-311-g5c23ee6
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 5c23ee6eb8aad96e2761b8478a61e28faebfb9f0 (commit)
from 05f0011fb0e5cb318c3bf12d078f3e3184d97e88 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5c23ee6eb8aad96e2761b8478a61e28faebfb9f0
commit 5c23ee6eb8aad96e2761b8478a61e28faebfb9f0
Author: Joseph Myers <joseph@codesourcery.com>
Date: Thu Sep 7 14:29:38 2017 +0000
Update netinet/tcp.h from Linux 4.13.
This patch updates sysdeps/gnu/netinet/tcp.h to include new
definitions from include/uapi/linux/tcp.h in Linux 4.13.
Tested for x86_64.
* sysdeps/gnu/netinet/tcp.h (TCP_ULP): New macro.
(TCP_MD5SIG_EXT): Likewise.
(TCP_MD5SIG_FLAG_PREFIX): Likewise.
(struct tcp_md5sig): Replace __tcpm_pad1 by tcpm_flags and
tcpm_prefixlen. Rename __tcpm_pad2 to __tcpm_pad.
diff --git a/ChangeLog b/ChangeLog
index a63712b..9ac1d4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2017-09-07 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/gnu/netinet/tcp.h (TCP_ULP): New macro.
+ (TCP_MD5SIG_EXT): Likewise.
+ (TCP_MD5SIG_FLAG_PREFIX): Likewise.
+ (struct tcp_md5sig): Replace __tcpm_pad1 by tcpm_flags and
+ tcpm_prefixlen. Rename __tcpm_pad2 to __tcpm_pad.
+
* sysdeps/unix/sysv/linux/bits/socket.h (SOL_TLS): New macro.
2017-09-07 Mike FABIAN <mfabian@redhat.com>
diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h
index af94b8e..75973f0 100644
--- a/sysdeps/gnu/netinet/tcp.h
+++ b/sysdeps/gnu/netinet/tcp.h
@@ -71,6 +71,8 @@
connection. */
#define TCP_REPAIR_WINDOW 29 /* Get/set window parameters. */
#define TCP_FASTOPEN_CONNECT 30 /* Attempt FastOpen with connect. */
+#define TCP_ULP 31 /* Attach a ULP to a TCP connection. */
+#define TCP_MD5SIG_EXT 32 /* TCP MD5 Signature with extensions. */
#ifdef __USE_MISC
# include <sys/types.h>
@@ -257,12 +259,16 @@ struct tcp_info
/* For TCP_MD5SIG socket option. */
#define TCP_MD5SIG_MAXKEYLEN 80
+/* tcp_md5sig extension flags for TCP_MD5SIG_EXT. */
+#define TCP_MD5SIG_FLAG_PREFIX 1 /* Address prefix length. */
+
struct tcp_md5sig
{
struct sockaddr_storage tcpm_addr; /* Address associated. */
- uint16_t __tcpm_pad1; /* Zero. */
+ uint8_t tcpm_flags; /* Extension flags. */
+ uint8_t tcpm_prefixlen; /* Address prefix. */
uint16_t tcpm_keylen; /* Key length. */
- uint32_t __tcpm_pad2; /* Zero. */
+ uint32_t __tcpm_pad; /* Zero. */
uint8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
};
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/gnu/netinet/tcp.h | 10 ++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources