OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: move socket.h generic definitions to generic/sockbits.h 

and include the file from architectures without specific definitions

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20180519092956.15134-5-laurent@vivier.eu>
This commit is contained in:
Laurent Vivier 2018-05-19 11:29:52 +02:00
parent da84fdaaf8
commit 500fa60760
17 changed files with 82 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
linux-user/aarch64/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/arm/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/cris/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

67
linux-user/generic/sockbits.h Normal file
View File

@ -0,0 +1,67 @@
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation, or (at your option) any
* later version. See the COPYING file in the top-level directory.
*/
#ifndef GENERIC_SOCKBITS_H
#define GENERIC_SOCKBITS_H
#define TARGET_SO_PASSSEC 34
/* For setsockopt(2) */
#define TARGET_SOL_SOCKET 1
#define TARGET_SO_DEBUG 1
#define TARGET_SO_REUSEADDR 2
#define TARGET_SO_TYPE 3
#define TARGET_SO_ERROR 4
#define TARGET_SO_DONTROUTE 5
#define TARGET_SO_BROADCAST 6
#define TARGET_SO_SNDBUF 7
#define TARGET_SO_RCVBUF 8
#define TARGET_SO_SNDBUFFORCE 32
#define TARGET_SO_RCVBUFFORCE 33
#define TARGET_SO_KEEPALIVE 9
#define TARGET_SO_OOBINLINE 10
#define TARGET_SO_NO_CHECK 11
#define TARGET_SO_PRIORITY 12
#define TARGET_SO_LINGER 13
#define TARGET_SO_BSDCOMPAT 14
/* To add :#define TARGET_SO_REUSEPORT 15 */
#if defined(TARGET_PPC)
#define TARGET_SO_RCVLOWAT 16
#define TARGET_SO_SNDLOWAT 17
#define TARGET_SO_RCVTIMEO 18
#define TARGET_SO_SNDTIMEO 19
#define TARGET_SO_PASSCRED 20
#define TARGET_SO_PEERCRED 21
#else
#define TARGET_SO_PASSCRED 16
#define TARGET_SO_PEERCRED 17
#define TARGET_SO_RCVLOWAT 18
#define TARGET_SO_SNDLOWAT 19
#define TARGET_SO_RCVTIMEO 20
#define TARGET_SO_SNDTIMEO 21
#endif
/* Security levels - as per NRL IPv6 - don't actually do anything */
#define TARGET_SO_SECURITY_AUTHENTICATION 22
#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 23
#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 24
#define TARGET_SO_BINDTODEVICE 25
/* Socket filtering */
#define TARGET_SO_ATTACH_FILTER 26
#define TARGET_SO_DETACH_FILTER 27
#define TARGET_SO_PEERNAME 28
#define TARGET_SO_TIMESTAMP 29
#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP
#define TARGET_SO_ACCEPTCONN 30
#define TARGET_SO_PEERSEC 31
#endif

1
linux-user/i386/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/m68k/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/microblaze/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/nios2/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/openrisc/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/ppc/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/riscv/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/s390x/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/sh4/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

61
linux-user/socket.h
View File

@ -1,66 +1,5 @@
#if defined(TARGET_MIPS) || defined(TARGET_HPPA) || defined(TARGET_ALPHA) || \
defined(TARGET_SPARC)
#include "sockbits.h"
#else
#define TARGET_SO_PASSSEC 34
/* For setsockopt(2) */
#define TARGET_SOL_SOCKET 1
#define TARGET_SO_DEBUG 1
#define TARGET_SO_REUSEADDR 2
#define TARGET_SO_TYPE 3
#define TARGET_SO_ERROR 4
#define TARGET_SO_DONTROUTE 5
#define TARGET_SO_BROADCAST 6
#define TARGET_SO_SNDBUF 7
#define TARGET_SO_RCVBUF 8
#define TARGET_SO_SNDBUFFORCE 32
#define TARGET_SO_RCVBUFFORCE 33
#define TARGET_SO_KEEPALIVE 9
#define TARGET_SO_OOBINLINE 10
#define TARGET_SO_NO_CHECK 11
#define TARGET_SO_PRIORITY 12
#define TARGET_SO_LINGER 13
#define TARGET_SO_BSDCOMPAT 14
/* To add :#define TARGET_SO_REUSEPORT 15 */
#if defined(TARGET_PPC)
#define TARGET_SO_RCVLOWAT 16
#define TARGET_SO_SNDLOWAT 17
#define TARGET_SO_RCVTIMEO 18
#define TARGET_SO_SNDTIMEO 19
#define TARGET_SO_PASSCRED 20
#define TARGET_SO_PEERCRED 21
#else
#define TARGET_SO_PASSCRED 16
#define TARGET_SO_PEERCRED 17
#define TARGET_SO_RCVLOWAT 18
#define TARGET_SO_SNDLOWAT 19
#define TARGET_SO_RCVTIMEO 20
#define TARGET_SO_SNDTIMEO 21
#endif
/* Security levels - as per NRL IPv6 - don't actually do anything */
#define TARGET_SO_SECURITY_AUTHENTICATION 22
#define TARGET_SO_SECURITY_ENCRYPTION_TRANSPORT 23
#define TARGET_SO_SECURITY_ENCRYPTION_NETWORK 24
#define TARGET_SO_BINDTODEVICE 25
/* Socket filtering */
#define TARGET_SO_ATTACH_FILTER 26
#define TARGET_SO_DETACH_FILTER 27
#define TARGET_SO_PEERNAME 28
#define TARGET_SO_TIMESTAMP 29
#define TARGET_SCM_TIMESTAMP TARGET_SO_TIMESTAMP
#define TARGET_SO_ACCEPTCONN 30
#define TARGET_SO_PEERSEC 31
#endif
#ifndef ARCH_HAS_SOCKET_TYPES
/** sock_type - Socket types - default values

1
linux-user/tilegx/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/x86_64/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"

1
linux-user/xtensa/sockbits.h Normal file
View File

@ -0,0 +1 @@
#include "../generic/sockbits.h"