mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-10-29 05:38:21 +00:00
sock: MSG_PEEK and other fixes
This commit is contained in:
@@ -6,9 +6,13 @@
|
||||
#include <kernel/file.h>
|
||||
#include <kernel/alloc.h>
|
||||
|
||||
#define KNOWN_FLAGS (MSG_PEEK)
|
||||
|
||||
syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags) {
|
||||
__assert(flags == 0);
|
||||
syscallret_t ret;
|
||||
__assert((flags & ~KNOWN_FLAGS) == 0);
|
||||
syscallret_t ret = {
|
||||
.ret = -1
|
||||
};
|
||||
|
||||
msghdr_t msghdr;
|
||||
ret.errno = sock_copymsghdr(&msghdr, umsghdr);
|
||||
@@ -37,8 +41,10 @@ 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), &recvcount);
|
||||
ret.errno = socket->ops->recv(socket, &sockaddr, buffer, buffersize, fileflagstovnodeflags(file->flags) | ((flags & MSG_PEEK) ? SOCKET_RECV_FLAGS_PEEK : 0), &recvcount);
|
||||
ret.ret = ret.errno ? -1 : recvcount;
|
||||
if (ret.errno)
|
||||
goto cleanup;
|
||||
|
||||
uintmax_t iovoffset = 0;
|
||||
for (int i = 0; i < msghdr.iovcount; ++i) {
|
||||
|
||||
Reference in New Issue
Block a user