Skip to content

Implement accept4 #2779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emkey1 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −2
Open

Implement accept4 #2779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion fs/sock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,24 @@ int_t sys_accept(fd_t sock_fd, addr_t sockaddr_addr, addr_t sockaddr_len_addr) {
return client_f;
}

int_t sys_accept4(fd_t sock_fd, addr_t sockaddr_addr, addr_t sockaddr_len_addr, int_t flags) {
STRACE("accept4(%d, 0x%x, 0x%x, %d) ", sock_fd, sockaddr_addr, sockaddr_len_addr, flags);
if (flags & ~(SOCK_NONBLOCK_ | SOCK_CLOEXEC_))
return _EINVAL;
int_t client_f = sys_accept(sock_fd, sockaddr_addr, sockaddr_len_addr);
if (client_f < 0)
return client_f;
// The flags apply to the accepted fd, not the listener.
if (flags & SOCK_CLOEXEC_)
bit_set(client_f, current->files->cloexec);
if (flags & SOCK_NONBLOCK_) {
struct fd *client = f_get(client_f);
if (client != NULL)
fd_setflags(client, fd_getflags(client) | O_NONBLOCK_);
}
return client_f;
}

static void copy_unix_name(char *sockaddr, dword_t *sockaddr_len, struct fd *sock) {
struct sockaddr_ *fake_addr = (void *) sockaddr;
fake_addr->family = PF_LOCAL_;
Expand Down Expand Up @@ -1214,7 +1232,7 @@ static struct socket_call {
{(syscall_t) sys_getsockopt, 5},
{(syscall_t) sys_sendmsg, 3},
{(syscall_t) sys_recvmsg, 3},
{NULL}, // accept4
{(syscall_t) sys_accept4, 4},
{NULL}, // recvmmsg
{(syscall_t) sys_sendmmsg, 4},
};
Expand Down
1 change: 1 addition & 0 deletions fs/sock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ int_t sys_bind(fd_t sock_fd, addr_t sockaddr_addr, uint_t sockaddr_len);
int_t sys_connect(fd_t sock_fd, addr_t sockaddr_addr, uint_t sockaddr_len);
int_t sys_listen(fd_t sock_fd, int_t backlog);
int_t sys_accept(fd_t sock_fd, addr_t sockaddr_addr, addr_t sockaddr_len_addr);
int_t sys_accept4(fd_t sock_fd, addr_t sockaddr_addr, addr_t sockaddr_len_addr, int_t flags);
int_t sys_getsockname(fd_t sock_fd, addr_t sockaddr_addr, addr_t sockaddr_len_addr);
int_t sys_getpeername(fd_t sock_fd, addr_t sockaddr_addr, addr_t sockaddr_len_addr);
int_t sys_socketpair(dword_t domain, dword_t type, dword_t protocol, addr_t sockets_addr);
Expand Down
2 changes: 1 addition & 1 deletion kernel/calls.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ syscall_t syscall_table[] = {
[361] = (syscall_t) sys_bind,
[362] = (syscall_t) sys_connect,
[363] = (syscall_t) sys_listen,
[364] = (syscall_t) syscall_stub, // accept4
[364] = (syscall_t) sys_accept4,
[365] = (syscall_t) sys_getsockopt,
[366] = (syscall_t) sys_setsockopt,
[367] = (syscall_t) sys_getsockname,
Expand Down
Loading