From 6531fe2150971068f734791bea19419f679e6d33 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Wed, 7 Nov 2001 14:18:26 +0000 Subject: [PATCH] updates --- README.CVS | 14 ++++++++++---- apps/silcd/server.c | 4 ++-- apps/silcd/silcd.c | 7 ++++--- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/README.CVS b/README.CVS index 3c0f45dc..1835d121 100644 --- a/README.CVS +++ b/README.CVS @@ -171,10 +171,16 @@ SILC_LOG_DEBUG* scripts. Warning is due here: The debugging produced by both cilent and server is very heavy, thus it is common to test the programs as follows: - ./silc -d -f configfile 2>log - ./silcd -d -f configfile 2>log - -Do not give the -d options if you do not want to dump the debugging. + ./silc -d "*" -f configfile 2>log + ./silcd -d "*" -f configfile 2>log + +The -d option enables the debug printing. The argument for the -d option +is a string that is used to match the output debug. The example "*" will +match for everything, and all debugs will be printed. If you want to +limit the debugs you want to printout you can give for example a string +like "*server*,*rng*" to match all functions, and filenames that has +"server" or "rng" string in them. Others will not be printed out. You +can freely define regural expressions as debug string. Howto Clean SILC Source Tree diff --git a/apps/silcd/server.c b/apps/silcd/server.c index 31ae8877..d7fc856c 100644 --- a/apps/silcd/server.c +++ b/apps/silcd/server.c @@ -1507,11 +1507,11 @@ SILC_TASK_CALLBACK(silc_server_packet_process) if (ret == -1) SILC_LOG_ERROR(("Error receiving packet from connection " - "%s:%d [%s]", sock->hostname, sock->port, + "%s:%d [%s] %s", sock->hostname, sock->port, (sock->type == SILC_SOCKET_TYPE_UNKNOWN ? "Unknown" : sock->type == SILC_SOCKET_TYPE_CLIENT ? "Client" : sock->type == SILC_SOCKET_TYPE_SERVER ? "Server" : - "Router"))); + "Router"), strerror(errno))); return; } diff --git a/apps/silcd/silcd.c b/apps/silcd/silcd.c index abc53ac7..8dfa1e49 100644 --- a/apps/silcd/silcd.c +++ b/apps/silcd/silcd.c @@ -41,7 +41,7 @@ silc_server_create_key_pair(char *pkcs_name, int bits, char *path, static struct option long_opts[] = { { "config-file", 1, NULL, 'f' }, - { "debug", 0, NULL, 'd' }, + { "debug", 1, NULL, 'd' }, { "help", 0, NULL, 'h' }, { "version", 0, NULL,'V' }, @@ -70,7 +70,7 @@ Usage: silcd [options]\n\ \n\ Generic Options:\n\ -f --config-file=FILE Alternate configuration file\n\ - -d --debug Enable debugging (no daemon)\n\ + -d --debug=string Enable debugging (no daemon)\n\ -h --help Display this message\n\ -V --version Display version\n\ \n\ @@ -108,7 +108,7 @@ int main(int argc, char **argv) /* Parse command line arguments */ if (argc > 1) { - while ((opt = getopt_long(argc, argv, "cf:dhVC:", + while ((opt = getopt_long(argc, argv, "cf:d:hVC:", long_opts, &option_index)) != EOF) { switch(opt) { @@ -125,6 +125,7 @@ int main(int argc, char **argv) break; case 'd': silc_debug = TRUE; + silc_log_set_debug_string(optarg); break; case 'f': config_file = strdup(optarg); -- 2.24.0