X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Ftlsproxy.c;h=7c7013383e3bf948c75742c6327a7308d0c8e4c3;hb=8f00cc8238c41fb6140b247363aeddf1e1bb7e02;hp=ab9c6dff6c848b53597c2195662f752cf7ad940c;hpb=4aa2eea6b3115cab6f3165c4391d523d5df61e51;p=tlsproxy%2Ftlsproxy.git

diff --git a/src/tlsproxy.c b/src/tlsproxy.c
index ab9c6df..7c70133 100644
--- a/src/tlsproxy.c
+++ b/src/tlsproxy.c
@@ -17,11 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "tlsproxy.h"
+#include "sem.h"
+#include "connection.h"
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 /* socket(), bind(), accept(), listen() */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -36,10 +35,6 @@
 /* pthread_*() */
 #include <pthread.h>
 
-#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;
     }
 
@@ -232,7 +227,8 @@ 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);
                 }
 
@@ -255,7 +251,8 @@ static void parse_arguments(int argc, char **argv) {
             }
             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,6 +267,7 @@ static void parse_arguments(int argc, char **argv) {
 
     if (optind >= argc) {
         print_usage(argv[0]);
+        fprintf(stderr, "\nport missing\n");
         exit(EXIT_FAILURE);
     }
 }
@@ -293,7 +291,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;
         }