From bbdf2fba7b9ae0fa97aa164bcf84c1b88df38f32 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Tue, 9 Sep 2014 18:07:48 +0200 Subject: Add OpenSSL-Support (Client<->Proxy) --- server.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'server.c') diff --git a/server.c b/server.c index aeb9d12..39f8dce 100644 --- a/server.c +++ b/server.c @@ -254,7 +254,7 @@ static void server_callback(void *data, int haveIn, int haveOut, int doCleanup) len += consumed; if (len > server->rbPos) break; // Body not complete printf("[AD] Received complete reply...\n"); - if (proxy_fromServer(server, len) == -1) { + if (!proxy_fromServer(server, len)) { if (server->dynamic) { server_free(server); return; @@ -276,17 +276,17 @@ static void server_callback(void *data, int haveIn, int haveOut, int doCleanup) if (haveOut) server_flush(server); } -int server_send(epoll_server_t *server, const char *buffer, size_t len, const BOOL cork) +BOOL server_send(epoll_server_t *server, const char *buffer, size_t len, const BOOL cork) { if (server->sbFill == 0 && !cork) { // Nothing in send buffer, fire away const int ret = write(server->fd, buffer, len); if (ret == 0 || (ret < 0 && errno != EINTR && errno != EAGAIN)) { printf("Server gone when trying to send.\n"); - return -1; + return FALSE; } server->lastActive = time(NULL); - if (ret == (int)len) return 0; + if (ret == (int)len) return TRUE; // Couldn't send everything, continue with buffering logic below if (ret > 0) { printf("[AD] Partial send (%d of %d)\n", ret, (int)len); @@ -300,7 +300,7 @@ int server_send(epoll_server_t *server, const char *buffer, size_t len, const BO memcpy(server->sendBuffer + server->sbFill, buffer, len); server->sbFill += len; if (!cork) server_flush(server); - return 0; + return TRUE; } static void server_flush(epoll_server_t * const server) -- cgit v1.2.3-55-g7522