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

localsocket: properly handle shutdown

Browse Source
This commit is contained in:
Matheus
2026-07-07 14:38:40 -03:00
parent c05163f191
commit 5ea6c5423f
1 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/io/net/localsocket.c
+39 -7
View File
@@ -151,11 +151,11 @@ static int datapoll(localsocket_t *local, localsocket_t *peer, int events) {
int revents = 0; int revents = 0;
// data to read? // data to read?
if ((events & POLLIN) && (RINGBUFFER_DATACOUNT(&local->ringbuffer) || (peer->socket.shutdown & SOCKET_SHUTDOWN_WRITE))) if ((events & POLLIN) && (RINGBUFFER_DATACOUNT(&local->ringbuffer) || (local->socket.shutdown & SOCKET_SHUTDOWN_READ) || (peer->socket.shutdown & SOCKET_SHUTDOWN_WRITE)))
revents |= POLLIN; revents |= POLLIN;
// XXX is this the correct behaviour? // XXX is this the correct behaviour?
if ((events & POLLOUT) && (peer->socket.shutdown & SOCKET_SHUTDOWN_READ)) if ((events & POLLOUT) && ((local->socket.shutdown & SOCKET_SHUTDOWN_WRITE) || (peer->socket.shutdown & SOCKET_SHUTDOWN_READ)))
revents |= POLLHUP; revents |= POLLHUP;
// space to write? // space to write?
@@ -167,6 +167,10 @@ static int datapoll(localsocket_t *local, localsocket_t *peer, int events) {
static int listeningpoll(localsocket_t *localsocket, int events) { static int listeningpoll(localsocket_t *localsocket, int events) {
int revents = 0; int revents = 0;
if (localsocket->socket.shutdown & SOCKET_SHUTDOWN_READ)
return POLLHUP | (events & POLLIN);
// can insert into backlog? // can insert into backlog?
if (backlog_has_space(localsocket)) if (backlog_has_space(localsocket))
revents |= (events & POLLOUT) ? POLLOUT : 0; revents |= (events & POLLOUT) ? POLLOUT : 0;
@@ -675,6 +679,11 @@ static int localsock_accept(socket_t *_server, socket_t *_clientconnection, sock
poll_leave(&desc); poll_leave(&desc);
poll_destroydesc(&desc); poll_destroydesc(&desc);
if (!backlog_has_data(server)) {
error = EINVAL;
goto leave;
}
pair = popbacklog(server); pair = popbacklog(server);
MUTEX_ACQUIRE(&pair->mutex); MUTEX_ACQUIRE(&pair->mutex);
if (pair->client == NULL) { if (pair->client == NULL) {
@@ -798,7 +807,7 @@ static int localsock_connect(socket_t *socket, sockaddr_t *addr, uintmax_t flags
// and if the server has not closed the socket and is listening // and if the server has not closed the socket and is listening
MUTEX_ACQUIRE(&binding->mutex); MUTEX_ACQUIRE(&binding->mutex);
localsocket_t *server = binding->server; localsocket_t *server = binding->server;
if (server == NULL || server->listening == false) { if (server == NULL || server->listening == false || (server->socket.shutdown & SOCKET_SHUTDOWN_READ)) {
error = ECONNREFUSED; error = ECONNREFUSED;
goto leave; goto leave;
} }
@@ -822,6 +831,10 @@ static int localsock_connect(socket_t *socket, sockaddr_t *addr, uintmax_t flags
if (revents) { if (revents) {
poll_leave(&desc); poll_leave(&desc);
poll_destroydesc(&desc); poll_destroydesc(&desc);
if (revents & POLLHUP) {
error = ECONNREFUSED;
goto leave;
}
break; break;
} }
@@ -852,7 +865,7 @@ static int localsock_connect(socket_t *socket, sockaddr_t *addr, uintmax_t flags
MUTEX_ACQUIRE(&binding->mutex); MUTEX_ACQUIRE(&binding->mutex);
server = binding->server; server = binding->server;
if (server == NULL || server->listening == false) { if (server == NULL || server->listening == false || (server->socket.shutdown & SOCKET_SHUTDOWN_READ)) {
// server closed while we waited! // server closed while we waited!
// release the vnode so it can get deleted and set the binding to NULL as we can't be sure on its state anymore. // release the vnode so it can get deleted and set the binding to NULL as we can't be sure on its state anymore.
MUTEX_RELEASE(&binding->mutex); MUTEX_RELEASE(&binding->mutex);
@@ -1217,8 +1230,17 @@ static int localsock_shutdown(socket_t *socket, int how) {
localsocket_t *localsocket = (localsocket_t *)socket; localsocket_t *localsocket = (localsocket_t *)socket;
MUTEX_ACQUIRE(&socket->mutex); MUTEX_ACQUIRE(&socket->mutex);
int error; int error;
localpair_t *pair = localsocket->pair; localpair_t *pair = localsocket->pair;
if (localsocket->listening) {
socket->shutdown |= how;
if (how & SOCKET_SHUTDOWN_READ)
poll_event(&socket->pollheader, POLLHUP | POLLIN);
error = 0;
goto leave;
}
// socket not connected // socket not connected
if (pair == NULL) { if (pair == NULL) {
error = ENOTCONN; error = ENOTCONN;
@@ -1232,17 +1254,27 @@ static int localsock_shutdown(socket_t *socket, int how) {
socket->shutdown |= how; socket->shutdown |= how;
int poll_events = 0; int poll_events = 0;
int this_events = 0;
// XXX is this the correct behaviour? // XXX is this the correct behaviour?
if (how & SOCKET_SHUTDOWN_READ) if (how & SOCKET_SHUTDOWN_READ) {
poll_events |= POLLHUP; poll_events |= POLLHUP;
this_events |= POLLIN;
}
if (how & SOCKET_SHUTDOWN_WRITE) if (how & SOCKET_SHUTDOWN_WRITE) {
poll_events |= POLLIN; poll_events |= POLLIN;
this_events |= POLLOUT;
}
if (how == SOCKET_SHUTDOWN_RW)
this_events |= POLLHUP;
if (peer) if (peer)
poll_event(&peer->socket.pollheader, poll_events); poll_event(&peer->socket.pollheader, poll_events);
poll_event(&socket->pollheader, this_events);
error = 0; error = 0;
leave: leave: