Merge pull request #153 from rdebath/master

Move hexdump to verbose level 2
This commit is contained in:
yrutschle 2017-11-28 21:05:50 +01:00 committed by GitHub
commit 85b94c3259
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

View File

@ -299,7 +299,7 @@ int probe_client_protocol(struct connection *cnx)
* connection will just fail later normally). */
/* Dump hex values of the packet */
if (verbose) {
if (verbose>1) {
fprintf(stderr, "hexdump of incoming packet:\n");
hexdump(buffer, n);
}

View File

@ -375,7 +375,10 @@ static int config_parse(char *filename, struct addrinfo **listen, struct proto *
return 1;
}
config_lookup_bool(&config, "verbose", &verbose);
if(config_lookup_bool(&config, "verbose", &verbose) == CONFIG_FALSE) {
config_lookup_int(&config, "verbose", &verbose);
}
config_lookup_bool(&config, "inetd", &inetd);
config_lookup_bool(&config, "foreground", &foreground);
config_lookup_bool(&config, "numeric", &numeric);