From 5e07e46fade9081b0271ef0e786c1b041123a809 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Thu, 24 Oct 2019 17:37:01 -0400 Subject: Unset non-blocking on clients I figure I'll actually use POLLOUT on clients so should never have issues. --- client.c | 1 - listen.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/client.c b/client.c index bb1704f..5970bf2 100644 --- a/client.c +++ b/client.c @@ -71,7 +71,6 @@ void clientSend(struct Client *client, const char *ptr, size_t len) { if (verbose) fprintf(stderr, "\x1B[34m%.*s\x1B[m", (int)len, ptr); while (len) { ssize_t ret = tls_write(client->tls, ptr, len); - // FIXME: Handle non-blocking? if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) continue; if (ret < 0) { warnx("tls_write: %s", tls_error(client->tls)); diff --git a/listen.c b/listen.c index 2d83462..1179a8b 100644 --- a/listen.c +++ b/listen.c @@ -15,7 +15,6 @@ */ #include -#include #include #include #include @@ -81,7 +80,6 @@ size_t listenBind(int fds[], size_t cap, const char *host, const char *port) { int listenAccept(struct tls **client, int fd) { int sock = accept(fd, NULL, NULL); if (sock < 0) err(EX_IOERR, "accept"); - fcntl(sock, F_SETFL, O_NONBLOCK); int yes = 1; int error = setsockopt(sock, SOL_SOCKET, SO_NOSIGPIPE, &yes, sizeof(yes)); -- cgit 1.4.1