mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 23:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

unix sockets: a bunch of bugfixes

Browse Source
This commit is contained in:
Matheus
2022-10-24 15:31:48 -03:00
parent 88d7818c39
commit 400f9d2231
1 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/unsocket.c
+42 -21
View File
@@ -81,7 +81,7 @@ int unsocket_bind(struct _socket_t* sock, sockaddr_un* addr, socklen_t addrlen){
} }
int unsocket_connect(struct _socket_t* sock, void* addr, socklen_t addrlen){ int unsocket_connect(struct _socket_t* sock, void* addr, socklen_t addrlen, fd_t* fd){
// copy address // copy address
@@ -151,7 +151,7 @@ int unsocket_connect(struct _socket_t* sock, void* addr, socklen_t addrlen){
spinlock_release(&peer->lock); spinlock_release(&peer->lock);
spinlock_release(&sock->lock); spinlock_release(&sock->lock);
err = event_wait(&sock->acceptevent, true); err = event_wait(&sock->acceptevent, true);
spinlock_acquire(&peer->lock); spinlock_acquire(&peer->lock);
@@ -176,7 +176,7 @@ int unsocket_connect(struct _socket_t* sock, void* addr, socklen_t addrlen){
} }
int unsocket_accept(socket_t** peer, socket_t* sock, void* addr, socklen_t* addrlen){ int unsocket_accept(socket_t** peer, socket_t* sock, void* addr, socklen_t* addrlen, fd_t* fd){
// TODO abort // TODO abort
@@ -195,15 +195,20 @@ int unsocket_accept(socket_t** peer, socket_t* sock, void* addr, socklen_t* addr
} }
// TODO interruptble // TODO interruptble
while(!sock->backlogend){ while(!sock->backlogend){
if(fd->flags & O_NONBLOCK){
err = EWOULDBLOCK;
goto _return;
}
spinlock_release(&sock->lock); spinlock_release(&sock->lock);
event_wait(&sock->connectevent, true); event_wait(&sock->connectevent, true);
spinlock_acquire(&sock->lock); spinlock_acquire(&sock->lock);
} }
*peer = socket_popfrombacklog(sock); *peer = socket_popfrombacklog(sock);
spinlock_release(&sock->lock); spinlock_release(&sock->lock);
_return: _return:
@@ -212,7 +217,7 @@ int unsocket_accept(socket_t** peer, socket_t* sock, void* addr, socklen_t* addr
} }
int unsocket_send(socket_t* socket, void* buff, socklen_t len, int flags, int* error){ int unsocket_send(socket_t* socket, void* buff, size_t len, int flags, int* error, fd_t* fd){
if(flags){ // right now no flags are supported if(flags){ // right now no flags are supported
*error = EOPNOTSUPP; *error = EOPNOTSUPP;
@@ -220,6 +225,7 @@ int unsocket_send(socket_t* socket, void* buff, socklen_t len, int flags, int* e
} }
int writec = 0; int writec = 0;
*error = 0;
socket_t* peer = socket->peer; socket_t* peer = socket->peer;
@@ -235,14 +241,21 @@ int unsocket_send(socket_t* socket, void* buff, socklen_t len, int flags, int* e
arch_interrupt_disable(); arch_interrupt_disable();
writec = ringbuffer_write(&peer->buffer, buff, len); writec = ringbuffer_write(&peer->buffer, buff, len);
if(writec > 0){ if(writec > 0){
event_signal(&peer->dataevent, true); event_signal(&peer->dataevent, true);
break; break;
} }
if(fd->flags & O_NONBLOCK){
*error = EWOULDBLOCK;
break;
}
spinlock_release(&peer->lock); spinlock_release(&peer->lock);
if(event_wait(&peer->dataevent, true)){ if(event_wait(&peer->dataevent, true)){
spinlock_acquire(&peer->lock); spinlock_acquire(&peer->lock);
writec = -1; writec = -1;
@@ -253,8 +266,6 @@ int unsocket_send(socket_t* socket, void* buff, socklen_t len, int flags, int* e
} }
*error = 0;
_return: _return:
spinlock_release(&peer->lock); spinlock_release(&peer->lock);
@@ -266,7 +277,7 @@ int unsocket_send(socket_t* socket, void* buff, socklen_t len, int flags, int* e
// TODO check for broken // TODO check for broken
int unsocket_recv(socket_t* socket, void* buff, socklen_t len, int flags, int* error){ int unsocket_recv(socket_t* socket, void* buff, size_t len, int flags, int* error, fd_t* fd){
if(flags){ // right now no flags are supported if(flags){ // right now no flags are supported
*error = EOPNOTSUPP; *error = EOPNOTSUPP;
@@ -274,6 +285,8 @@ int unsocket_recv(socket_t* socket, void* buff, socklen_t len, int flags, int* e
} }
int readc = 0; int readc = 0;
*error = 0;
spinlock_acquire(&socket->lock); spinlock_acquire(&socket->lock);
@@ -285,14 +298,21 @@ int unsocket_recv(socket_t* socket, void* buff, socklen_t len, int flags, int* e
for(;;){ for(;;){
arch_interrupt_disable(); arch_interrupt_disable();
readc = ringbuffer_read(&socket->buffer, buff, len); readc = ringbuffer_read(&socket->buffer, buff, len);
arch_interrupt_enable();
if(readc > 0){ if(readc > 0){
event_signal(&socket->dataevent, true); event_signal(&socket->dataevent, true);
break; break;
} }
if(fd->flags & O_NONBLOCK){
*error = EWOULDBLOCK;
break;
}
spinlock_release(&socket->lock); spinlock_release(&socket->lock);
if(event_wait(&socket->dataevent, true)){ if(event_wait(&socket->dataevent, true)){
@@ -300,18 +320,16 @@ int unsocket_recv(socket_t* socket, void* buff, socklen_t len, int flags, int* e
readc = -1; readc = -1;
*error = EINTR; *error = EINTR;
break; break;
} }
spinlock_acquire(&socket->lock); spinlock_acquire(&socket->lock);
}
*error = 0; }
_return: _return:
spinlock_release(&socket->lock); spinlock_release(&socket->lock);
return readc; return readc;
} }
@@ -322,21 +340,24 @@ int unsocket_poll(socket_t* socket, pollfd* fd){
switch(socket->state){ switch(socket->state){
case SOCKET_STATE_LISTENING: case SOCKET_STATE_LISTENING:
if(fd->events & POLLIN && socket->backlogend) if((fd->events & POLLIN) && socket->backlogend){
fd->revents |= POLLIN; fd->revents |= POLLIN;
}
break; break;
case SOCKET_STATE_CONNECTED: case SOCKET_STATE_CONNECTED:
if(!socket->peer) if(!socket->peer)
fd->revents |= POLLHUP; fd->revents |= POLLHUP;
if(fd->events & POLLIN && socket->buffer.write != socket->buffer.read) if((fd->events & POLLIN) && socket->buffer.write != socket->buffer.read){
fd->revents |= POLLIN; fd->revents |= POLLIN;
}
if(fd->events & POLLOUT && socket->buffer.write != socket->buffer.read + socket->buffer.size) if((fd->events & POLLOUT) && socket->buffer.write != socket->buffer.read + socket->buffer.size){
fd->revents |= POLLOUT; fd->revents |= POLLOUT;
}
break; break;
default: default:
return 0; return 0;