Reduce calls to LOG() in read_from_write_to() and read_from_write_to_tls().

[tlsproxy/tlsproxy.git] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index ed1bc63c6e030c5349f9d2aa46a179c8d60bf2f9..e83bc864975403198bf792701f01e1f7f850b576 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -23,6 +23,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <limits.h>
 #include <netdb.h>
 #include <poll.h>
 #include <unistd.h>
@@ -149,14 +150,14 @@ void handle_connection(int client_socket) {
     /* Connect to proxy server or directly to server. */
     if (global_proxy_host != NULL && global_proxy_port != NULL) {
         LOG(DEBUG, "connecting to %s:%s", global_proxy_host,
-                                              global_proxy_port);
+                                          global_proxy_port);
         server_socket = connect_to_host(global_proxy_host, global_proxy_port);
     } else {
         LOG(DEBUG, "connecting to %s:%s", host, port);
         server_socket = connect_to_host(host, port);
     }
 
-    if (server_socket == -1) {
+    if (server_socket < 0) {
         LOG(WARNING, "failed to connect to server");
         send_forwarding_failure(client_fd_write);
         goto out;
@@ -240,7 +241,7 @@ void handle_connection(int client_socket) {
     result = gnutls_handshake(server_session);
     if (result != GNUTLS_E_SUCCESS) {
         LOG(WARNING, "server TLS handshake failed: %s",
-                         gnutls_strerror(result));
+                     gnutls_strerror(result));
         send_forwarding_failure(client_fd_write);
         goto out;
     }
@@ -283,7 +284,7 @@ void handle_connection(int client_socket) {
     result = gnutls_handshake(client_session);
     if (result != GNUTLS_E_SUCCESS) {
         LOG(WARNING, "client TLS handshake failed: %s",
-                         gnutls_strerror(result));
+                     gnutls_strerror(result));
         send_forwarding_failure(client_fd_write);
         goto out;
     }
@@ -367,16 +368,16 @@ static int initialize_tls_session_client(int peer_socket,
 
     if (proxy_certificate_path(hostname, path, sizeof(path)) != 0) {
         LOG(ERROR,
-            "initialize_tls_session_client(): \
-failed to get proxy certificate path");
+            "initialize_tls_session_client(): "
+            "failed to get proxy certificate path");
         return -1;
     }
 
     result = gnutls_certificate_allocate_credentials(x509_cred);
     if (result != GNUTLS_E_SUCCESS) {
         LOG(ERROR,
-            "initialize_tls_session_client(): \
-gnutls_certificate_allocate_credentials(): %s",
+            "initialize_tls_session_client(): "
+            "gnutls_certificate_allocate_credentials(): %s",
             gnutls_strerror(result));
         return -1;
     }
@@ -412,8 +413,8 @@ gnutls_certificate_allocate_credentials(): %s",
     }
     if (result != GNUTLS_E_SUCCESS) {
         LOG(ERROR,
-            "initialize_tls_session_client(): \
-can't read server certificate ('%s') or key file ('%s'): %s",
+            "initialize_tls_session_client(): "
+            "can't read server certificate ('%s') or key file ('%s'): %s",
             path, PROXY_KEY_FILE, gnutls_strerror(result));
         gnutls_certificate_free_credentials(*x509_cred);
         /* Could be a missing certificate. */
@@ -462,8 +463,8 @@ static int initialize_tls_session_server(int peer_socket,
     result = gnutls_certificate_allocate_credentials(x509_cred);
     if (result != GNUTLS_E_SUCCESS) {
         LOG(ERROR,
-            "initialize_tls_session_server(): \
-gnutls_certificate_allocate_credentials(): %s",
+            "initialize_tls_session_server(): "
+            "gnutls_certificate_allocate_credentials(): %s",
             gnutls_strerror(result));
         return -1;
     }
@@ -528,6 +529,7 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) {
     char buffer[MAX_REQUEST_LINE];
     int found_proxy_authorization;
 
+    assert(length <= INT_MAX);
     if (fgets(request, (int)length, client_fd) == NULL) {
         if (ferror(client_fd)) {
             LOG_PERROR(WARNING, "read_http_request(): fgets()");
@@ -616,6 +618,8 @@ static void transfer_data(int client, int server) {
     fds[1].events  = POLLIN | POLLPRI | POLLHUP | POLLERR;
     fds[1].revents = 0;
 
+    LOG(DEBUG, "transfer_data(): %d -> %d", client, server);
+
     for (;;) {
         int result = poll(fds, 2 /* fd count */, -1 /* no timeout */);
         if (result < 0) {
@@ -656,8 +660,6 @@ static int read_from_write_to(int from, int to) {
     ssize_t size_written;
     char buffer[4096];
 
-    LOG(DEBUG, "read_from_write_to(): %d -> %d", from, to);
-
     size_read = read(from, buffer, sizeof(buffer));
     if (size_read < 0) {
         LOG_PERROR(WARNING, "read_from_write_to(): read()");
@@ -674,7 +676,7 @@ static int read_from_write_to(int from, int to) {
     }
     if (size_read != size_written) {
         LOG(ERROR, "read_from_write_to(): only written %ld of %ld bytes!",
-                       (long int)size_written, (long int)size_read);
+                   (long int)size_written, (long int)size_read);
         return -1;
     }
 
@@ -702,7 +704,7 @@ static void transfer_data_tls(int client, int server,
         buffer_size = gnutls_record_get_max_size(server_session);
     }
     LOG(DEBUG, "transfer_data_tls(): suggested buffer size: %ld",
-                   (long int)buffer_size);
+               (long int)buffer_size);
 
     for (;;) {
         int result = poll(fds, 2 /* fd count */, -1 /* no timeout */);
@@ -748,15 +750,15 @@ static int read_from_write_to_tls(gnutls_session_t from,
     char buffer[16384];
 
     if (buffer_size > sizeof(buffer)) {
+        LOG(WARNING, "read_from_write_to_tls(): reduced buffer size to %ld",
+                     (long int)(sizeof(buffer)));
         buffer_size = sizeof(buffer);
     }
-    LOG(DEBUG, "read_from_write_to_tls(): used buffer size: %ld",
-                   (long int)buffer_size);
 
     size_read = gnutls_record_recv(from, buffer, buffer_size);
     if (size_read < 0) {
         LOG(WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s",
-                         gnutls_strerror((int)size_read));
+                     gnutls_strerror((int)size_read));
         return -1;
     /* EOF */
     } else if (size_read == 0) {
@@ -766,12 +768,12 @@ static int read_from_write_to_tls(gnutls_session_t from,
     size_written = gnutls_record_send(to, buffer, (size_t)size_read);
     if (size_written < 0) {
         LOG(WARNING, "read_from_write_to_tls(): gnutls_record_send(): %s",
-                         gnutls_strerror((int)size_written));
+                     gnutls_strerror((int)size_written));
         return -1;
     }
     if (size_read != size_written) {
         LOG(ERROR, "read_from_write_to_tls(): only written %ld of %ld bytes!",
-                       (long int)size_written, (long int)size_read);
+                   (long int)size_written, (long int)size_read);
         return -1;
     }
 
@@ -805,7 +807,7 @@ static int connect_to_host(const char *hostname, const char *port) {
             LOG_PERROR(WARNING, "connect_to_host(): getaddrinfo()");
         } else {
             LOG(WARNING, "connect_to_host(): getaddrinfo(): %s",
-                             gai_strerror(gai_return));
+                         gai_strerror(gai_return));
         }
         return -1;
     }
@@ -816,12 +818,12 @@ static int connect_to_host(const char *hostname, const char *port) {
         server_socket = socket(server->ai_family,
                                server->ai_socktype,
                                server->ai_protocol);
-        if (server_socket == -1) {
+        if (server_socket < 0) {
             LOG_PERROR(DEBUG, "connect_to_host(): socket(), trying next");
             continue;
         }
 
-        if (connect(server_socket, server->ai_addr, server->ai_addrlen) != -1) {
+        if (connect(server_socket, server->ai_addr, server->ai_addrlen) == 0) {
             break;
         }
         LOG_PERROR(DEBUG, "connect_to_host(): connect(), trying next");