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

sock: MSG_PEEK and other fixes

Browse Source
This commit is contained in:
Matheus
2024-06-03 21:53:46 -03:00
parent 7d95b6e00d
commit 40d8a05062
9 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/io/net/localsocket.c
+12 -6
View File
@@ -211,6 +211,9 @@ static int localsock_send(socket_t *socket, sockaddr_t *addr, void *buffer, size
localsocket_t *peer = pair->client == localsocket ? pair->server : pair->client;
if (peer == NULL) {
if (_cpu()->thread->proc)
signal_signalproc(_cpu()->thread->proc, SIGPIPE);
error = EPIPE;
goto leave;
}
@@ -277,12 +280,15 @@ static int localsock_recv(socket_t *socket, sockaddr_t *addr, void *buffer, size
goto leave;
}
*recvcount = ringbuffer_read(&localsocket->ringbuffer, buffer, count);
localsocket_t *peer = pair->client == localsocket ? pair->server : pair->client;
// signal that there is space to write for any threads blocked on this socket
if (peer && *recvcount)
poll_event(&peer->socket.pollheader, POLLOUT);
if (flags & SOCKET_RECV_FLAGS_PEEK) {
*recvcount = ringbuffer_peek(&localsocket->ringbuffer, buffer, 0, count);
} else {
*recvcount = ringbuffer_read(&localsocket->ringbuffer, buffer, count);
localsocket_t *peer = pair->client == localsocket ? pair->server : pair->client;
// signal that there is space to write for any threads blocked on this socket
if (peer && *recvcount)
poll_event(&peer->socket.pollheader, POLLOUT);
}
leave:
if (pair)
kernel-src/io/net/udp.c
+14 -7
View File
@@ -120,7 +120,7 @@ void udp_process(netdev_t *netdev, void *buffer, uint32_t peer) {
if (freespace >= needed) {
__assert(ringbuffer_write(&socket->ringbuffer, &header, sizeof(header)) == sizeof(header));
__assert(ringbuffer_write(&socket->ringbuffer, writebuffer, header.length) == header.length);
poll_event(&socket->socket.pollheader, POLLOUT);
poll_event(&socket->socket.pollheader, POLLIN);
}
spinlock_release(&socket->ringbufferlock);
__atomic_sub_fetch(&socket->packetsprocessing, 1, __ATOMIC_SEQ_CST);
@@ -250,16 +250,23 @@ static int udp_recv(socket_t *socket, sockaddr_t *addr, void *buffer, size_t cou
bool intstate = interrupt_set(false);
spinlock_acquire(&udpsocket->ringbufferlock);
size_t copycount;
dataheader_t header;
__assert(ringbuffer_read(&udpsocket->ringbuffer, &header, sizeof(header)) == sizeof(header));
if (flags & SOCKET_RECV_FLAGS_PEEK) {
__assert(ringbuffer_peek(&udpsocket->ringbuffer, &header, 0, sizeof(header)) == sizeof(header));
copycount = min(header.length, count);
size_t copycount = min(header.length, count);
__assert(ringbuffer_read(&udpsocket->ringbuffer, buffer, copycount) == copycount);
__assert(ringbuffer_peek(&udpsocket->ringbuffer, &buffer, sizeof(header), copycount) == copycount);
} else {
__assert(ringbuffer_read(&udpsocket->ringbuffer, &header, sizeof(header)) == sizeof(header));
// truncate the rest if the buffer wasn't big enough to handle everything
if (header.length > count)
ringbuffer_truncate(&udpsocket->ringbuffer, header.length - copycount);
copycount = min(header.length, count);
__assert(ringbuffer_read(&udpsocket->ringbuffer, buffer, copycount) == copycount);
// truncate the rest if the buffer wasn't big enough to handle everything
if (header.length > count)
ringbuffer_truncate(&udpsocket->ringbuffer, header.length - copycount);
}
spinlock_release(&udpsocket->ringbufferlock);
interrupt_set(intstate);