diff options
| author | Werner Koch <wk@gnupg.org> | 2009-12-03 19:04:40 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2009-12-03 19:04:40 +0100 |
| commit | cb5491bfaf8f9c24652af8f02ac21ca2a1cb884d (patch) | |
| tree | 884ff5e015bd066e13e1e920566b3445db8c9503 /scd | |
| parent | Fix usage of realloc. (diff) | |
| download | gnupg2-cb5491bfaf8f9c24652af8f02ac21ca2a1cb884d.tar.xz gnupg2-cb5491bfaf8f9c24652af8f02ac21ca2a1cb884d.zip | |
support numeric debug levels.
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 5 | ||||
| -rw-r--r-- | scd/scdaemon.c | 35 |
2 files changed, 34 insertions, 6 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 965e07bbb..fed5e0e46 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,8 @@ +2009-12-03 Werner Koch <wk@g10code.com> + + * scdaemon.c (set_debug): Allow for numerical debug leveles. Print + active debug flags. + 2009-11-25 Marcus Brinkmann <marcus@g10code.de> * command.c (scd_command_handler): Use assuan_fd_t and diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 5823c9948..fd7d6a22f 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -289,19 +289,30 @@ tid_log_callback (void) static void set_debug (const char *level) { + int numok = (level && digitp (level)); + int numlvl = numok? atoi (level) : 0; + if (!level) ; - else if (!strcmp (level, "none")) + else if (!strcmp (level, "none") || (numok && numlvl < 1)) opt.debug = 0; - else if (!strcmp (level, "basic")) + else if (!strcmp (level, "basic") || (numok && numlvl <= 2)) opt.debug = DBG_ASSUAN_VALUE; - else if (!strcmp (level, "advanced")) + else if (!strcmp (level, "advanced") || (numok && numlvl <= 5)) opt.debug = DBG_ASSUAN_VALUE|DBG_COMMAND_VALUE; - else if (!strcmp (level, "expert")) + else if (!strcmp (level, "expert") || (numok && numlvl <= 8)) opt.debug = (DBG_ASSUAN_VALUE|DBG_COMMAND_VALUE |DBG_CACHE_VALUE|DBG_CARD_IO_VALUE); - else if (!strcmp (level, "guru")) - opt.debug = ~0; + else if (!strcmp (level, "guru") || numok) + { + opt.debug = ~0; + /* Unless the "guru" string has been used we don't want to allow + hashing debugging. The rationale is that people tend to + select the highest debug value and would then clutter their + disk with debug files which may reveal confidential data. */ + if (numok) + opt.debug &= ~(DBG_HASHING_VALUE); + } else { log_error (_("invalid debug-level `%s' given\n"), level); @@ -319,6 +330,18 @@ set_debug (const char *level) if (opt.debug & DBG_CRYPTO_VALUE ) gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1); gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose); + + if (opt.debug) + log_info ("enabled debug flags:%s%s%s%s%s%s%s%s%s\n", + (opt.debug & DBG_COMMAND_VALUE)? " command":"", + (opt.debug & DBG_MPI_VALUE )? " mpi":"", + (opt.debug & DBG_CRYPTO_VALUE )? " crypto":"", + (opt.debug & DBG_MEMORY_VALUE )? " memory":"", + (opt.debug & DBG_CACHE_VALUE )? " cache":"", + (opt.debug & DBG_MEMSTAT_VALUE)? " memstat":"", + (opt.debug & DBG_HASHING_VALUE)? " hashing":"", + (opt.debug & DBG_ASSUAN_VALUE )? " assuan":"", + (opt.debug & DBG_CARD_IO_VALUE)? " cardio":""); } |