diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2020-06-30 14:33:57 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2020-07-01 10:25:54 +0300 |
| commit | e037192b505b4f233fca9a6deafc9797210f6693 (patch) | |
| tree | fb1b441d449f1cd3b6199778988aeb6ea502881b /winsup/cygwin/include | |
| parent | c11b0343c069c6d69b3bdf329bcaeb550a18d9e9 (diff) | |
Cygwin: tcp: fix IPPROTO_TCP option handling
- Drop definitions from <cygwin/sockets.h>
- Drop options only available on BSD
- Fix value of TCP_MAXSEG. It was still defined as the BSD value
while WinSock uses another value
- Handle the fact that TCP_MAXSEG is a R/O value in WinSock
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/cygwin/include')
| -rw-r--r-- | winsup/cygwin/include/cygwin/socket.h | 6 | ||||
| -rw-r--r-- | winsup/cygwin/include/netinet/tcp.h | 6 |
2 files changed, 1 insertions, 11 deletions
diff --git a/winsup/cygwin/include/cygwin/socket.h b/winsup/cygwin/include/cygwin/socket.h index 721dafcfa..0ca8300d9 100644 --- a/winsup/cygwin/include/cygwin/socket.h +++ b/winsup/cygwin/include/cygwin/socket.h @@ -300,12 +300,6 @@ struct OLD_msghdr /* IPX options */ #define IPX_TYPE 1 -/* TCP options - this way around because someone left a set in the c library includes */ -#ifndef TCP_NODELAY -#define TCP_NODELAY 0x0001 -#define TCP_MAXSEG 2 -#endif - /* SUS symbolic values for the second parm to shutdown(2) */ #define SHUT_RD 0 /* == Win32 SD_RECEIVE */ #define SHUT_WR 1 /* == Win32 SD_SEND */ diff --git a/winsup/cygwin/include/netinet/tcp.h b/winsup/cygwin/include/netinet/tcp.h index c9d534dda..5503a3fd6 100644 --- a/winsup/cygwin/include/netinet/tcp.h +++ b/winsup/cygwin/include/netinet/tcp.h @@ -123,11 +123,7 @@ struct tcphdr { /* * User-settable options (used with setsockopt). */ -#ifndef TCP_NODELAY #define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ -#define TCP_MAXSEG 0x02 /* set maximum segment size */ -#endif -#define TCP_NOPUSH 0x04 /* don't push last block of write */ -#define TCP_NOOPT 0x08 /* don't use TCP options */ +#define TCP_MAXSEG 0x04 /* get maximum segment size (r/o on windows) */ #endif |