1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
|
Index: b/usr/src/lib/libc/common/sys/_so_accept.s
===================================================================
--- a/usr/src/lib/libc/common/sys/_so_accept.s
+++ b/usr/src/lib/libc/common/sys/_so_accept.s
@@ -33,8 +33,8 @@
/* C library -- __so_accept */
/*
- * int __so_accept(int sock, struct sockaddr *addr, int *addrlen, int vers,
- * int flags)
+ * int __so_accept(int sock, struct sockaddr *addr, int *addrlen, int vers)
+ * int __so_accept4(int sock, struct sockaddr *addr, int *addrlen, int vers, int flags)
*/
#include "SYS.h"
@@ -42,3 +42,7 @@
SYSCALL2_RVAL1(__so_accept,accept)
RET
SET_SIZE(__so_accept)
+
+ SYSCALL2_RVAL1(__so_accept4,accept4)
+ RET
+ SET_SIZE(__so_accept4)
Index: b/usr/src/lib/libc/port/threads/scalls.c
===================================================================
--- a/usr/src/lib/libc/port/threads/scalls.c
+++ b/usr/src/lib/libc/port/threads/scalls.c
@@ -1067,13 +1067,22 @@ sigqueue(pid_t pid, int signo, const uni
}
int
-_so_accept(int sock, struct sockaddr *addr, uint_t *addrlen, int version,
+_so_accept(int sock, struct sockaddr *addr, uint_t *addrlen, int version)
+{
+ extern int __so_accept(int, struct sockaddr *, uint_t *, int);
+ int rv;
+
+ PERFORM(__so_accept(sock, addr, addrlen, version))
+}
+
+int
+_so_accept4(int sock, struct sockaddr *addr, uint_t *addrlen, int version,
int flags)
{
- extern int __so_accept(int, struct sockaddr *, uint_t *, int, int);
+ extern int __so_accept4(int, struct sockaddr *, uint_t *, int, int);
int rv;
- PERFORM(__so_accept(sock, addr, addrlen, version, flags))
+ PERFORM(__so_accept4(sock, addr, addrlen, version, flags))
}
int
Index: b/usr/src/lib/libsocket/socket/weaks.c
===================================================================
--- a/usr/src/lib/libsocket/socket/weaks.c
+++ b/usr/src/lib/libsocket/socket/weaks.c
@@ -61,6 +61,7 @@
extern int _so_bind();
extern int _so_listen();
extern int _so_accept();
+extern int _so_accept4();
extern int _so_connect();
extern int _so_shutdown();
extern int _so_recv();
@@ -93,13 +94,13 @@ _listen(int sock, int backlog)
int
_accept(int sock, struct sockaddr *addr, int *addrlen)
{
- return (_so_accept(sock, addr, addrlen, SOV_DEFAULT, 0));
+ return (_so_accept(sock, addr, addrlen, SOV_DEFAULT));
}
int
_accept4(int sock, struct sockaddr *addr, int *addrlen, int flags)
{
- return (_so_accept(sock, addr, addrlen, SOV_DEFAULT, flags));
+ return (_so_accept4(sock, addr, addrlen, SOV_DEFAULT, flags));
}
int
Index: b/usr/src/lib/libc/port/mapfile-vers
===================================================================
--- a/usr/src/lib/libc/port/mapfile-vers
+++ b/usr/src/lib/libc/port/mapfile-vers
@@ -262,6 +262,7 @@ SYMBOL_VERSION ILLUMOS_0.4 { # Illumos a
SYMBOL_VERSION DYSON_1 {
global:
+ _so_accept4;
cfmakeraw;
error;
error_at_line;
|
