mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-04 04:06:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: use edge-triggered FDM handler for the client connections

Browse source
This commit is contained in:
Daniel Eklöf 2020-01-10 19:30:03 +01:00
parent 629a625422
commit 9141b8a657
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
server.c
View file

@ -152,21 +152,21 @@ fdm_client(struct fdm *fdm, int fd, int events, void *data)
return true; /* Let FDM trigger again when we have more data */
}
/* Keep filling our buffer of initialization data */
ssize_t count = recv(
fd, &client->buffer.data[client->buffer.idx], client->buffer.left, 0);
while (client->buffer.left > 0) {
/* Keep filling our buffer of initialization data */
ssize_t count = recv(
fd, &client->buffer.data[client->buffer.idx], client->buffer.left, 0);
if (count < 0) {
LOG_ERRNO("failed to read");
goto shutdown;
}
if (count < 0) {
if (errno == EAGAIN || errno == EWOULDBLOCK)
return true;
client->buffer.idx += count;
client->buffer.left -= count;
LOG_ERRNO("failed to read");
goto shutdown;
}
if (client->buffer.left > 0) {
/* Not done yet */
return true;
client->buffer.idx += count;
client->buffer.left -= count;
}
/* All initialization data received - time to instantiate a terminal! */
@ -288,7 +288,7 @@ fdm_server(struct fdm *fdm, int fd, int events, void *data)
.fd = client_fd,
};
if (!fdm_add(server->fdm, client_fd, EPOLLIN, &fdm_client, client)) {
if (!fdm_add(server->fdm, client_fd, EPOLLIN | EPOLLET, &fdm_client, client)) {
close(client_fd);
free(client);
return false;