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/io/net/tcp.c
+15 -12
View File
@@ -1239,8 +1239,8 @@ static int internalpoll(tcb_t *tcb, polldata_t* data, int events) {
}
// TODO buffer up segments instead of instantly sending them
static int tcp_send(socket_t *socket, sockaddr_t *addr, void *buffer, size_t count, uintmax_t flags, size_t *sendcount) {
if (addr)
static int tcp_send(socket_t *socket, sockdesc_t *sockdesc) {
if (sockdesc->addr)
return ENOTCONN;
tcpsocket_t *tcpsocket = (tcpsocket_t *)socket;
@@ -1272,7 +1272,7 @@ static int tcp_send(socket_t *socket, sockaddr_t *addr, void *buffer, size_t cou
poll_leave(&polldesc);
poll_destroydesc(&polldesc);
if (_cpu()->thread->proc && (flags & SOCKET_SEND_FLAGS_NOSIGNAL) == 0)
if (_cpu()->thread->proc && (sockdesc->flags & SOCKET_SEND_FLAGS_NOSIGNAL) == 0)
signal_signalproc(_cpu()->thread->proc, SIGPIPE);
error = EPIPE;
@@ -1302,11 +1302,11 @@ static int tcp_send(socket_t *socket, sockaddr_t *addr, void *buffer, size_t cou
goto leave;
}
size_t writesize = min(TCB_RINGBUFFER_SIZE - RINGBUFFER_DATACOUNT(&tcb->transmitbuffer), count);
size_t writesize = min(TCB_RINGBUFFER_SIZE - RINGBUFFER_DATACOUNT(&tcb->transmitbuffer), sockdesc->count);
__assert(writesize);
__assert(ringbuffer_write(&tcb->transmitbuffer, buffer, writesize) == writesize);
*sendcount = writesize;
__assert(ringbuffer_write(&tcb->transmitbuffer, sockdesc->buffer, writesize) == writesize);
sockdesc->donecount = writesize;
if (tcb->sndnext == tcb->sndunack)
error = tcp_transmitnextsegment(tcb);
@@ -1317,9 +1317,12 @@ static int tcp_send(socket_t *socket, sockaddr_t *addr, void *buffer, size_t cou
return error;
}
static int tcp_recv(socket_t *socket, sockaddr_t *addr, void *buffer, size_t count, uintmax_t flags, size_t *recvcount) {
static int tcp_recv(socket_t *socket, sockdesc_t *sockdesc) {
tcpsocket_t *tcpsocket = (tcpsocket_t *)socket;
uintmax_t flags = sockdesc->flags;
sockdesc->flags = 0;
int error = 0;
MUTEX_ACQUIRE(&socket->mutex, false);
tcb_t *tcb = tcpsocket->tcb;
if (tcb == NULL) {
@@ -1347,7 +1350,7 @@ static int tcp_recv(socket_t *socket, sockaddr_t *addr, void *buffer, size_t cou
if (revents) {
if ((revents & POLLHUP) == 0 && (flags & SOCKET_RECV_FLAGS_WAITALL) &&
(flags & SOCKET_RECV_FLAGS_PEEK) == 0 && RINGBUFFER_DATACOUNT(&tcb->receivebuffer) < count) {
(flags & SOCKET_RECV_FLAGS_PEEK) == 0 && RINGBUFFER_DATACOUNT(&tcb->receivebuffer) < sockdesc->count) {
// wait for more data (WAITALL is set)
poll_add(&socket->pollheader, &desc.data[0], POLLIN);
} else {
@@ -1376,16 +1379,16 @@ static int tcp_recv(socket_t *socket, sockaddr_t *addr, void *buffer, size_t cou
goto cleanup;
}
size_t copycount = min(RINGBUFFER_DATACOUNT(&tcb->receivebuffer), count);
size_t copycount = min(RINGBUFFER_DATACOUNT(&tcb->receivebuffer), sockdesc->count);
if (flags & SOCKET_RECV_FLAGS_PEEK) {
__assert(ringbuffer_peek(&tcb->receivebuffer, buffer, 0, copycount) == copycount);
__assert(ringbuffer_peek(&tcb->receivebuffer, sockdesc->buffer, 0, copycount) == copycount);
} else {
__assert(ringbuffer_read(&tcb->receivebuffer, buffer, copycount) == copycount);
__assert(ringbuffer_read(&tcb->receivebuffer, sockdesc->buffer, copycount) == copycount);
tcb->rcvwindow += copycount;
// notify about the window increase
tcp_ack(tcb);
}
*recvcount = copycount;
sockdesc->donecount = copycount;
cleanup:
MUTEX_RELEASE(&tcb->mutex);
kernel-src/io/net/udp.c
+18 -14
View File
@@ -180,17 +180,17 @@ static int internalpoll(socket_t *socket, polldata_t *data, int events) {
return revents;
}
static int udp_send(socket_t *socket, sockaddr_t *addr, void *buffer, size_t count, uintmax_t flags, size_t *sendcount) {
static int udp_send(socket_t *socket, sockdesc_t *sockdesc) {
udpsocket_t *udpsocket = (udpsocket_t *)socket;
int e;
MUTEX_ACQUIRE(&socket->mutex, false);
if (addr == NULL && socket->state != SOCKET_STATE_CONNECTED) {
if (sockdesc->addr == NULL && socket->state != SOCKET_STATE_CONNECTED) {
e = ENOTCONN;
goto cleanup;
}
if ((addr ? addr->ipv4addr.addr : udpsocket->peeraddress) == IPV4_BROADCAST_ADDRESS && (udpsocket->socket.broadcast == 0 || udpsocket->socket.netdev == NULL)) {
if ((sockdesc->addr ? sockdesc->addr->ipv4addr.addr : udpsocket->peeraddress) == IPV4_BROADCAST_ADDRESS && (udpsocket->socket.broadcast == 0 || udpsocket->socket.netdev == NULL)) {
e = EACCES;
goto cleanup;
}
@@ -203,16 +203,20 @@ static int udp_send(socket_t *socket, sockaddr_t *addr, void *buffer, size_t cou
socket->state = SOCKET_STATE_BOUND;
}
e = udp_sendpacket(buffer, count, addr ? addr->ipv4addr.addr : udpsocket->peeraddress, udpsocket->port, addr ? addr->ipv4addr.port : udpsocket->peerport, udpsocket->socket.netdev);
e = udp_sendpacket(sockdesc->buffer, sockdesc->count, sockdesc->addr ? sockdesc->addr->ipv4addr.addr : udpsocket->peeraddress,
udpsocket->port, sockdesc->addr ? sockdesc->addr->ipv4addr.port : udpsocket->peerport, udpsocket->socket.netdev);
*sendcount = count;
sockdesc->donecount = sockdesc->count;
cleanup:
MUTEX_RELEASE(&socket->mutex);
return e;
}
static int udp_recv(socket_t *socket, sockaddr_t *addr, void *buffer, size_t count, uintmax_t flags, size_t *recvcount) {
static int udp_recv(socket_t *socket, sockdesc_t *sockdesc) {
udpsocket_t *udpsocket = (udpsocket_t *)socket;
uintmax_t flags = sockdesc->flags;
sockdesc->flags = 0;
int e = 0;
MUTEX_ACQUIRE(&socket->mutex, false);
@@ -262,25 +266,25 @@ static int udp_recv(socket_t *socket, sockaddr_t *addr, void *buffer, size_t cou
dataheader_t header;
if (flags & SOCKET_RECV_FLAGS_PEEK) {
__assert(ringbuffer_peek(&udpsocket->ringbuffer, &header, 0, sizeof(header)) == sizeof(header));
copycount = min(header.length, count);
copycount = min(header.length, sockdesc->count);
__assert(ringbuffer_peek(&udpsocket->ringbuffer, &buffer, sizeof(header), copycount) == copycount);
__assert(ringbuffer_peek(&udpsocket->ringbuffer, sockdesc->buffer, sizeof(header), copycount) == copycount);
} else {
__assert(ringbuffer_read(&udpsocket->ringbuffer, &header, sizeof(header)) == sizeof(header));
copycount = min(header.length, count);
__assert(ringbuffer_read(&udpsocket->ringbuffer, buffer, copycount) == copycount);
copycount = min(header.length, sockdesc->count);
__assert(ringbuffer_read(&udpsocket->ringbuffer, sockdesc->buffer, copycount) == copycount);
// truncate the rest if the buffer wasn't big enough to handle everything
if (header.length > count)
if (header.length > sockdesc->count)
ringbuffer_truncate(&udpsocket->ringbuffer, header.length - copycount);
}
spinlock_release(&udpsocket->ringbufferlock);
interrupt_set(intstate);
*recvcount = copycount;
addr->ipv4addr.addr = header.peer;
addr->ipv4addr.port = header.srcport;
sockdesc->donecount = copycount;
sockdesc->addr->ipv4addr.addr = header.peer;
sockdesc->addr->ipv4addr.port = header.srcport;
cleanup:
MUTEX_RELEASE(&socket->mutex);