X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftlsproxy.c;h=fae5c20f3657e96bb40dd158911e95f915b92daf;hb=8901c257215d60e07dd12ad2dad8d2c9569892aa;hp=ab9c6dff6c848b53597c2195662f752cf7ad940c;hpb=4aa2eea6b3115cab6f3165c4391d523d5df61e51;p=tlsproxy%2Ftlsproxy.git
diff --git a/src/tlsproxy.c b/src/tlsproxy.c
index ab9c6df..fae5c20 100644
--- a/src/tlsproxy.c
+++ b/src/tlsproxy.c
@@ -17,11 +17,10 @@
* along with this program. If not, see .
*/
-#include
+#include "tlsproxy.h"
+#include "sem.h"
+#include "connection.h"
-#include
-#include
-#include
/* socket(), bind(), accept(), listen() */
#include
#include
@@ -36,10 +35,6 @@
/* pthread_*() */
#include
-#include "tlsproxy.h"
-#include "sem.h"
-#include "connection.h"
-
/* Size of ringbuffer. */
#define RINGBUFFER_SIZE 10
@@ -81,7 +76,7 @@ int main(int argc, char **argv) {
port = atoi(argv[argc - 1]);
if (0 >= port || 0xffff < port) {
print_usage(argv[0]);
- fprintf(stderr, "\ninvalid port");
+ fprintf(stderr, "\ninvalid port\n");
return EXIT_FAILURE;
}
@@ -157,13 +152,14 @@ int main(int argc, char **argv) {
return EXIT_FAILURE;
}
-#ifdef DEBUG
- printf("Listening for connections on port %d.\n", port);
+ if (LOG_DEBUG <= global_log_level) {
+ printf("Listening for connections on port %d.\n", port);
- if (NULL != use_proxy_host && NULL != use_proxy_port) {
- printf("Using proxy: %s:%s.\n", use_proxy_host, use_proxy_port);
+ if (NULL != global_proxy_host && NULL != global_proxy_port) {
+ printf("Using proxy: %s:%s.\n", global_proxy_host,
+ global_proxy_port);
+ }
}
-#endif
while (!done) {
/* Accept new connection. */
@@ -203,8 +199,8 @@ int main(int argc, char **argv) {
free(threads);
- free(use_proxy_host);
- free(use_proxy_port);
+ free(global_proxy_host);
+ free(global_proxy_port);
return EXIT_FAILURE;
}
@@ -220,9 +216,23 @@ static void parse_arguments(int argc, char **argv) {
/* Default values. */
thread_count = 10;
+#ifdef DEBUG
+ global_log_level = LOG_DEBUG;
+#else
+ global_log_level = LOG_WARNING;
+#endif
- while (-1 != (option = getopt(argc, argv, "p:t:h?"))) {
+ while (-1 != (option = getopt(argc, argv, "d:p:t:h?"))) {
switch (option) {
+ case 'd': {
+ if (0 > atoi(optarg)) {
+ print_usage(argv[0]);
+ fprintf(stderr, "\n-d positive number required\n");
+ exit(EXIT_FAILURE);
+ }
+ global_log_level = atoi(optarg);
+ break;
+ }
case 'p': {
char *position;
@@ -232,30 +242,32 @@ static void parse_arguments(int argc, char **argv) {
|| 0 == strlen(position + 1)
|| 0 >= atoi(position + 1)
|| 0xffff < atoi(position + 1)) {
- fprintf(stderr, "-p host:port\n");
+ print_usage(argv[0]);
+ fprintf(stderr, "\ninvalid -p, format host:port\n");
exit(EXIT_FAILURE);
}
- use_proxy_host = malloc((size_t)(position - optarg) + 1);
- if (NULL == use_proxy_host) {
+ global_proxy_host = malloc((size_t)(position - optarg) + 1);
+ if (NULL == global_proxy_host) {
perror("malloc()");
exit(EXIT_FAILURE);
}
- memcpy(use_proxy_host, optarg, (size_t)(position - optarg));
- use_proxy_host[position - optarg] = '\0';
+ memcpy(global_proxy_host, optarg, (size_t)(position - optarg));
+ global_proxy_host[position - optarg] = '\0';
- use_proxy_port = malloc(strlen(position + 1) + 1);
- if (NULL == use_proxy_port) {
+ global_proxy_port = malloc(strlen(position + 1) + 1);
+ if (NULL == global_proxy_port) {
perror("malloc()");
exit(EXIT_FAILURE);
}
- strcpy(use_proxy_port, position + 1);
+ strcpy(global_proxy_port, position + 1);
break;
}
case 't': {
if (0 >= atoi(optarg)) {
- fprintf(stderr, "-t positive number required\n");
+ print_usage(argv[0]);
+ fprintf(stderr, "\n-t positive number required\n");
exit(EXIT_FAILURE);
}
thread_count = (size_t)atoi(optarg);
@@ -270,12 +282,15 @@ static void parse_arguments(int argc, char **argv) {
if (optind >= argc) {
print_usage(argv[0]);
+ fprintf(stderr, "\nport missing\n");
exit(EXIT_FAILURE);
}
}
static void print_usage(const char *argv) {
- fprintf(stderr, "Usage: %s [-p host:port] port\n", argv);
+ fprintf(stderr, "Usage: %s [-d level] [-p host:port] [-t count] port\n",
+ argv);
fprintf(stderr, "\n");
+ fprintf(stderr, "-d debug level: 0=errors only, 2=debug [default: 1]\n");
fprintf(stderr, "-p proxy hostname and port\n");
fprintf(stderr, "-t number of threads [default: 10]\n");
}
@@ -293,7 +308,7 @@ static void worker_thread(void) {
V(ringbuffer_free);
/* Negative value indicates we should shut down our thread. */
- if (client_socket < 0) {
+ if (0 > client_socket) {
break;
}