summaryrefslogtreecommitdiffstats
path: root/server.c
diff options
context:
space:
mode:
authorSimon Rettberg2014-09-09 18:07:48 +0200
committerSimon Rettberg2014-09-09 18:07:48 +0200
commitbbdf2fba7b9ae0fa97aa164bcf84c1b88df38f32 (patch)
tree0bad2dc5bb0112940272b22a31f5dc4a0e8b2840 /server.c
parentBail out on startup if an AD server is not reachable (diff)
downloadldadp-bbdf2fba7b9ae0fa97aa164bcf84c1b88df38f32.tar.gz
ldadp-bbdf2fba7b9ae0fa97aa164bcf84c1b88df38f32.tar.xz
ldadp-bbdf2fba7b9ae0fa97aa164bcf84c1b88df38f32.zip
Add OpenSSL-Support (Client<->Proxy)
Diffstat (limited to 'server.c')
-rw-r--r--server.c10
1 files changed, 5 insertions, 5 deletions
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)