From f3ca90e517a9ae54e831e5a5b91fcc2afb9df5bf Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Tue, 6 Aug 2013 04:21:22 +0200 Subject: [PATCH] Rename DEBUG log level to DEBUG1. Log level DEBUG conflicts with --enable-debug's DEBUG. --- src/connection.c | 46 +++++++++++++++++++++++----------------------- src/log.c | 2 +- src/log.h | 4 ++-- src/tlsproxy.c | 4 ++-- src/verify.c | 10 +++++----- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/connection.c b/src/connection.c index e83bc86..170302c 100644 --- a/src/connection.c +++ b/src/connection.c @@ -106,7 +106,7 @@ void handle_connection(int client_socket) { * certificate. */ int validation_failed; - LOG(DEBUG, "new connection"); + LOG(DEBUG1, "new connection"); server_socket = -1; client_fd_read = NULL; @@ -134,7 +134,7 @@ void handle_connection(int client_socket) { send_bad_request(client_fd_write); goto out; } else if (result == -3) { - LOG(DEBUG, "read_http_request(): proxy authentication failed"); + LOG(DEBUG1, "read_http_request(): proxy authentication failed"); send_authentication_required(client_fd_write); goto out; } @@ -145,15 +145,15 @@ void handle_connection(int client_socket) { goto out; } - LOG(DEBUG, "target: %s:%s (HTTP 1.%d)", host, port, version_minor); + LOG(DEBUG1, "target: %s:%s (HTTP 1.%d)", host, port, version_minor); /* 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); + LOG(DEBUG1, "connecting to %s:%s", global_proxy_host, + global_proxy_port); server_socket = connect_to_host(global_proxy_host, global_proxy_port); } else { - LOG(DEBUG, "connecting to %s:%s", host, port); + LOG(DEBUG1, "connecting to %s:%s", host, port); server_socket = connect_to_host(host, port); } @@ -194,7 +194,7 @@ void handle_connection(int client_socket) { } } - LOG(DEBUG, "connection to server established"); + LOG(DEBUG1, "connection to server established"); /* If the -u option is used and we don't know this hostname's server * certificate then just pass through the connection and let the client @@ -209,13 +209,13 @@ void handle_connection(int client_socket) { fprintf(client_fd_write, "\r\n"); fflush(client_fd_write); - LOG(DEBUG, "transferring data"); + LOG(DEBUG1, "transferring data"); /* Proxy data between client and server until one side is done * (EOF or error). */ transfer_data(client_socket, server_socket); - LOG(DEBUG, "finished transferring data"); + LOG(DEBUG1, "finished transferring data"); goto out; } @@ -235,7 +235,7 @@ void handle_connection(int client_socket) { } server_session_init = 1; - LOG(DEBUG, "starting server TLS handshake"); + LOG(DEBUG1, "starting server TLS handshake"); /* Try to establish TLS handshake between us and server. */ result = gnutls_handshake(server_session); @@ -247,7 +247,7 @@ void handle_connection(int client_socket) { } server_session_started = 1; - LOG(DEBUG, "server TLS handshake finished"); + LOG(DEBUG1, "server TLS handshake finished"); /* Make sure the server certificate is valid and known. */ if (verify_tls_connection(server_session, host) != 0) { @@ -278,7 +278,7 @@ void handle_connection(int client_socket) { fprintf(client_fd_write, "\r\n"); fflush(client_fd_write); - LOG(DEBUG, "starting client TLS handshake"); + LOG(DEBUG1, "starting client TLS handshake"); /* Try to establish TLS handshake between client and us. */ result = gnutls_handshake(client_session); @@ -290,7 +290,7 @@ void handle_connection(int client_socket) { } client_session_started = 1; - LOG(DEBUG, "client TLS handshake finished"); + LOG(DEBUG1, "client TLS handshake finished"); /* Tell the client that the verification failed. Shouldn't be necessary as * the client should terminate the connection because he received the @@ -300,14 +300,14 @@ void handle_connection(int client_socket) { goto out; } - LOG(DEBUG, "transferring TLS data"); + LOG(DEBUG1, "transferring TLS data"); /* Proxy data between client and server until one side is done (EOF or * error). */ transfer_data_tls(client_socket, server_socket, client_session, server_session); - LOG(DEBUG, "finished transferring TLS data"); + LOG(DEBUG1, "finished transferring TLS data"); out: /* Close TLS sessions if necessary. Use GNUTLS_SHUT_RDWR so the data is @@ -338,7 +338,7 @@ out: } else if (server_socket != -1) { close(server_socket); } - LOG(DEBUG, "connection to server closed"); + LOG(DEBUG1, "connection to server closed"); /* Close connection to client. */ if (client_fd_read != NULL) { if (client_fd_write != NULL) { @@ -348,9 +348,9 @@ out: } else { close(client_socket); } - LOG(DEBUG, "connection to client closed"); + LOG(DEBUG1, "connection to client closed"); - LOG(DEBUG, "connection finished"); + LOG(DEBUG1, "connection finished"); } @@ -618,7 +618,7 @@ 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); + LOG(DEBUG1, "transfer_data(): %d -> %d", client, server); for (;;) { int result = poll(fds, 2 /* fd count */, -1 /* no timeout */); @@ -703,8 +703,8 @@ static void transfer_data_tls(int client, int server, if (gnutls_record_get_max_size(server_session) < buffer_size) { buffer_size = gnutls_record_get_max_size(server_session); } - LOG(DEBUG, "transfer_data_tls(): suggested buffer size: %ld", - (long int)buffer_size); + LOG(DEBUG1, "transfer_data_tls(): suggested buffer size: %ld", + (long int)buffer_size); for (;;) { int result = poll(fds, 2 /* fd count */, -1 /* no timeout */); @@ -819,14 +819,14 @@ static int connect_to_host(const char *hostname, const char *port) { server->ai_socktype, server->ai_protocol); if (server_socket < 0) { - LOG_PERROR(DEBUG, "connect_to_host(): socket(), trying next"); + LOG_PERROR(DEBUG1, "connect_to_host(): socket(), trying next"); continue; } if (connect(server_socket, server->ai_addr, server->ai_addrlen) == 0) { break; } - LOG_PERROR(DEBUG, "connect_to_host(): connect(), trying next"); + LOG_PERROR(DEBUG1, "connect_to_host(): connect(), trying next"); close(server_socket); } diff --git a/src/log.c b/src/log.c index a791450..4dc53f7 100644 --- a/src/log.c +++ b/src/log.c @@ -35,7 +35,7 @@ void log_message(int level, const char *file, int line, const char *format, ...) switch (level) { case LOG_ERROR_LEVEL: level_string = "ERROR"; break; case LOG_WARNING_LEVEL: level_string = "WARN "; break; - case LOG_DEBUG_LEVEL: level_string = "DEBUG"; break; + case LOG_DEBUG1_LEVEL: level_string = "DEBUG"; break; default: level_string = "UNKNOWN"; } diff --git a/src/log.h b/src/log.h index 42417fc..9abb49f 100644 --- a/src/log.h +++ b/src/log.h @@ -23,12 +23,12 @@ /* Log constants to be used with LOG() and LOG_PERROR() macros. */ #define ERROR LOG_ERROR_LEVEL, __FILE__, __LINE__ #define WARNING LOG_WARNING_LEVEL, __FILE__, __LINE__ -#define DEBUG LOG_DEBUG_LEVEL, __FILE__, __LINE__ +#define DEBUG1 LOG_DEBUG1_LEVEL, __FILE__, __LINE__ /* Log level constants. */ #define LOG_ERROR_LEVEL 0 #define LOG_WARNING_LEVEL 1 -#define LOG_DEBUG_LEVEL 2 +#define LOG_DEBUG1_LEVEL 2 /* Call log_message() and print current file and line number. */ #define LOG \ diff --git a/src/tlsproxy.c b/src/tlsproxy.c index 91d91b9..0257d67 100644 --- a/src/tlsproxy.c +++ b/src/tlsproxy.c @@ -159,7 +159,7 @@ int main(int argc, char **argv) { } /* Fast rebinding for debug mode, could cause invalid packets. */ - if (global_log_level >= LOG_DEBUG_LEVEL) { + if (global_log_level >= LOG_DEBUG1_LEVEL) { int socket_option = 1; setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &socket_option, sizeof(socket_option)); @@ -187,7 +187,7 @@ int main(int argc, char **argv) { return EXIT_FAILURE; } - if (global_log_level >= LOG_DEBUG_LEVEL) { + if (global_log_level >= LOG_DEBUG1_LEVEL) { printf("tlsproxy %s\n", VERSION); printf("Listening for connections on port %d.\n", port); diff --git a/src/verify.c b/src/verify.c index 34a0814..ab44992 100644 --- a/src/verify.c +++ b/src/verify.c @@ -115,7 +115,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { /* Open stored server certificate file. */ if (server_certificate_file(&file, hostname, path, sizeof(path)) != 0) { - LOG(DEBUG, "server certificate:\n%s", server_cert); + LOG(DEBUG1, "server certificate:\n%s", server_cert); return -1; } @@ -129,7 +129,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { LOG(WARNING, "verify_tls_connection(): '%s' too big", path); fclose(file); - LOG(DEBUG, "server certificate:\n%s", server_cert); + LOG(DEBUG1, "server certificate:\n%s", server_cert); return -1; } @@ -140,7 +140,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) { path, strerror(errno)); fclose(file); - LOG(DEBUG, "server certificate:\n%s", server_cert); + LOG(DEBUG1, "server certificate:\n%s", server_cert); return -1; } fclose(file); @@ -220,8 +220,8 @@ int server_certificate_file(FILE **file, const char *hostname, *file = fopen(path, "rb"); if (*file == NULL) { if (global_passthrough_unknown) { - LOG(DEBUG, "server_certificate_file(): failed to open '%s': %s", - path, strerror(errno)); + LOG(DEBUG1, "server_certificate_file(): failed to open '%s': %s", + path, strerror(errno)); } else { LOG(WARNING, "server_certificate_file(): failed to open '%s': %s", path, strerror(errno)); -- 2.43.2