[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Wed, 1 Jul 2015 22:16:31 +0200
From: Szabolcs Nagy <nsz@...t70.net>
To: musl@...ts.openwall.com
Subject: Re: [PATCH] socket.h: fix SO_* for mips
* Roman Yeryomin <roman@...t.com> [2015-07-01 19:27:08 +0300]:
> Signed-off-by: Roman Yeryomin <roman@...t.com>
> ---
> arch/mips/bits/socket.h | 31 ++++++++++++++++++-------------
> arch/powerpc/bits/socket.h | 9 ++++++---
> include/sys/socket.h | 6 +++---
> 3 files changed, 27 insertions(+), 19 deletions(-)
>
> diff --git a/arch/mips/bits/socket.h b/arch/mips/bits/socket.h
> index fe5bad9..cc72dcf 100644
> --- a/arch/mips/bits/socket.h
> +++ b/arch/mips/bits/socket.h
> @@ -22,26 +22,31 @@ struct cmsghdr
> #define SOL_SOCKET 65535
>
> #define SO_DEBUG 1
> -#define SO_REUSEADDR 4
> -#define SO_TYPE 0x1008
> -#define SO_ERROR 0x1007
> -#define SO_DONTROUTE 16
> -#define SO_BROADCAST 32
> +
> +#define SO_REUSEADDR 0x0004
> +#define SO_KEEPALIVE 0x0008
> +#define SO_DONTROUTE 0x0010
> +#define SO_BROADCAST 0x0020
> +#define SO_LINGER 0x0080
> +#define SO_OOBINLINE 0x0100
> +#define SO_REUSEPORT 0x0200
> #define SO_SNDBUF 0x1001
> #define SO_RCVBUF 0x1002
> -#define SO_KEEPALIVE 8
> -#define SO_OOBINLINE 256
> +#define SO_SNDLOWAT 0x1003
> +#define SO_RCVLOWAT 0x1004
> +#define SO_RCVTIMEO 0x1006
> +#define SO_SNDTIMEO 0x1005
> +#define SO_ERROR 0x1007
> +#define SO_TYPE 0x1008
> +#define SO_ACCEPTCONN 0x1009
> +#define SO_PROTOCOL 0x1028
> +#define SO_DOMAIN 0x1029
i assume these 3 were wrong in generic sys/socket.h
and eveything else is ok, just reordered
> +
> #define SO_NO_CHECK 11
> #define SO_PRIORITY 12
> -#define SO_LINGER 128
> #define SO_BSDCOMPAT 14
> -#define SO_REUSEPORT 512
> #define SO_PASSCRED 17
> #define SO_PEERCRED 18
> -#define SO_RCVLOWAT 0x1004
> -#define SO_SNDLOWAT 0x1003
> -#define SO_RCVTIMEO 0x1006
> -#define SO_SNDTIMEO 0x1005
> #define SO_SNDBUFFORCE 31
> #define SO_RCVBUFFORCE 33
>
> diff --git a/arch/powerpc/bits/socket.h b/arch/powerpc/bits/socket.h
> index 4ed04d3..8eb19f4 100644
> --- a/arch/powerpc/bits/socket.h
> +++ b/arch/powerpc/bits/socket.h
> @@ -17,6 +17,7 @@ struct cmsghdr
> };
>
> #define SO_DEBUG 1
> +
> #define SO_REUSEADDR 2
> #define SO_TYPE 3
> #define SO_ERROR 4
> @@ -24,8 +25,6 @@ struct cmsghdr
> #define SO_BROADCAST 6
> #define SO_SNDBUF 7
> #define SO_RCVBUF 8
> -#define SO_SNDBUFFORCE 32
> -#define SO_RCVBUFFORCE 33
> #define SO_KEEPALIVE 9
> #define SO_OOBINLINE 10
> #define SO_NO_CHECK 11
> @@ -39,4 +38,8 @@ struct cmsghdr
> #define SO_SNDTIMEO 19
> #define SO_PASSCRED 20
> #define SO_PEERCRED 21
> -
> +#define SO_ACCEPTCONN 30
> +#define SO_SNDBUFFORCE 32
> +#define SO_RCVBUFFORCE 33
> +#define SO_PROTOCOL 38
> +#define SO_DOMAIN 39
> diff --git a/include/sys/socket.h b/include/sys/socket.h
> index 077fb3f..40de336 100644
> --- a/include/sys/socket.h
> +++ b/include/sys/socket.h
> @@ -177,8 +177,11 @@ struct linger
> #define SO_SNDLOWAT 19
> #define SO_RCVTIMEO 20
> #define SO_SNDTIMEO 21
> +#define SO_ACCEPTCONN 30
> #define SO_SNDBUFFORCE 32
> #define SO_RCVBUFFORCE 33
> +#define SO_PROTOCOL 38
> +#define SO_DOMAIN 39
> #endif
>
> #define SO_SECURITY_AUTHENTICATION 22
> @@ -195,7 +198,6 @@ struct linger
> #define SO_TIMESTAMP 29
> #define SCM_TIMESTAMP SO_TIMESTAMP
>
> -#define SO_ACCEPTCONN 30
> #define SO_PEERSEC 31
> #define SO_PASSSEC 34
> #define SO_TIMESTAMPNS 35
> @@ -203,8 +205,6 @@ struct linger
> #define SO_MARK 36
> #define SO_TIMESTAMPING 37
> #define SCM_TIMESTAMPING SO_TIMESTAMPING
> -#define SO_PROTOCOL 38
> -#define SO_DOMAIN 39
> #define SO_RXQ_OVFL 40
> #define SO_WIFI_STATUS 41
> #define SCM_WIFI_STATUS SO_WIFI_STATUS
> --
> 2.1.4
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
