From 8019308b2251077aeca3f2584b34b431d5da6074 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 9 Dec 2021 21:44:59 +0100 Subject: Merging upstream version 2.9.0. Signed-off-by: Daniel Baumann --- src/dnsperf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/dnsperf.c') diff --git a/src/dnsperf.c b/src/dnsperf.c index c3ff297..40cedb4 100644 --- a/src/dnsperf.c +++ b/src/dnsperf.c @@ -89,6 +89,7 @@ typedef struct { bool verbose; enum perf_net_mode mode; perf_suppress_t suppress; + size_t num_queries_per_conn; } config_t; typedef struct { @@ -491,6 +492,8 @@ setup(int argc, char** argv, config_t* config) "the HTTP method to use for DNS-over-HTTPS: GET or POST", DEFAULT_DOH_METHOD, &doh_method); perf_long_opt_add("suppress", perf_opt_string, "message[,message,...]", "suppress messages/warnings, see man-page for list of message types", NULL, &local_suppress); + perf_long_opt_add("num-queries-per-conn", perf_opt_uint, "queries", + "Number of queries to send per connection", NULL, &config->num_queries_per_conn); bool log_stdout = false; perf_opt_add('W', perf_opt_boolean, NULL, "log warnings and errors to stdout instead of stderr", NULL, &log_stdout); @@ -1000,7 +1003,7 @@ do_recv(void* arg) perf_log_warning("received short response"); continue; } - if (recvd[i].unexpected) { + if (recvd[i].unexpected && !tinfo->config->suppress.unexpected) { perf_log_warning("received a response with an " "unexpected (maybe timed out) " "id: %u", @@ -1222,6 +1225,9 @@ threadinfo_init(threadinfo_t* tinfo, const config_t* config, if (!tinfo->socks[i]) { perf_log_fatal("perf_net_opensocket(): no socket returned, out of memory?"); } + if (config->num_queries_per_conn && tinfo->socks[i]->num_queries_per_conn) { + tinfo->socks[i]->num_queries_per_conn(tinfo->socks[i], config->num_queries_per_conn, config->timeout); + } } tinfo->current_sock = 0; -- cgit v1.2.3