From cdc7b8fe5767714ae65a9c691ce53398819774ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jerry=20Lundstr=C3=B6m?= Date: Tue, 14 May 2024 14:46:52 +0200 Subject: [PATCH] DoH reuse addr/port - `dumdohd`: Fix #31: - Add `-A` to reuse address - Add `-R` to reuse port --- src/dumdohd.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/dumdohd.c b/src/dumdohd.c index df8c925..f20789c 100644 --- a/src/dumdohd.c +++ b/src/dumdohd.c @@ -32,6 +32,7 @@ int random_disconnect = 0; int listen_backlog = 10; +int conn_flags = 0; unsigned long long random_disconnected = 0, random_disconnect_checks = 0; #define OUTPUT_WOULDBLOCK_THRESHOLD (1 << 16) @@ -844,7 +845,7 @@ static void start_listen(struct event_base* evbase, const char* service, for (rp = res; rp; rp = rp->ai_next) { struct evconnlistener* listener; listener = evconnlistener_new_bind( - evbase, acceptcb, app_ctx, LEV_OPT_CLOSE_ON_FREE | LEV_OPT_REUSEABLE, + evbase, acceptcb, app_ctx, LEV_OPT_CLOSE_ON_FREE | conn_flags, listen_backlog, rp->ai_addr, (int)rp->ai_addrlen); if (listener) { freeaddrinfo(res); @@ -887,6 +888,8 @@ static void usage(void) "usage: dumdohd [options] \n" /* -o description .*/ " -D Do random disconnect on receive, 0-100 (percent)\n" + " -A Use LEV_OPT_REUSEABLE on sockets\n" + " -R Use LEV_OPT_REUSEABLE_PORT on sockets\n" " -Q Use specified listen() queue size\n" " -h Print this help and exit\n" " -V Print version and exit\n"); @@ -900,7 +903,7 @@ static void version(void) int main(int argc, char** argv) { int opt; - while ((opt = getopt(argc, argv, "D:hVQ:")) != -1) { + while ((opt = getopt(argc, argv, "D:ARhVQ:")) != -1) { switch (opt) { case 'D': random_disconnect = atoi(optarg); @@ -910,6 +913,14 @@ int main(int argc, char** argv) } break; + case 'A': + conn_flags |= LEV_OPT_REUSEABLE; + break; + + case 'R': + conn_flags |= LEV_OPT_REUSEABLE_PORT; + break; + case 'h': usage(); return 0;