aniani/gmnisrv
1
0
Fork 1
mirror of https://git.sr.ht/~sircmpwn/gmnisrv synced 2024-12-04 14:46:42 -05:00
Code

Use O_NONBLOCK for client file descriptors

Browse Source
This commit is contained in:
Drew DeVault 2020-09-26 10:53:22 -04:00
parent fa69887e52
commit 5388725d41
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/server.c
View File

@ -1,6 +1,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <signal.h> #include <signal.h>
#include <stdbool.h> #include <stdbool.h>
@ -110,7 +111,15 @@ accept_client(struct gmnisrv_server *server, int fd)
int sockfd = accept(fd, &addr, &addrlen); int sockfd = accept(fd, &addr, &addrlen);
if (sockfd == -1) { if (sockfd == -1) {
fprintf(stderr, "<serv>\taccept error: %s\n", strerror(errno)); server_error("accept error: %s", strerror(errno));
return;
}
int flags = fcntl(fd, F_GETFL);
int r = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
if (r == -1) {
close(sockfd);
server_error("error setting O_NONBLOCK on client fd: %s", strerror(errno));
return; return;
} }
@ -158,7 +167,6 @@ disconnect_client(struct gmnisrv_server *server, struct gmnisrv_client *client)
static int static int
client_init_ssl(struct gmnisrv_server *server, struct gmnisrv_client *client) client_init_ssl(struct gmnisrv_server *server, struct gmnisrv_client *client)
{ {
// TODO: Re-work this to use a non-blocking bio
client->ssl = gmnisrv_tls_get_ssl(server->conf, client->sockfd); client->ssl = gmnisrv_tls_get_ssl(server->conf, client->sockfd);
if (!client->ssl) { if (!client->ssl) {
client_error(&client->addr, client_error(&client->addr,
@ -170,6 +178,9 @@ client_init_ssl(struct gmnisrv_server *server, struct gmnisrv_client *client)
int r = SSL_accept(client->ssl); int r = SSL_accept(client->ssl);
if (r != 1) { if (r != 1) {
r = SSL_get_error(client->ssl, r); r = SSL_get_error(client->ssl, r);
if (r == SSL_ERROR_WANT_READ || r == SSL_ERROR_WANT_WRITE) {
return 1;
}
client_error(&client->addr, "SSL accept error %s, disconnecting", client_error(&client->addr, "SSL accept error %s, disconnecting",
ERR_error_string(r, NULL)); ERR_error_string(r, NULL));
disconnect_client(server, client); disconnect_client(server, client);