interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove timeout argument from keepalive test. 

The client doesn't send a timeout value to the server, so there's no point having this argument.
This commit is contained in:
Jim Hague 2018-02-01 16:04:22 +00:00
parent 3b5657e580
commit a25f832d8a
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tools/getdns_server_mon.c
View File

@ -330,8 +330,7 @@ static void usage()
"\n" "\n"
"Tests:\n" "Tests:\n"
" lookup [<name> [<type>]] Check lookup on server\n" " lookup [<name> [<type>]] Check lookup on server\n"
" keepalive <timeout-ms> [<name> [<type>]]\n" " keepalive [<name> [<type>]] Check server support for EDNS0 keepalive in\n"
" Check server support for EDNS0 keepalive in\n"
" TCP or TLS connections\n" " TCP or TLS connections\n"
" Timeout of 0 is off.\n" " Timeout of 0 is off.\n"
" OOOR Check whether server delivers responses out of\n" " OOOR Check whether server delivers responses out of\n"
@ -1262,18 +1261,9 @@ static exit_value test_keepalive(struct test_info_s *test_info,
{ {
getdns_dict *response; getdns_dict *response;
exit_value xit; exit_value xit;
long long timeout;
char *endptr;
const char USAGE[] = "keepalive takes arguments <timeout-ms> [<name> [<type>]]";
if (!*av || (timeout = strtoll(*av, &endptr, 10), *endptr != '\0' || timeout < 0)) {
strcpy(test_info->base_output, USAGE);
return EXIT_USAGE;
}
++av;
getdns_return_t ret; getdns_return_t ret;
if ((ret = getdns_context_set_idle_timeout(test_info->context, (uint64_t) timeout)) != GETDNS_RETURN_GOOD) { if ((ret = getdns_context_set_idle_timeout(test_info->context, 1)) != GETDNS_RETURN_GOOD) {
snprintf(test_info->base_output, snprintf(test_info->base_output,
MAX_BASE_OUTPUT_LEN, MAX_BASE_OUTPUT_LEN,
"Cannot set keepalive timeout: %s (%d)", "Cannot set keepalive timeout: %s (%d)",
@ -1284,7 +1274,7 @@ static exit_value test_keepalive(struct test_info_s *test_info,
if ((xit = parse_search_check(test_info, if ((xit = parse_search_check(test_info,
av, av,
USAGE, "keepalive takes arguments [<name> [<type>]]",
&response, &response,
NULL, NULL,
NULL, NULL,