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

socket: handle control data, change recv and send arguments

Browse Source
This commit is contained in:
Matheus
2024-09-01 13:20:12 -03:00
parent fe1102224e
commit 997fbc4e2e
7 changed files with 170 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/sys/syscalls/recvmsg.c
+43 -4
View File
@@ -21,6 +21,13 @@ syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
file_t *file = NULL;
size_t buffersize = iovec_size(msghdr.iov, msghdr.iovcount);
if (buffersize == 0) {
sock_freemsghdr(&msghdr);
ret.errno = 0;
ret.ret = 0;
return ret;
}
void *buffer = vmm_map(NULL, buffersize, VMM_FLAGS_ALLOCATE, ARCH_MMU_FLAGS_READ | ARCH_MMU_FLAGS_WRITE | ARCH_MMU_FLAGS_NOEXEC, NULL);
if (buffer == NULL) {
ret.errno = ENOMEM;
@@ -40,7 +47,6 @@ 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;
uintmax_t recvflags = 0;
if (flags & MSG_PEEK)
@@ -49,11 +55,24 @@ syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
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;
sockdesc_t desc = {
.addr = &sockaddr,
.buffer = buffer,
.count = buffersize,
.flags = fileflagstovnodeflags(file->flags) | recvflags,
.donecount = 0,
.ctrl = msghdr.msgctrl,
.ctrllen = msghdr.ctrllen,
.ctrldone = 0
};
ret.errno = socket->ops->recv(socket, &desc);
if (ret.errno)
goto cleanup;
msghdr.ctrllen = desc.ctrldone;
msghdr.flags = (desc.flags & SOCKET_RECV_FLAGS_CTRLTRUNCATED) ? MSG_CTRUNC : 0;
uintmax_t iovoffset = 0;
for (int i = 0; i < msghdr.iovcount; ++i) {
ret.errno = usercopy_touser(msghdr.iov[i].addr, (void *)((uintptr_t)buffer + iovoffset), msghdr.iov[i].len);
@@ -68,9 +87,29 @@ syscallret_t syscall_recvmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(msghdr.addr, &abisockaddr, min(sizeof(abisockaddr), msghdr.addrlen));
void *ptr;
ret.errno = usercopy_fromuser(&ptr, &umsghdr->addr, sizeof(void *));
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(ptr, &abisockaddr, min(sizeof(abisockaddr), msghdr.addrlen));
if (ret.errno)
goto cleanup;
}
if (msghdr.msgctrl) {
void *ptr;
ret.errno = usercopy_fromuser(&ptr, &umsghdr->msgctrl, sizeof(void *));
if (ret.errno)
goto cleanup;
ret.errno = usercopy_touser(ptr, msghdr.msgctrl, desc.ctrldone);
if (ret.errno)
goto cleanup;
}
ret.ret = ret.errno ? -1 : desc.donecount;
cleanup:
if (file)
fd_release(file);
kernel-src/sys/syscalls/sendmsg.c
+21 -3
View File
@@ -16,6 +16,13 @@ syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
file_t *file = NULL;
size_t buffersize = iovec_size(msghdr.iov, msghdr.iovcount);
if (buffersize == 0) {
sock_freemsghdr(&msghdr);
ret.errno = 0;
ret.ret = 0;
return ret;
}
void *buffer = vmm_map(NULL, buffersize, VMM_FLAGS_ALLOCATE, ARCH_MMU_FLAGS_READ | ARCH_MMU_FLAGS_WRITE | ARCH_MMU_FLAGS_NOEXEC, NULL);
if (buffer == NULL) {
ret.errno = ENOMEM;
@@ -51,9 +58,20 @@ syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
}
socket_t *socket = SOCKFS_SOCKET_FROM_NODE(file->vnode);
size_t sendcount;
ret.errno = socket->ops->send(socket, msghdr.addr ? &sockaddr : NULL, buffer, buffersize, fileflagstovnodeflags(file->flags) | ((flags & MSG_NOSIGNAL) ? SOCKET_SEND_FLAGS_NOSIGNAL : 0), &sendcount);
ret.ret = ret.errno ? -1 : sendcount;
sockdesc_t desc = {
.addr = msghdr.addr ? &sockaddr : NULL,
.buffer = buffer,
.count = buffersize,
.flags = fileflagstovnodeflags(file->flags) | ((flags & MSG_NOSIGNAL) ? SOCKET_SEND_FLAGS_NOSIGNAL : 0),
.donecount = 0,
.ctrl = msghdr.msgctrl,
.ctrllen = msghdr.ctrllen,
.ctrldone = 0
};
ret.errno = socket->ops->send(socket, &desc);
ret.ret = ret.errno ? -1 : desc.donecount;
cleanup:
if (file)