aiden/bidirectiond
1
1
Fork 0
Code Issues 13 Projects Releases 3 Wiki Activity

removed EINTR checks

Browse Source
This commit is contained in:
aiden 2022-06-11 23:52:24 +01:00
parent 9b29843391
commit d0fd8a98d2
No known key found for this signature in database
GPG Key ID: 0D87FF3415416DB1
2 changed files with 20 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/accept.c
View File

@ -278,9 +278,7 @@ void bdd_accept(struct bdd_worker_data *worker_data) {
// accept
BDD_DEBUG_LOG("accepting tcp connection\n");
do {
fd = accept(worker_data->serve_fd, NULL, NULL);
} while (fd < 0 && errno == EINTR);
fd = accept(worker_data->serve_fd, NULL, NULL);
if (fd < 0) {
BDD_DEBUG_LOG("rejected tcp connection\n");
goto err;

56
core/src/io.c
View File

@ -215,16 +215,11 @@ __attribute__((warn_unused_result)) ssize_t bdd_io_read(
}
ssize_t r;
recv:;
if (io->ssl) {
r = SSL_read(io->io.ssl, buf, sz);
if (r <= 0) {
int err = SSL_get_error(io->io.ssl, r);
if (err == SSL_ERROR_SYSCALL) {
if (errno == EINTR) {
goto recv;
}
} else if (err == SSL_ERROR_WANT_WRITE) {
if (err == SSL_ERROR_WANT_WRITE) {
abort(); // fuck re-negotiation
} else if (err == SSL_ERROR_ZERO_RETURN /* received close_notify */) {
if (bdd_io_hup(io, true)) {
@ -247,9 +242,6 @@ __attribute__((warn_unused_result)) ssize_t bdd_io_read(
} else {
r = recv(io->io.fd, buf, sz, 0);
if (r < 0) {
if (errno == EINTR) {
goto recv;
}
if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0;
}
@ -288,16 +280,11 @@ __attribute__((warn_unused_result)) ssize_t bdd_io_write(
}
ssize_t r;
send:;
if (io->ssl) {
r = SSL_write(io->io.ssl, buf, sz);
if (r <= 0) {
int err = SSL_get_error(io->io.ssl, r);
if (err == SSL_ERROR_SYSCALL) {
if (errno == EINTR) {
goto send;
}
} else if (err == SSL_ERROR_WANT_READ) {
if (err == SSL_ERROR_WANT_READ) {
abort(); // fuck re-negotiation
} else if (err == SSL_ERROR_WANT_WRITE) {
r = 0;
@ -314,9 +301,6 @@ __attribute__((warn_unused_result)) ssize_t bdd_io_write(
} else {
r = send(io->io.fd, buf, sz, 0);
if (r < 0) {
if (errno == EINTR) {
goto send;
}
if (errno == EAGAIN || errno == EWOULDBLOCK) {
r = 0;
goto want_send;
@ -509,27 +493,25 @@ enum bdd_cont bdd_io_connect(
} else {
io->io.fd = fd;
}
do {
if (connect(fd, sockaddr, addrlen) == 0) {
switch (bdd_connect_continue(io)) {
case (bdd_cont_discard): {
goto err;
}
case (bdd_cont_inprogress): {
bdd_io_state(io, bdd_io_connecting);
return bdd_cont_inprogress;
}
case (bdd_cont_established): {
bdd_io_state(io, bdd_io_est);
return bdd_cont_established;
}
if (connect(fd, sockaddr, addrlen) == 0) {
switch (bdd_connect_continue(io)) {
case (bdd_cont_discard): {
goto err;
}
case (bdd_cont_inprogress): {
bdd_io_state(io, bdd_io_connecting);
return bdd_cont_inprogress;
}
case (bdd_cont_established): {
bdd_io_state(io, bdd_io_est);
return bdd_cont_established;
}
}
if (errno == EINPROGRESS) {
bdd_io_state(io, bdd_io_connecting);
return bdd_cont_inprogress;
}
} while (errno == EINTR);
}
if (errno == EINPROGRESS) {
bdd_io_state(io, bdd_io_connecting);
return bdd_cont_inprogress;
}
err:;
bdd_io_discard(io);