src/*,tests/*: Update copyright year.

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

diff --git a/src/tlsproxy.c b/src/tlsproxy.c
index 25f37043394518b1c02184fb775925ef1564d4f2..ad257b5314e1171d2646458e9c91c124835b5549 100644 (file)
--- a/src/tlsproxy.c
+++ b/src/tlsproxy.c
@@ -3,7 +3,7 @@
  * ensures the server certificate doesn't change. Normally this isn't detected
  * if a trusted CA for the new server certificate is installed.
  *
- * Copyright (C) 2011  Simon Ruderich
+ * Copyright (C) 2011-2012  Simon Ruderich
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,7 +59,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
 
 /* Server should shut down. Set by SIGINT handler. */
-static volatile int done;
+static volatile int done = 0;
 
 /* Number of threads. */
 static size_t thread_count;
@@ -109,11 +109,11 @@ int main(int argc, char **argv) {
         return EXIT_FAILURE;
     }
 
-    /* Setup our SIGINT signal handler which allows a "normal" termination of
-     * the server in DEBUG mode. */
     sigemptyset(&action.sa_mask);
     action.sa_flags   = 0;
 #ifdef DEBUG
+    /* Setup our SIGINT signal handler which allows a "normal" termination of
+     * the server in DEBUG mode. */
     action.sa_handler = sigint_handler;
     sigaction(SIGINT, &action, NULL);
 #endif
@@ -169,7 +169,7 @@ int main(int argc, char **argv) {
     }
 
     /* Fast rebinding for debug mode, could cause invalid packets. */
-    if (LOG_DEBUG <= global_log_level) {
+    if (LOG_DEBUG_LEVEL <= global_log_level) {
         int socket_option = 1;
         setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR,
                    &socket_option, sizeof(socket_option));
@@ -197,7 +197,7 @@ int main(int argc, char **argv) {
         return EXIT_FAILURE;
     }
 
-    if (LOG_DEBUG <= global_log_level) {
+    if (LOG_DEBUG_LEVEL <= global_log_level) {
         printf("Listening for connections on port %d.\n", port);
 
         if (NULL != global_proxy_host && NULL != global_proxy_port) {
@@ -266,9 +266,9 @@ static void parse_arguments(int argc, char **argv) {
     /* Default values. */
     thread_count = 10;
 #ifdef DEBUG
-    global_log_level = LOG_DEBUG;
+    global_log_level = LOG_DEBUG_LEVEL;
 #else
-    global_log_level = LOG_WARNING;
+    global_log_level = LOG_WARNING_LEVEL;
 #endif
     global_passthrough_unknown = 0;
 
@@ -376,18 +376,18 @@ static void initialize_gnutls(void) {
     GNUTLS_ERROR_EXIT(result, "gnutls_global_init()");
 
     /* Setup GnuTLS cipher suites. */
-    result = gnutls_priority_init(&tls_priority_cache, "NORMAL", NULL);
+    result = gnutls_priority_init(&global_tls_priority_cache, "NORMAL", NULL);
     GNUTLS_ERROR_EXIT(result, "gnutls_priority_init()");
 
     /* Generate Diffie-Hellman parameters. */
-    result = gnutls_dh_params_init(&tls_dh_params);
+    result = gnutls_dh_params_init(&global_tls_dh_params);
     GNUTLS_ERROR_EXIT(result, "gnutls_dh_params_init()");
-    result = gnutls_dh_params_generate2(tls_dh_params, DH_SIZE);
+    result = gnutls_dh_params_generate2(global_tls_dh_params, DH_SIZE);
     GNUTLS_ERROR_EXIT(result, "gnutls_dh_params_generate2()");
 }
 static void deinitialize_gnutls(void) {
-    gnutls_dh_params_deinit(tls_dh_params);
-    gnutls_priority_deinit(tls_priority_cache);
+    gnutls_dh_params_deinit(global_tls_dh_params);
+    gnutls_priority_deinit(global_tls_priority_cache);
 
     gnutls_global_deinit();
 }