mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-10-27 20:58:22 +00:00
sock: MSG_PEEK and other fixes
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
#include <kernel/sock.h>
|
||||
#include <errno.h>
|
||||
|
||||
syscallret_t syscall_accept(context_t *, int oldfd, abisockaddr_t *abisockaddr, size_t *addrlen, int acceptflags) {
|
||||
syscallret_t syscall_accept(context_t *, int oldfd, abisockaddr_t *abisockaddr, int *addrlen, int acceptflags) {
|
||||
syscallret_t ret = {
|
||||
.ret = -1
|
||||
};
|
||||
|
||||
@@ -23,6 +23,11 @@ syscallret_t syscall_read(context_t *context, int fd, void *buffer, size_t size)
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (size == 0) {
|
||||
ret.ret = 0;
|
||||
ret.errno = 0;
|
||||
goto cleanup;
|
||||
}
|
||||
size_t bytesread;
|
||||
uintmax_t offset = file->offset;
|
||||
ret.errno = vfs_read(file->vnode, kernelbuff, size, file->offset, &bytesread, fileflagstovnodeflags(file->flags));
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -12,10 +12,10 @@ syscallret_t syscall_socket(context_t *, int domain, int type, int protocol) {
|
||||
|
||||
switch (domain) {
|
||||
case AF_INET:
|
||||
if (type != SOCK_DGRAM)
|
||||
break;
|
||||
|
||||
socktype = SOCKET_TYPE_UDP;
|
||||
if (type == SOCK_STREAM)
|
||||
socktype = SOCKET_TYPE_TCP;
|
||||
if (type == SOCK_DGRAM)
|
||||
socktype = SOCKET_TYPE_UDP;
|
||||
break;
|
||||
case AF_LOCAL:
|
||||
socktype = SOCKET_TYPE_LOCAL;
|
||||
|
||||
@@ -21,6 +21,12 @@ syscallret_t syscall_write(context_t *context, int fd, void *buffer, size_t size
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
if (size == 0) {
|
||||
ret.ret = 0;
|
||||
ret.errno = 0;
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
// TODO safe memcpy
|
||||
memcpy(kernelbuff, buffer, size);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user