src/sem.c,src/tlsproxy.c: Minor cleanup.

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

diff --git a/src/tlsproxy.c b/src/tlsproxy.c
index d2b4506c00d26ad2c282aa51751324ec421f03d4..6ce976c62f920842396c35b23a7bd7ef61145e89 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
@@ -137,7 +137,7 @@ int main(int argc, char **argv) {
     initialize_gnutls();
 
     /* Spawn worker threads to handle requests. */
-    threads = (pthread_t *)malloc(thread_count * sizeof(pthread_t));
+    threads = malloc(thread_count * sizeof(*threads));
     if (NULL == threads) {
         perror("thread malloc failed");
         return EXIT_FAILURE;
@@ -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) {
@@ -234,7 +234,6 @@ int main(int argc, char **argv) {
         errno = pthread_join(threads[i], NULL);
         if (0 != errno) {
             perror("pthread_join()");
-            continue;
         }
     }
 
@@ -266,9 +265,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;