X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Ftlsproxy.c;h=401553f52e4d922846c4c9da664f9cf3bd67c416;hb=1d507eaf013fdffb6c17f0f02f6ee9a91d44aa62;hp=b79e05daec86135f8ed470b2f8bee9bf881d1b37;hpb=f1a626728ee8be94ebb023c6cfb2f68684671450;p=tlsproxy%2Ftlsproxy.git diff --git a/src/tlsproxy.c b/src/tlsproxy.c index b79e05d..401553f 100644 --- 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-2013 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 @@ -23,19 +23,13 @@ #include "sem.h" #include "connection.h" -/* socket(), bind(), accept(), listen() */ -#include -#include -/* close() */ -#include -/* htons() */ #include -/* sigaction() */ -#include -/* errno */ #include -/* pthread_*() */ #include +#include +#include +#include +#include /* For GnuTLS. */ #include @@ -52,7 +46,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL; /* For gnutls_*() functions. */ #define GNUTLS_ERROR_EXIT(error, message) \ - if (GNUTLS_E_SUCCESS != error) { \ + if (error != GNUTLS_E_SUCCESS) { \ fprintf(stderr, "%s: %s\n", message, gnutls_strerror(error)); \ exit(EXIT_FAILURE); \ } @@ -103,9 +97,9 @@ int main(int argc, char **argv) { parse_arguments(argc, argv); port = atoi(argv[argc - 1]); - if (0 >= port || 0xffff < port) { + if (port <= 0 || port > 0xffff ) { print_usage(argv[0]); - fprintf(stderr, "\ninvalid port\n"); + fprintf(stderr, "\ninvalid port: '%s'\n", argv[argc - 1]); return EXIT_FAILURE; } @@ -137,8 +131,8 @@ int main(int argc, char **argv) { initialize_gnutls(); /* Spawn worker threads to handle requests. */ - threads = (pthread_t *)malloc(thread_count * sizeof(pthread_t)); - if (NULL == threads) { + threads = malloc(thread_count * sizeof(*threads)); + if (threads == NULL) { perror("thread malloc failed"); return EXIT_FAILURE; } @@ -149,7 +143,7 @@ int main(int argc, char **argv) { result = pthread_create(&thread, NULL, (void * (*)(void *))&worker_thread, NULL); - if (0 != result) { + if (result != 0) { fprintf(stderr, "failed to create worker thread: %s\n", strerror(result)); return EXIT_FAILURE; @@ -163,13 +157,13 @@ int main(int argc, char **argv) { #else server_socket = socket(PF_INET6, SOCK_STREAM, 0); #endif - if (-1 == server_socket) { + if (server_socket == -1) { perror("socket()"); return EXIT_FAILURE; } /* Fast rebinding for debug mode, could cause invalid packets. */ - if (LOG_DEBUG_LEVEL <= global_log_level) { + if (global_log_level >= LOG_DEBUG_LEVEL) { int socket_option = 1; setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR, &socket_option, sizeof(socket_option)); @@ -186,21 +180,22 @@ int main(int argc, char **argv) { server_in.sin6_addr = in6addr_any; /* bind to any address */ server_in.sin6_port = htons((uint16_t)port); /* port to bind to */ #endif - if (-1 == bind(server_socket, (struct sockaddr *)&server_in, - sizeof(server_in))) { + if (bind(server_socket, (struct sockaddr *)&server_in, + sizeof(server_in)) == -1) { perror("bind()"); return EXIT_FAILURE; } /* And accept connections. */ - if (-1 == listen(server_socket, 5)) { + if (listen(server_socket, 5) == -1) { perror("listen()"); return EXIT_FAILURE; } - if (LOG_DEBUG_LEVEL <= global_log_level) { + if (global_log_level >= LOG_DEBUG_LEVEL) { + printf("tlsproxy %s\n", VERSION); printf("Listening for connections on port %d.\n", port); - if (NULL != global_proxy_host && NULL != global_proxy_port) { + if (global_proxy_host != NULL && global_proxy_port != NULL) { printf("Using proxy: %s:%s.\n", global_proxy_host, global_proxy_port); } @@ -209,12 +204,12 @@ int main(int argc, char **argv) { while (!done) { /* Accept new connection. */ client_socket = accept(server_socket, NULL, NULL); - if (-1 == client_socket) { + if (client_socket == -1) { perror("accept()"); 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; @@ -232,9 +227,8 @@ int main(int argc, char **argv) { } for (i = 0; i < thread_count; i++) { errno = pthread_join(threads[i], NULL); - if (0 != errno) { + if (errno != 0) { perror("pthread_join()"); - continue; } } @@ -272,12 +266,13 @@ static void parse_arguments(int argc, char **argv) { #endif global_passthrough_unknown = 0; - while (-1 != (option = getopt(argc, argv, "d:p:t:uh?"))) { + while ((option = getopt(argc, argv, "d:p:t:uh?")) != -1) { switch (option) { case 'd': { - if (0 > atoi(optarg)) { + if (atoi(optarg) < 0) { print_usage(argv[0]); - fprintf(stderr, "\n-d positive number required\n"); + fprintf(stderr, "\n-d positive number required: '%s'\n", + optarg); exit(EXIT_FAILURE); } global_log_level = atoi(optarg); @@ -287,18 +282,19 @@ static void parse_arguments(int argc, char **argv) { char *position; /* -p must have the format host:port. */ - if (NULL == (position = strchr(optarg, ':')) - || position == optarg - || 0 == strlen(position + 1) - || 0 >= atoi(position + 1) - || 0xffff < atoi(position + 1)) { + if ((position = strchr(optarg, ':')) == NULL + || optarg == position + || strlen(position + 1) == 0 + || atoi(position + 1) <= 0 + || atoi(position + 1) > 0xffff) { print_usage(argv[0]); - fprintf(stderr, "\ninvalid -p, format host:port\n"); + fprintf(stderr, "\ninvalid -p: '%s', format host:port\n", + optarg); exit(EXIT_FAILURE); } global_proxy_host = malloc((size_t)(position - optarg) + 1); - if (NULL == global_proxy_host) { + if (global_proxy_host == NULL) { perror("malloc()"); exit(EXIT_FAILURE); } @@ -306,7 +302,7 @@ static void parse_arguments(int argc, char **argv) { global_proxy_host[position - optarg] = '\0'; global_proxy_port = malloc(strlen(position + 1) + 1); - if (NULL == global_proxy_port) { + if (global_proxy_port == NULL) { perror("malloc()"); exit(EXIT_FAILURE); } @@ -315,9 +311,10 @@ static void parse_arguments(int argc, char **argv) { break; } case 't': { - if (0 >= atoi(optarg)) { + if (atoi(optarg) <= 0) { print_usage(argv[0]); - fprintf(stderr, "\n-t positive number required\n"); + fprintf(stderr, "\n-t positive number required: '%s'\n", + optarg); exit(EXIT_FAILURE); } thread_count = (size_t)atoi(optarg); @@ -341,6 +338,8 @@ static void parse_arguments(int argc, char **argv) { } } 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"); @@ -405,7 +404,7 @@ static void worker_thread(void) { V(ringbuffer_free); /* Negative value indicates we should shut down our thread. */ - if (0 > client_socket) { + if (client_socket < 0) { break; }