Rename log level constants from LOG_* to just *.

diff --git a/src/connection.c b/src/connection.c
index f7e9a97425626bb2e393f5478168c2bc3dcb5f56..7f2071a7975340737e68acdd06237ae759e4d5ca 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -103,7 +103,7 @@ void handle_connection(int client_socket) {
      * certificate. */
     int validation_failed;
 
-    LOG(LOG_DEBUG, "new connection");
+    LOG(DEBUG, "new connection");
 
     server_socket = -1;
     client_fd_read = NULL;
@@ -124,34 +124,34 @@ void handle_connection(int client_socket) {
     /* Read request line (CONNECT ..) and headers (they are discarded). */
     result = read_http_request(client_fd_read, buffer, sizeof(buffer));
     if (result == -1) {
-        LOG(LOG_WARNING, "read_http_request(): client read error");
+        LOG(WARNING, "read_http_request(): client read error");
         goto out;
     } else if (result == -2) {
-        LOG(LOG_WARNING, "read_http_request(): client EOF");
+        LOG(WARNING, "read_http_request(): client EOF");
         send_bad_request(client_fd_write);
         goto out;
     }
 
     if (parse_request(buffer, host, port, &version_minor) != 0) {
-        LOG(LOG_WARNING, "bad request: %s", buffer);
+        LOG(WARNING, "bad request: %s", buffer);
         send_bad_request(client_fd_write);
         goto out;
     }
 
-    LOG(LOG_DEBUG, "target: %s:%s (HTTP 1.%d)", host, port, version_minor);
+    LOG(DEBUG, "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(LOG_DEBUG, "connecting to %s:%s", global_proxy_host,
+        LOG(DEBUG, "connecting to %s:%s", global_proxy_host,
                                               global_proxy_port);
         server_socket = connect_to_host(global_proxy_host, global_proxy_port);
     } else {
-        LOG(LOG_DEBUG, "connecting to %s:%s", host, port);
+        LOG(DEBUG, "connecting to %s:%s", host, port);
         server_socket = connect_to_host(host, port);
     }
 
     if (server_socket == -1) {
-        LOG(LOG_WARNING, "failed to connect to server");
+        LOG(WARNING, "failed to connect to server");
         send_forwarding_failure(client_fd_write);
         goto out;
     }
@@ -170,24 +170,24 @@ void handle_connection(int client_socket) {
         /* Read response line from proxy server. */
         result = read_http_request(server_fd_read, buffer, sizeof(buffer));
         if (result == -1) {
-            LOG(LOG_WARNING, "read_http_request(): proxy read error");
+            LOG(WARNING, "read_http_request(): proxy read error");
             send_forwarding_failure(client_fd_write);
             goto out;
         } else if (result == -2) {
-            LOG(LOG_WARNING, "read_http_request(): proxy EOF");
+            LOG(WARNING, "read_http_request(): proxy EOF");
             send_forwarding_failure(client_fd_write);
             goto out;
         }
 
         /* Check response of proxy server. */
         if (strncmp(buffer, "HTTP/1.0 200", 12)) {
-            LOG(LOG_WARNING, "bad proxy response: %s", buffer);
+            LOG(WARNING, "bad proxy response: %s", buffer);
             send_forwarding_failure(client_fd_write);
             goto out;
         }
     }
 
-    LOG(LOG_DEBUG, "connection to server established");
+    LOG(DEBUG, "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
@@ -202,13 +202,13 @@ void handle_connection(int client_socket) {
             fprintf(client_fd_write, "\r\n");
             fflush(client_fd_write);
 
-            LOG(LOG_DEBUG, "transferring data");
+            LOG(DEBUG, "transferring data");
 
             /* Proxy data between client and server until one side is done
              * (EOF or error). */
             transfer_data(client_socket, server_socket);
 
-            LOG(LOG_DEBUG, "finished transferring data");
+            LOG(DEBUG, "finished transferring data");
 
             goto out;
         }
@@ -222,29 +222,29 @@ void handle_connection(int client_socket) {
     result = initialize_tls_session_server(server_socket, &server_session,
                                                           &server_x509_cred);
     if (result != 0) {
-        LOG(LOG_WARNING, "initialize_tls_session_server() failed");
+        LOG(WARNING, "initialize_tls_session_server() failed");
         send_forwarding_failure(client_fd_write);
         goto out;
     }
     server_session_init = 1;
 
-    LOG(LOG_DEBUG, "starting server TLS handshake");
+    LOG(DEBUG, "starting server TLS handshake");
 
     /* Try to establish TLS handshake between us and server. */
     result = gnutls_handshake(server_session);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_WARNING, "server TLS handshake failed: %s",
+        LOG(WARNING, "server TLS handshake failed: %s",
                          gnutls_strerror(result));
         send_forwarding_failure(client_fd_write);
         goto out;
     }
     server_session_started = 1;
 
-    LOG(LOG_DEBUG, "server TLS handshake finished");
+    LOG(DEBUG, "server TLS handshake finished");
 
     /* Make sure the server certificate is valid and known. */
     if (verify_tls_connection(server_session, host) != 0) {
-        LOG(LOG_ERROR, "server certificate validation failed!");
+        LOG(ERROR, "server certificate validation failed!");
         /* We'll send the error message over our TLS connection to the client,
          * but with an invalid certificate. No data is transfered from/to the
          * target server. */
@@ -260,7 +260,7 @@ void handle_connection(int client_socket) {
                                            &client_session,
                                            &client_x509_cred);
     if (result != 0) {
-        LOG(LOG_WARNING, "initialize_tls_session_client() failed");
+        LOG(WARNING, "initialize_tls_session_client() failed");
         send_forwarding_failure(client_fd_write);
         goto out;
     }
@@ -271,19 +271,19 @@ void handle_connection(int client_socket) {
     fprintf(client_fd_write, "\r\n");
     fflush(client_fd_write);
 
-    LOG(LOG_DEBUG, "starting client TLS handshake");
+    LOG(DEBUG, "starting client TLS handshake");
 
     /* Try to establish TLS handshake between client and us. */
     result = gnutls_handshake(client_session);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_WARNING, "client TLS handshake failed: %s",
+        LOG(WARNING, "client TLS handshake failed: %s",
                          gnutls_strerror(result));
         send_forwarding_failure(client_fd_write);
         goto out;
     }
     client_session_started = 1;
 
-    LOG(LOG_DEBUG, "client TLS handshake finished");
+    LOG(DEBUG, "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
@@ -293,14 +293,14 @@ void handle_connection(int client_socket) {
         goto out;
     }
 
-    LOG(LOG_DEBUG, "transferring TLS data");
+    LOG(DEBUG, "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(LOG_DEBUG, "finished transferring TLS data");
+    LOG(DEBUG, "finished transferring TLS data");
 
 out:
     /* Close TLS sessions if necessary. Use GNUTLS_SHUT_RDWR so the data is
@@ -331,7 +331,7 @@ out:
     } else if (server_socket != -1) {
         close(server_socket);
     }
-    LOG(LOG_DEBUG, "connection to server closed");
+    LOG(DEBUG, "connection to server closed");
     /* Close connection to client. */
     if (client_fd_read != NULL) {
         if (client_fd_write != NULL) {
@@ -341,9 +341,9 @@ out:
     } else {
         close(client_socket);
     }
-    LOG(LOG_DEBUG, "connection to client closed");
+    LOG(DEBUG, "connection to client closed");
 
-    LOG(LOG_DEBUG, "connection finished");
+    LOG(DEBUG, "connection finished");
 }
 
 
@@ -360,7 +360,7 @@ static int initialize_tls_session_client(int peer_socket,
     use_invalid_cert = (!strcmp(hostname, "invalid"));
 
     if (proxy_certificate_path(hostname, path, sizeof(path)) != 0) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_client(): \
 failed to get proxy certificate path");
         return -1;
@@ -368,7 +368,7 @@ failed to get proxy certificate path");
 
     result = gnutls_certificate_allocate_credentials(x509_cred);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_client(): \
 gnutls_certificate_allocate_credentials(): %s",
             gnutls_strerror(result));
@@ -381,7 +381,7 @@ gnutls_certificate_allocate_credentials(): %s",
                                                         PROXY_CA_FILE,
                                                         GNUTLS_X509_FMT_PEM);
         if (result <= 0) {
-            LOG(LOG_ERROR,
+            LOG(ERROR,
                 "initialize_tls_session_client(): can't read CA file: '%s'",
                 PROXY_CA_FILE);
             gnutls_certificate_free_credentials(*x509_cred);
@@ -405,7 +405,7 @@ gnutls_certificate_allocate_credentials(): %s",
                                                       GNUTLS_X509_FMT_PEM);
     }
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_client(): \
 can't read server certificate ('%s') or key file ('%s'): %s",
             path, PROXY_KEY_FILE, gnutls_strerror(result));
@@ -418,7 +418,7 @@ can't read server certificate ('%s') or key file ('%s'): %s",
 
     result = gnutls_init(session, GNUTLS_SERVER);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_client(): gnutls_init(): %s",
             gnutls_strerror(result));
         gnutls_certificate_free_credentials(*x509_cred);
@@ -426,7 +426,7 @@ can't read server certificate ('%s') or key file ('%s'): %s",
     }
     result = gnutls_priority_set(*session, global_tls_priority_cache);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_client(): gnutls_priority_set(): %s",
             gnutls_strerror(result));
         gnutls_deinit(*session);
@@ -436,7 +436,7 @@ can't read server certificate ('%s') or key file ('%s'): %s",
     result = gnutls_credentials_set(*session,
                                     GNUTLS_CRD_CERTIFICATE, *x509_cred);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_client(): gnutls_credentials_set(): %s",
             gnutls_strerror(result));
         gnutls_deinit(*session);
