* 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
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
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;
}
/* 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("tlsproxy %s\n", VERSION);
printf("Listening for connections on port %d.\n", port);
if (NULL != global_proxy_host && NULL != global_proxy_port) {
break;
}
- /* No lock, we only have one producer! */
+ /* No lock necessary, we only have one producer! */
P(ringbuffer_free);
ringbuffer[ringbuffer_write] = client_socket;
ringbuffer_write = (ringbuffer_write + 1) % RINGBUFFER_SIZE;
errno = pthread_join(threads[i], NULL);
if (0 != errno) {
perror("pthread_join()");
- continue;
}
}
/* 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;
}
}
static void print_usage(const char *argv) {
+ fprintf(stderr, "tlsproxy %s, a certificate checking TLS proxy\n",
+ VERSION);
fprintf(stderr, "Usage: %s [-d level] [-p host:port] [-t count] [-u] port\n",
argv);
fprintf(stderr, "\n");