mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-29 05:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

socket: fix close shutdown properly

Browse Source
This commit is contained in:
Matheus
2026-07-07 16:49:21 -03:00
parent 196698c059
commit f46d85fe6d
15 changed files with 103 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/sys/syscalls/sendmsg.c
+11 -16
View File
@@ -6,7 +6,9 @@
#include <kernel/alloc.h>
syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags) {
syscallret_t ret;
syscallret_t ret = {
.ret = -1
};
if (flags & ~(MSG_DONTWAIT | MSG_NOSIGNAL))
printf("sendmsg: unknown %x\n", flags);
@@ -16,7 +18,6 @@ syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
if (ret.errno)
return ret;
file_t *file = NULL;
size_t buffersize = iovec_size(msghdr.iov, msghdr.iovcount);
if (buffersize == 0) {
sock_freemsghdr(&msghdr);
@@ -31,16 +32,11 @@ syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
return ret;
}
file = fd_get(fd);
if (file == NULL) {
ret.errno = EBADF;
goto cleanup;
}
if (file->vnode->type != V_TYPE_SOCKET) {
ret.errno = ENOTSOCK;
vnode_t *vnode = NULL;
int fileflags;
ret.errno = sockfd_get(fd, &vnode, &fileflags);
if (ret.errno)
goto cleanup;
}
sockaddr_t sockaddr;
if (msghdr.addr) {
@@ -49,7 +45,7 @@ syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
goto cleanup;
}
socket_t *socket = SOCKFS_SOCKET_FROM_NODE(file->vnode);
socket_t *socket = SOCKFS_SOCKET_FROM_NODE(vnode);
int sendflags = 0;
@@ -64,7 +60,7 @@ syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
.addr = msghdr.addr ? &sockaddr : NULL,
.iovec_iterator = &iovec_iterator,
.count = buffersize,
.flags = fileflagstovnodeflags(file->flags) | sendflags,
.flags = fileflagstovnodeflags(fileflags) | sendflags,
.donecount = 0,
.ctrl = msghdr.msgctrl,
.ctrllen = msghdr.ctrllen,
@@ -77,9 +73,8 @@ syscallret_t syscall_sendmsg(context_t *, int fd, msghdr_t *umsghdr, int flags)
ret.ret = ret.errno ? -1 : desc.donecount;
cleanup:
if (file)
fd_release(file);
if (vnode)
VOP_RELEASE(vnode);
sock_freemsghdr(&msghdr);
return ret;
}