@@ -455,7 +455,7 @@ static int initialize_tls_session_server(int peer_socket,
 
     result = gnutls_certificate_allocate_credentials(x509_cred);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_server(): \
 gnutls_certificate_allocate_credentials(): %s",
             gnutls_strerror(result));
@@ -464,7 +464,7 @@ gnutls_certificate_allocate_credentials(): %s",
 
     result = gnutls_init(session, GNUTLS_CLIENT);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_server(): gnutls_init(): %s",
             gnutls_strerror(result));
         gnutls_certificate_free_credentials(*x509_cred);
@@ -472,7 +472,7 @@ gnutls_certificate_allocate_credentials(): %s",
     }
     result = gnutls_priority_set(*session, global_tls_priority_cache);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_server(): gnutls_priority_set(): %s",
             gnutls_strerror(result));
         gnutls_deinit(*session);
@@ -482,7 +482,7 @@ gnutls_certificate_allocate_credentials(): %s",
     result = gnutls_credentials_set(*session,
                                     GNUTLS_CRD_CERTIFICATE, *x509_cred);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "initialize_tls_session_server(): gnutls_credentials_set(): %s",
             gnutls_strerror(result));
         gnutls_deinit(*session);
@@ -499,13 +499,13 @@ gnutls_certificate_allocate_credentials(): %s",
 static int fdopen_read_write(int socket, FILE **read_fd, FILE **write_fd) {
     *read_fd = fdopen(socket, "r");
     if (*read_fd == NULL) {
-        LOG_PERROR(LOG_WARNING, "fdopen_read_write(): fdopen(\"r\") failed");
+        LOG_PERROR(WARNING, "fdopen_read_write(): fdopen(\"r\") failed");
         return -1;
     }
 
     *write_fd = fdopen(dup(socket), "w");
     if (*write_fd == NULL) {
-        LOG_PERROR(LOG_WARNING, "fdopen_read_write(): fdopen(\"w\") failed");
+        LOG_PERROR(WARNING, "fdopen_read_write(): fdopen(\"w\") failed");
         fclose(*read_fd);
         *read_fd = NULL; /* "tell" caller read_fd is already closed */
         return -1;
@@ -523,7 +523,7 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) {
 
     if (fgets(request, (int)length, client_fd) == NULL) {
         if (ferror(client_fd)) {
-            LOG_PERROR(LOG_WARNING, "read_http_request(): fgets()");
+            LOG_PERROR(WARNING, "read_http_request(): fgets()");
             return -1;
         }
         /* EOF */
@@ -537,7 +537,7 @@ static int read_http_request(FILE *client_fd, char *request, size_t length) {
         }
     }
     if (ferror(client_fd)) {
-        LOG_PERROR(LOG_WARNING, "read_http_request(): fgets()");
+        LOG_PERROR(WARNING, "read_http_request(): fgets()");
         return -1;
     }
 
@@ -580,11 +580,11 @@ static void tls_send_invalid_cert_message(gnutls_session_t session) {
                       RESPONSE_ERROR, RESPONSE_ERROR, RESPONSE_ERROR,
                       RESPONSE_MSG);
     if (result < 0) {
-        LOG_PERROR(LOG_ERROR,
+        LOG_PERROR(ERROR,
                    "tls_send_invalid_cert_message(): snprintf failed");
         return;
     } else if ((size_t)result >= sizeof(buffer)) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "tls_send_invalid_cert_message(): snprintf buffer too short");
         return;
     }
@@ -610,7 +610,7 @@ static void transfer_data(int client, int server) {
     for (;;) {
         int result = poll(fds, 2 /* fd count */, -1 /* no timeout */);
         if (result < 0) {
-            LOG_PERROR(LOG_ERROR, "transfer_data(): poll()");
+            LOG_PERROR(ERROR, "transfer_data(): poll()");
             return;
         }
 
@@ -647,11 +647,11 @@ static int read_from_write_to(int from, int to) {
     ssize_t size_written;
     char buffer[4096];
 
-    LOG(LOG_DEBUG, "read_from_write_to(): %d -> %d", from, to);
+    LOG(DEBUG, "read_from_write_to(): %d -> %d", from, to);
 
     size_read = read(from, buffer, sizeof(buffer));
     if (size_read < 0) {
-        LOG_PERROR(LOG_WARNING, "read_from_write_to(): read()");
+        LOG_PERROR(WARNING, "read_from_write_to(): read()");
         return -1;
     /* EOF */
     } else if (size_read == 0) {
@@ -660,11 +660,11 @@ static int read_from_write_to(int from, int to) {
 
     size_written = write(to, buffer, (size_t)size_read);
     if (size_written < 0) {
-        LOG_PERROR(LOG_WARNING, "read_from_write_to(): write()");
+        LOG_PERROR(WARNING, "read_from_write_to(): write()");
         return -1;
     }
     if (size_read != size_written) {
-        LOG(LOG_ERROR, "read_from_write_to(): only written %ld of %ld bytes!",
+        LOG(ERROR, "read_from_write_to(): only written %ld of %ld bytes!",
                        (long int)size_written, (long int)size_read);
         return -1;
     }
@@ -692,13 +692,13 @@ 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(LOG_DEBUG, "transfer_data_tls(): suggested buffer size: %ld",
+    LOG(DEBUG, "transfer_data_tls(): suggested buffer size: %ld",
                    (long int)buffer_size);
 
     for (;;) {
         int result = poll(fds, 2 /* fd count */, -1 /* no timeout */);
         if (result < 0) {
-            LOG_PERROR(LOG_ERROR, "transfer_data(): poll()");
+            LOG_PERROR(ERROR, "transfer_data(): poll()");
             return;
         }
 
@@ -741,12 +741,12 @@ static int read_from_write_to_tls(gnutls_session_t from,
     if (buffer_size > sizeof(buffer)) {
         buffer_size = sizeof(buffer);
     }
-    LOG(LOG_DEBUG, "read_from_write_to_tls(): used buffer size: %ld",
+    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(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s",
+        LOG(WARNING, "read_from_write_to_tls(): gnutls_record_recv(): %s",
                          gnutls_strerror((int)size_read));
         return -1;
     /* EOF */
@@ -756,12 +756,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(LOG_WARNING, "read_from_write_to_tls(): gnutls_record_send(): %s",
+        LOG(WARNING, "read_from_write_to_tls(): gnutls_record_send(): %s",
                          gnutls_strerror((int)size_written));
         return -1;
     }
     if (size_read != size_written) {
-        LOG(LOG_ERROR, "read_from_write_to_tls(): only written %ld of %ld bytes!",
+        LOG(ERROR, "read_from_write_to_tls(): only written %ld of %ld bytes!",
                        (long int)size_written, (long int)size_read);
         return -1;
     }
@@ -793,9 +793,9 @@ static int connect_to_host(const char *hostname, const char *port) {
     gai_return = getaddrinfo(hostname, port, &gai_hints, &gai_result);
     if (gai_return != 0) {
         if (gai_return == EAI_SYSTEM) {
-            LOG_PERROR(LOG_WARNING, "connect_to_host(): getaddrinfo()");
+            LOG_PERROR(WARNING, "connect_to_host(): getaddrinfo()");
         } else {
-            LOG(LOG_WARNING, "connect_to_host(): getaddrinfo(): %s",
+            LOG(WARNING, "connect_to_host(): getaddrinfo(): %s",
                              gai_strerror(gai_return));
         }
         return -1;
@@ -808,14 +808,14 @@ static int connect_to_host(const char *hostname, const char *port) {
                                server->ai_socktype,
                                server->ai_protocol);
         if (server_socket == -1) {
-            LOG_PERROR(LOG_DEBUG, "connect_to_host(): socket(), trying next");
+            LOG_PERROR(DEBUG, "connect_to_host(): socket(), trying next");
             continue;
         }
 
         if (connect(server_socket, server->ai_addr, server->ai_addrlen) != -1) {
             break;
         }
-        LOG_PERROR(LOG_DEBUG, "connect_to_host(): connect(), trying next");
+        LOG_PERROR(DEBUG, "connect_to_host(): connect(), trying next");
 
         close(server_socket);
     }
@@ -823,7 +823,7 @@ static int connect_to_host(const char *hostname, const char *port) {
     freeaddrinfo(gai_result);
 
     if (server == NULL) {
-        LOG_PERROR(LOG_WARNING, "connect_to_host(): no server found, abort");
+        LOG_PERROR(WARNING, "connect_to_host(): no server found, abort");
         return -1;
     }
 

diff --git a/src/log.h b/src/log.h
index 7fc45fbfd3550990a2d48f692f028915705aa7f6..42417fc7fed75fdd84e34838835f4b27b13b7f00 100644 (file)
--- a/src/log.h
+++ b/src/log.h
@@ -21,9 +21,9 @@
 #define LOG_H
 
 /* Log constants to be used with LOG() and LOG_PERROR() macros. */
-#define LOG_ERROR   LOG_ERROR_LEVEL,   __FILE__, __LINE__
-#define LOG_WARNING LOG_WARNING_LEVEL, __FILE__, __LINE__
-#define LOG_DEBUG   LOG_DEBUG_LEVEL,   __FILE__, __LINE__
+#define ERROR   LOG_ERROR_LEVEL,   __FILE__, __LINE__
+#define WARNING LOG_WARNING_LEVEL, __FILE__, __LINE__
+#define DEBUG   LOG_DEBUG_LEVEL,   __FILE__, __LINE__
 
 /* Log level constants. */
 #define LOG_ERROR_LEVEL   0

diff --git a/src/verify.c b/src/verify.c
index e361e01b56c676c3ac32f9d4532e43c275e0632d..d4002764dbfece338008632c794ce226dade233c 100644 (file)
--- a/src/verify.c
+++ b/src/verify.c
@@ -47,7 +47,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
     /* Verification failed (!= invalid certificate but worse), no need for any
      * more checks. */
     if (result < 0) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "verify_tls_connection(): gnutls_certificate_verify_peers2() failed: %s",
             gnutls_strerror(result));
         return -1;
@@ -57,7 +57,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
             || status & GNUTLS_CERT_REVOKED
             || status & GNUTLS_CERT_NOT_ACTIVATED
             || status & GNUTLS_CERT_INSECURE_ALGORITHM) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "verify_tls_connection(): invalid server certificate");
         return -1;
     }
@@ -66,7 +66,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
      * prevent an attacker from changing the certificate type to prevent
      * detection. */
     if (gnutls_certificate_type_get(session) != GNUTLS_CRT_X509) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "verify_tls_connection(): no X509 server certificate");
         return -1;
     }
@@ -75,7 +75,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
 
     result = gnutls_x509_crt_init(&cert);
     if (result < 0) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "verify_tls_connection(): gnutls_x509_crt_init() failed: %s",
             gnutls_strerror(result));
         return -1;
@@ -83,7 +83,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
 
     cert_list = gnutls_certificate_get_peers(session, &cert_list_size);
     if (cert_list == NULL) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "verify_tls_connection(): gnutls_certificate_get_peers() failed");
         gnutls_x509_crt_deinit(cert);
         return -1;
@@ -91,7 +91,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
 
     result = gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER);
     if (result < 0) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "verify_tls_connection(): gnutls_x509_crt_import() failed: %s",
             gnutls_strerror(result));
         gnutls_x509_crt_deinit(cert);
@@ -104,7 +104,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
     result = gnutls_x509_crt_export(cert, GNUTLS_X509_FMT_PEM,
                                     server_cert, &size);
     if (result != GNUTLS_E_SUCCESS) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "verify_tls_connection(): gnutls_x509_crt_export() failed: %s",
             gnutls_strerror(result));
         gnutls_x509_crt_deinit(cert);
@@ -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(LOG_DEBUG, "server certificate:\n%s", server_cert);
+        LOG(DEBUG, "server certificate:\n%s", server_cert);
         return -1;
     }
 
@@ -126,33 +126,33 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
         size += strlen(buffer);
         /* Make sure the buffer is big enough. */
         if (size >= sizeof(stored_cert)) {
-            LOG(LOG_WARNING, "verify_tls_connection(): '%s' too big", path);
+            LOG(WARNING, "verify_tls_connection(): '%s' too big", path);
             fclose(file);
 
-            LOG(LOG_DEBUG, "server certificate:\n%s", server_cert);
+            LOG(DEBUG, "server certificate:\n%s", server_cert);
             return -1;
         }
 
         strcat(stored_cert, buffer);
     }
     if (ferror(file)) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "verify_tls_connection(): failed to read from '%s': %s",
             path, strerror(errno));
         fclose(file);
 
-        LOG(LOG_DEBUG, "server certificate:\n%s", server_cert);
+        LOG(DEBUG, "server certificate:\n%s", server_cert);
         return -1;
     }
     fclose(file);
 
     /* Check if the server certificate matches our stored certificate. */
     if (strcmp(stored_cert, server_cert)) {
-        LOG(LOG_ERROR,
+        LOG(ERROR,
             "verify_tls_connection(): server certificate changed!",
             path, strerror(errno));
 
-        LOG(LOG_WARNING, "server certificate:\n%s", server_cert);
+        LOG(WARNING, "server certificate:\n%s", server_cert);
         return -2;
     }
 
@@ -164,7 +164,7 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
     }
     file = fopen(path, "r");
     if (file == NULL) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "verify_tls_connection(): proxy certificate doesn't exist: '%s'",
             path);
         return -1;
