Merging upstream version 2.13.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 09:09:20 +01:00
parent 1127f857c6
commit 47ff516289
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
10 changed files with 53 additions and 11 deletions

View file

@ -587,6 +587,7 @@ setup(int argc, char** argv, config_t* config)
const char* doh_uri = DEFAULT_DOH_URI;
const char* doh_method = DEFAULT_DOH_METHOD;
const char* local_suppress = 0;
const char* tls_sni = 0;
memset(config, 0, sizeof(*config));
config->argc = argc;
@ -681,6 +682,8 @@ setup(int argc, char** argv, config_t* config)
#endif
perf_long_opt_add("qps-threshold-wait", perf_opt_zpint, "microseconds",
"minimum threshold for enabling wait in rate limiting", stringify(config->qps_threshold_wait), &config->qps_threshold_wait);
perf_long_opt_add("tls-sni", perf_opt_string, "tls_sni",
"the TLS SNI to use for TLS connections", NULL, &tls_sni);
bool log_stdout = false;
perf_opt_add('W', perf_opt_boolean, NULL, "log warnings and errors to stdout instead of stderr", NULL, &log_stdout);
@ -710,6 +713,10 @@ setup(int argc, char** argv, config_t* config)
}
}
if (tls_sni) {
perf_net_tls_sni = tls_sni;
}
if (doh_uri) {
perf_net_doh_parse_uri(doh_uri);
}