/* 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;
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
}
/* 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));
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) {
/* 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;
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();
}