@@ -181,14 +181,14 @@ static int get_certificate_path(const char *format,
 
     /* Hostname too long. */
     if (size - strlen(format) <= strlen(hostname)) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "get_certificate_path(): hostname too long: '%s'",
             hostname);
         return -1;
     }
     /* Try to prevent path traversals in hostnames. */
     if (strstr(hostname, "..") != NULL) {
-        LOG(LOG_WARNING,
+        LOG(WARNING,
             "get_certificate_path(): possible path traversal: '%s'",
             hostname);
         return -1;
@@ -196,10 +196,10 @@ static int get_certificate_path(const char *format,
     /* Safe as format is no user input. */
     result = snprintf(buffer, size, format, hostname);
     if (result < 0) {
-        LOG_PERROR(LOG_ERROR, "get_certificate_path(): snprintf failed");
+        LOG_PERROR(ERROR, "get_certificate_path(): snprintf failed");
         return -1;
     } else if ((size_t)result >= size) {
-        LOG(LOG_ERROR, "get_certificate_path(): snprintf buffer too short");
+        LOG(ERROR, "get_certificate_path(): snprintf buffer too short");
         return -1;
     }
 
@@ -215,7 +215,7 @@ int server_certificate_file(FILE **file, const char *hostname,
                             char *path, size_t size) {
     if (get_certificate_path(STORED_SERVER_CERT_FORMAT,
                              hostname, path, size) != 0) {
-        LOG_PERROR(LOG_ERROR,
+        LOG_PERROR(ERROR,
                    "server_certificate_file(): failed to get path");
         return -1;
     }
@@ -224,11 +224,11 @@ int server_certificate_file(FILE **file, const char *hostname,
     *file = fopen(path, "rb");
     if (*file == NULL) {
         if (global_passthrough_unknown) {
-            LOG(LOG_DEBUG,
+            LOG(DEBUG,
                 "server_certificate_file(): failed to open '%s': %s",
                 path, strerror(errno));
         } else {
-            LOG(LOG_WARNING,
+            LOG(WARNING,
                 "server_certificate_file(): failed to open '%s': %s",
                 path, strerror(errno));
         }