src/: Improve debug output/logging.

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

diff --git a/src/tlsproxy.c b/src/tlsproxy.c
index 39183a7753d78742bca861408ae223a3bfe6f639..fae5c20f3657e96bb40dd158911e95f915b92daf 100644 (file)
--- a/src/tlsproxy.c
+++ b/src/tlsproxy.c
@@ -152,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 != global_proxy_host && NULL != global_proxy_port) {
-        printf("Using proxy: %s:%s.\n", global_proxy_host, global_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. */
@@ -215,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;
 
@@ -272,8 +287,10 @@ static void parse_arguments(int argc, char **argv) {
     }
 }
 static void print_usage(const char *argv) {
-    fprintf(stderr, "Usage: %s [-p host:port] [-t count] 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");
 }