mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 14:30:06 +00:00
Linux: Assume and consolidate getpeername wire-up syscall
And disable if kernel does not support it. Checked on x86_64-linux-gnu and i686-linux-gnu. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
parent
a7bf5f4e69
commit
48d256dee7
@ -1,4 +0,0 @@
|
||||
# File name Caller Syscall name # args Strong name Weak names
|
||||
|
||||
# Socket APIs
|
||||
getpeername - getpeername i:ipp __getpeername getpeername
|
@ -15,19 +15,14 @@
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <socketcall.h>
|
||||
#include <kernel-features.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
int
|
||||
__getpeername (int fd, __SOCKADDR_ARG addr, socklen_t *len)
|
||||
{
|
||||
#ifdef __ASSUME_GETPEERNAME_SYSCALL
|
||||
return INLINE_SYSCALL (getpeername, 3, fd, addr.__sockaddr__, len);
|
||||
return INLINE_SYSCALL_CALL (getpeername, fd, addr.__sockaddr__, len);
|
||||
#else
|
||||
return SOCKETCALL (getpeername, fd, addr.__sockaddr__, len);
|
||||
#endif
|
||||
|
@ -17,11 +17,6 @@
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Direct socketcalls available with kernel 4.3. */
|
||||
#if __LINUX_KERNEL_VERSION >= 0x040300
|
||||
# define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
#endif
|
||||
|
||||
#include_next <kernel-features.h>
|
||||
|
||||
#undef __ASSUME_ACCEPT_SYSCALL
|
||||
@ -42,6 +37,7 @@
|
||||
# undef __ASSUME_LISTEN_SYSCALL
|
||||
# undef __ASSUME_SHUTDOWN_SYSCALL
|
||||
# undef __ASSUME_GETSOCKNAME_SYSCALL
|
||||
# undef __ASSUME_GETPEERNAME_SYSCALL
|
||||
#endif
|
||||
|
||||
/* i686 only supports ipc syscall before 5.1. */
|
||||
|
@ -85,6 +85,7 @@
|
||||
#define __ASSUME_LISTEN_SYSCALL 1
|
||||
#define __ASSUME_SHUTDOWN_SYSCALL 1
|
||||
#define __ASSUME_GETSOCKNAME_SYSCALL 1
|
||||
#define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
|
||||
/* Support for SysV IPC through wired syscalls. All supported architectures
|
||||
either support ipc syscall and/or all the ipc correspondent syscalls. */
|
||||
|
@ -17,11 +17,6 @@
|
||||
License along with the GNU C Library. If not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Direct socketcalls available with kernel 4.3. */
|
||||
#if __LINUX_KERNEL_VERSION >= 0x040300
|
||||
# define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
#endif
|
||||
|
||||
#include_next <kernel-features.h>
|
||||
|
||||
#undef __ASSUME_ACCEPT_SYSCALL
|
||||
@ -44,6 +39,7 @@
|
||||
# undef __ASSUME_LISTEN_SYSCALL
|
||||
# undef __ASSUME_SHUTDOWN_SYSCALL
|
||||
# undef __ASSUME_GETSOCKNAME_SYSCALL
|
||||
# undef __ASSUME_GETPEERNAME_SYSCALL
|
||||
#endif
|
||||
|
||||
/* No support for PI futexes or robust mutexes before 3.10 for m68k. */
|
||||
|
@ -19,7 +19,6 @@
|
||||
|
||||
/* All supported kernel versions for MicroBlaze have these syscalls. */
|
||||
#define __ASSUME_CONNECT_SYSCALL 1
|
||||
#define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
#define __ASSUME_SEND_SYSCALL 1
|
||||
#define __ASSUME_RECV_SYSCALL 1
|
||||
|
||||
|
@ -19,7 +19,6 @@
|
||||
|
||||
/* New syscalls added for PowerPC in 2.6.37. */
|
||||
#define __ASSUME_CONNECT_SYSCALL 1
|
||||
#define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
#define __ASSUME_SEND_SYSCALL 1
|
||||
#define __ASSUME_RECV_SYSCALL 1
|
||||
|
||||
|
@ -17,11 +17,6 @@
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Direct socketcalls available with kernel 4.3. */
|
||||
#if __LINUX_KERNEL_VERSION >= 0x040300
|
||||
# define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
#endif
|
||||
|
||||
#include_next <kernel-features.h>
|
||||
|
||||
#undef __ASSUME_ACCEPT_SYSCALL
|
||||
@ -44,6 +39,7 @@
|
||||
# undef __ASSUME_LISTEN_SYSCALL
|
||||
# undef __ASSUME_SHUTDOWN_SYSCALL
|
||||
# undef __ASSUME_GETSOCKNAME_SYSCALL
|
||||
# undef __ASSUME_GETPEERNAME_SYSCALL
|
||||
#endif
|
||||
|
||||
/* s390 only supports ipc syscall before 5.1. */
|
||||
|
@ -24,7 +24,6 @@
|
||||
|
||||
/* These syscalls were added for SH in 2.6.37. */
|
||||
#define __ASSUME_CONNECT_SYSCALL 1
|
||||
#define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
#define __ASSUME_SEND_SYSCALL 1
|
||||
#define __ASSUME_RECV_SYSCALL 1
|
||||
|
||||
|
@ -46,6 +46,7 @@
|
||||
in 4.20 (but present for 64-bit in all supported kernel versions). */
|
||||
#if !defined __arch64__ && __LINUX_KERNEL_VERSION < 0x041400
|
||||
# undef __ASSUME_GETSOCKNAME_SYSCALL
|
||||
# undef __ASSUME_GETPEERNAME_SYSCALL
|
||||
#endif
|
||||
|
||||
/* These syscalls were added for both 32-bit and 64-bit in 4.4. */
|
||||
|
Loading…
Reference in New Issue
Block a user