src/: Prefix all global variables with global_.

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

diff --git a/src/connection.c b/src/connection.c
index 418c424c03e3d3f362cc7f9d9b22ac466951689c..290227ec26c906f2243ffb771fac4727ef4c54e4 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -97,8 +97,8 @@ void handle_connection(int client_socket) {
 #endif
 
     /* Connect to proxy server or directly to server. */
-    if (NULL != use_proxy_host && NULL != use_proxy_port) {
-        server_socket = connect_to_host(use_proxy_host, use_proxy_port);
+    if (NULL != global_proxy_host && NULL != global_proxy_port) {
+        server_socket = connect_to_host(global_proxy_host, global_proxy_port);
     } else {
         server_socket = connect_to_host(host, port);
     }
@@ -110,11 +110,12 @@ void handle_connection(int client_socket) {
     server_fd = fdopen(server_socket, "a+");
     if (NULL == server_fd) {
         send_close_forwarding_failure(client_fd);
+        close(server_socket);
         return;
     }
 
     /* Connect to proxy if requested (command line option). */
-    if (NULL != use_proxy_host && NULL != use_proxy_port) {
+    if (NULL != global_proxy_host && NULL != global_proxy_port) {
         fprintf(server_fd, "CONNECT %s:%s HTTP/1.0\r\n", host, port);
         fprintf(server_fd, "\r\n");
 
@@ -270,8 +271,8 @@ static int read_from_write_to(int from, int to) {
         return -1;
     }
     if (size_read != size_written) {
-        printf("only written %ld of %ld bytes!\n", (long int)size_read,
-                                                   (long int)size_written);
+        printf("only written %ld of %ld bytes!\n", (long int)size_written,
+                                                   (long int)size_read);
         return -1;
     }