d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Somewhere between 2.6.23 and 2.6.27, Linux added SOCK_CLOEXEC and

Browse Source 
SOCK_NONBLOCK flags, that allow to save fcntl() calls.

Implement a variation of the socket() syscall which takes a flags
in addition to the type argument.

Approved by:	kib (mentor)
MFC after:	1 month
This commit is contained in:
Dmitry Chagin 2009-05-16 18:48:41 +00:00
parent eeb63e515f
commit 3933bde22e
4 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/amd64/linux32/linux.h
View File

@ -571,6 +571,7 @@ int linux_ioctl_unregister_handler(struct linux_ioctl_handler *h);
#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */
#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */
#define LINUX_O_NOATIME 01000000
#define LINUX_O_CLOEXEC 02000000
#define LINUX_F_DUPFD 0
#define LINUX_F_GETFD 1

25
sys/compat/linux/linux_socket.c
View File

@ -593,10 +593,13 @@ linux_socket(struct thread *td, struct linux_socket_args *args)
int type;
int protocol;
} */ bsd_args;
int retval_socket;
int retval_socket, socket_flags;
bsd_args.protocol = args->protocol;
bsd_args.type = args->type;
socket_flags = args->type & ~LINUX_SOCK_TYPE_MASK;
if (socket_flags & ~(LINUX_SOCK_CLOEXEC | LINUX_SOCK_NONBLOCK))
return (EINVAL);
bsd_args.type = args->type & LINUX_SOCK_TYPE_MASK;
if (bsd_args.type < 0 || bsd_args.type > LINUX_SOCK_MAX)
return (EINVAL);
bsd_args.domain = linux_to_bsd_domain(args->domain);
@ -607,6 +610,23 @@ linux_socket(struct thread *td, struct linux_socket_args *args)
if (retval_socket)
return (retval_socket);
if (socket_flags & LINUX_SOCK_NONBLOCK) {
retval_socket = kern_fcntl(td, td->td_retval[0],
F_SETFL, O_NONBLOCK);
if (retval_socket) {
(void)kern_close(td, td->td_retval[0]);
goto out;
}
}
if (socket_flags & LINUX_SOCK_CLOEXEC) {
retval_socket = kern_fcntl(td, td->td_retval[0],
F_SETFD, FD_CLOEXEC);
if (retval_socket) {
(void)kern_close(td, td->td_retval[0]);
goto out;
}
}
if (bsd_args.type == SOCK_RAW
&& (bsd_args.protocol == IPPROTO_RAW || bsd_args.protocol == 0)
&& bsd_args.domain == PF_INET) {
@ -642,6 +662,7 @@ linux_socket(struct thread *td, struct linux_socket_args *args)
}
#endif
out:
return (retval_socket);
}

7
sys/compat/linux/linux_socket.h
View File

@ -100,6 +100,13 @@
#define LINUX_SOCK_MAX LINUX_SOCK_SEQPACKET
#define LINUX_SOCK_TYPE_MASK 0xf
/* Flags for socket, socketpair, accept4 */
#define LINUX_SOCK_CLOEXEC LINUX_O_CLOEXEC
#define LINUX_SOCK_NONBLOCK LINUX_O_NONBLOCK
struct l_ucred {
uint32_t pid;
uint32_t uid;

1
sys/i386/linux/linux.h
View File

@ -547,6 +547,7 @@ int linux_ioctl_unregister_handler(struct linux_ioctl_handler *h);
#define LINUX_O_DIRECTORY 00200000 /* Must be a directory */
#define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */
#define LINUX_O_NOATIME 01000000
#define LINUX_O_CLOEXEC 02000000
#define LINUX_F_DUPFD 0
#define LINUX_F_GETFD 1