Re: [PATCH] netinet/tcp: Add TCPOPT, TCPOLEN constants

[Kylie McClain <somasissounds@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

On Sun, Jan 3, 2016 at 1:18 AM, Kylie McClain <somasissounds@gmail.com> wrote:
> On Jan 2, 2016 11:25 PM, "Rich Felker" <dalias@libc.org> wrote:
>> Also, it seems there's already a section later in the file that's
>> conditional on BSD||GNU, so unless there's a good conceptual reason
>> not to I'd probably rather add the new constants there. Does this
>> sound okay?
>>
>> Rich
>
> Sounds just fine to me.

Oh, and here's the updated patch by the way :)

[-- Attachment #2: 0001-netinet-tcp-Add-TCPOPT-TCPOLEN-constants.patch --]
[-- Type: application/octet-stream, Size: 1313 bytes --]

From 98628a1de1fe2c4d19bdeb3a7343dd04e6aef4bf Mon Sep 17 00:00:00 2001
From: Kylie McClain <somasis@exherbo.org>
Date: Wed, 30 Dec 2015 17:24:02 -0500
Subject: [PATCH] netinet/tcp: Add TCPOPT, TCPOLEN constants

Programs such as iptables depend on these constants, which can also
be found defined in other libcs.

Since only TCP_* is reserved as part of tcp.h's namespace, we hide
them behind _BSD_SOURCE (and therefore _DEFAULT_SOURCE) to expose
them by default, but keep it standard conforming.
---
 include/netinet/tcp.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/include/netinet/tcp.h b/include/netinet/tcp.h
index 52358c7..f9b8464 100644
--- a/include/netinet/tcp.h
+++ b/include/netinet/tcp.h
@@ -41,7 +41,20 @@
 #define TCP_CLOSING      11
 
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define TCPOPT_EOL              0
+#define TCPOPT_NOP              1
+#define TCPOPT_MAXSEG           2
+#define TCPOPT_WINDOW           3
+#define TCPOPT_SACK_PERMITTED   4
+#define TCPOPT_SACK             5
+#define TCPOPT_TIMESTAMP        8
+#define TCPOLEN_SACK_PERMITTED  2
+#define TCPOLEN_WINDOW          3
+#define TCPOLEN_MAXSEG          4
+#define TCPOLEN_TIMESTAMP       10
+
 #define SOL_TCP 6
+
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdint.h>
-- 
2.6.4