Add --no-tcp, --no-udp to disable tcp/udp respectively

cofyc · cofyc · commit 073577c06c77 · 2018-12-10T16:04:50.000+08:00
diff --git a/Makefile b/Makefile
@@ -207,6 +207,9 @@ install: all
 uninstall:
 	$(RM) $(sbindir)/dnscrypt-wrapper
 
+test:
+	make -C tests
+
 clean:
 	$(RM) dnscrypt-wrapper
 	$(RM) $(LIB_OBJS)
diff --git a/main.c b/main.c
@@ -451,6 +451,7 @@ main(int argc, const char **argv)
     int verbose = 0;
     int use_xchacha20 = 0;
     int nolog = 0, dnssec = 0, nofilter = 0;
+    bool no_tcp = false, no_udp = false;
     struct argparse argparse;
     struct argparse_option options[] = {
         OPT_HELP(),
@@ -479,6 +480,8 @@ main(int argc, const char **argv)
         OPT_BOOLEAN(0, "dnssec", &dnssec, "indicate that the server supports DNSSEC"),
         OPT_STRING('a', "listen-address", &c.listen_address,
                    "local address to listen (default: 0.0.0.0:53)"),
+        OPT_BOOLEAN(0, "no-udp", &no_udp, "do not listen on UDP"),
+        OPT_BOOLEAN(0, "no-tcp", &no_tcp, "do not listen on TCP"),
         OPT_STRING('b', "blacklist-file", &blacklist_file, "blacklist file"),
         OPT_STRING('E', "ext-address", &c.ext_address, "external IP address"),
         OPT_STRING('r', "resolver-address", &c.resolver_address,
@@ -504,6 +507,15 @@ main(int argc, const char **argv)
 
     argparse_init(&argparse, options, config_usage, 0);
     argparse_parse(&argparse, argc, argv);
+
+    if (no_udp && no_tcp) {
+        fprintf(stderr,
+                "Error: UDP/TCP listeners are both disabled\n\n");
+        argparse_usage(&argparse);
+        exit(1);
+    }
+
+
     if (sodium_init() != 0) {
         return 1;
     }
@@ -846,12 +858,23 @@ main(int argc, const char **argv)
         exit(1);
     }
 
-    if (udp_listener_bind(&c) != 0 || tcp_listener_bind(&c) != 0) {
+	if (!no_udp && udp_listener_bind(&c) != 0) {
+        logger(LOG_ERR, "Failed to bind UDP listener on %s", c.listen_address);
+        exit(1);
+	}
+
+    if (!no_tcp && tcp_listener_bind(&c) != 0) {
+        logger(LOG_ERR, "Failed to bind TCP listener on %s", c.listen_address);
+        exit(1);
+    }
+
+    if (!no_udp && udp_listener_start(&c) != 0) {
+        logger(LOG_ERR, "Unable to start UDP listener on %s", c.listen_address);
         exit(1);
     }
 
-    if (udp_listener_start(&c) != 0 || tcp_listener_start(&c) != 0) {
-        logger(LOG_ERR, "Unable to start udp listener.");
+    if (!no_tcp && tcp_listener_start(&c) != 0) {
+        logger(LOG_ERR, "Unable to start TCP listener on %s", c.listen_address);
         exit(1);
     }
 
diff --git a/tests/Makefile b/tests/Makefile
@@ -1,4 +1,4 @@
-all:
+all: test
 
 test:
 	rake cucumber

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 -all:
 +all: test
 test:
 	rake cucumber