mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

sockets: MSG_WAITALL support

Browse Source
This commit is contained in:
Matheus
2024-08-29 22:48:35 -03:00
parent d3f3ccbb11
commit 066b89c40a
5 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/include/kernel/abi.h
+1
View File
@@ -89,6 +89,7 @@ typedef struct {
#define SOCK_RAW 3
#define MSG_PEEK 2
#define MSG_WAITALL 0x100
#define MSG_NOSIGNAL 0x4000
#define SO_BROADCAST 6
kernel-src/include/kernel/sock.h
+1
View File
@@ -30,6 +30,7 @@ typedef struct {
} sockaddr_t;
#define SOCKET_RECV_FLAGS_PEEK 0x8000000000000000l
#define SOCKET_RECV_FLAGS_WAITALL 0x4000000000000000l
#define SOCKET_SEND_FLAGS_NOSIGNAL 0x8000000000000000l
typedef struct socketops_t {
int (*bind)(socket_t *socket, sockaddr_t *addr);
kernel-src/io/net/localsocket.c
+9 -3
View File
@@ -257,9 +257,15 @@ static int localsock_recv(socket_t *socket, sockaddr_t *addr, void *buffer, size
int revents = internalpoll(socket, &desc.data[0], POLLIN);
if (revents) {
poll_leave(&desc);
poll_destroydesc(&desc);
break;
if ((revents & POLLHUP) == 0 && (flags & SOCKET_RECV_FLAGS_WAITALL) &&
(flags & SOCKET_RECV_FLAGS_PEEK) == 0 && RINGBUFFER_DATACOUNT(&localsocket->ringbuffer) < count) {
// wait for more data (WAITALL is set)
poll_add(&socket->pollheader, &desc.data[0], POLLIN);
} else {
poll_leave(&desc);
poll_destroydesc(&desc);
break;
}
}
if (flags & V_FFLAGS_NONBLOCKING) {
kernel-src/io/net/tcp.c
+9 -3
View File
@@ -1345,9 +1345,15 @@ static int tcp_recv(socket_t *socket, sockaddr_t *addr, void *buffer, size_t cou
int revents = internalpoll(tcb, &desc.data[0], POLLIN);
if (revents) {
poll_leave(&desc);
poll_destroydesc(&desc);
break;
if ((revents & POLLHUP) == 0 && (flags & SOCKET_RECV_FLAGS_WAITALL) &&
(flags & SOCKET_RECV_FLAGS_PEEK) == 0 && RINGBUFFER_DATACOUNT(&tcb->receivebuffer) < count) {
// wait for more data (WAITALL is set)
poll_add(&socket->pollheader, &desc.data[0], POLLIN);
} else {
poll_leave(&desc);
poll_destroydesc(&desc);
break;
}
}
if (flags & V_FFLAGS_NONBLOCKING) {
kernel-src/sys/syscalls/recvmsg.c
+10 -2
View File
@@ -6,7 +6,7 @@
#include <kernel/file.h>
#include <kernel/alloc.h>
#define KNOWN_FLAGS (MSG_PEEK)
#define KNOWN_FLAGS (MSG_PEEK | MSG_WAITALL)
syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags) {
__assert((flags & ~KNOWN_FLAGS) == 0);
@@ -41,7 +41,15 @@ syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
sockaddr_t sockaddr;
socket_t *socket = SOCKFS_SOCKET_FROM_NODE(file->vnode);
size_t recvcount;
ret.errno = socket->ops->recv(socket, &sockaddr, buffer, buffersize, fileflagstovnodeflags(file->flags) | ((flags & MSG_PEEK) ? SOCKET_RECV_FLAGS_PEEK : 0), &recvcount);
uintmax_t recvflags = 0;
if (flags & MSG_PEEK)
recvflags |= SOCKET_RECV_FLAGS_PEEK;
if (flags & MSG_WAITALL)
recvflags |= SOCKET_RECV_FLAGS_WAITALL;
ret.errno = socket->ops->recv(socket, &sockaddr, buffer, buffersize, fileflagstovnodeflags(file->flags) | recvflags, &recvcount);
ret.ret = ret.errno ? -1 : recvcount;
if (ret.errno)
goto cleanup;