[server] add --dump-serv-err-codes for test coverage

This commit is contained in:
Michael Rash 2014-04-29 23:50:54 -04:00
parent 11f3e9b8d3
commit 5f24fc8c5f
4 changed files with 37 additions and 1 deletions

View File

@ -125,6 +125,7 @@ enum {
ENABLE_PCAP_ANY_DIRECTION, ENABLE_PCAP_ANY_DIRECTION,
ROTATE_DIGEST_CACHE, ROTATE_DIGEST_CACHE,
SYSLOG_ENABLE, SYSLOG_ENABLE,
DUMP_SERVER_ERR_CODES,
NOOP /* Just to be a marker for the end */ NOOP /* Just to be a marker for the end */
}; };
@ -141,7 +142,8 @@ static struct option cmd_opts[] =
{"packet-limit", 1, NULL, 'C'}, {"packet-limit", 1, NULL, 'C'},
{"digest-file", 1, NULL, 'd'}, {"digest-file", 1, NULL, 'd'},
{"dump-config", 0, NULL, 'D'}, {"dump-config", 0, NULL, 'D'},
{"syslog-enable", 0, NULL, SYSLOG_ENABLE }, {"dump-serv-err-codes", 0, NULL, DUMP_SERVER_ERR_CODES },
{"syslog-enable", 0, NULL, SYSLOG_ENABLE },
{"foreground", 0, NULL, 'f'}, {"foreground", 0, NULL, 'f'},
{"help", 0, NULL, 'h'}, {"help", 0, NULL, 'h'},
{"interface", 1, NULL, 'i'}, {"interface", 1, NULL, 'i'},

View File

@ -29,6 +29,7 @@
****************************************************************************** ******************************************************************************
*/ */
#include "fwknopd_common.h" #include "fwknopd_common.h"
#include "fwknopd_errors.h"
#include "config_init.h" #include "config_init.h"
#include "access.h" #include "access.h"
#include "cmd_opts.h" #include "cmd_opts.h"
@ -883,6 +884,9 @@ config_init(fko_srv_options_t *opts, int argc, char **argv)
case 'D': case 'D':
opts->dump_config = 1; opts->dump_config = 1;
break; break;
case DUMP_SERVER_ERR_CODES:
dump_server_errors();
clean_exit(opts, NO_FW_CLEANUP, EXIT_SUCCESS);
case 'f': case 'f':
opts->foreground = 1; opts->foreground = 1;
break; break;

View File

@ -106,4 +106,24 @@ get_errstr(const int err_code)
return(fwknopd_errstr(err_code)); return(fwknopd_errstr(err_code));
} }
/* print all server errors (from server/fwknopd_errors.c) to stdout
*/
void
dump_server_errors(void)
{
int i;
for (i=SPA_MSG_BAD_DATA; i<=SPA_MSG_ERROR; i++)
{
fprintf(stdout, "err code: %d, err string: '%s'\n",
i, fwknopd_errstr(i));
}
for (i=FW_RULE_ADD_ERROR; i<=FW_RULE_UNKNOWN_ERROR; i++)
{
fprintf(stdout, "err code: %d, err string: '%s'\n",
i, fwknopd_errstr(i));
}
fflush(stdout);
return;
}
/***EOF***/ /***EOF***/

View File

@ -17,6 +17,16 @@
'cmdline' => "$fwknopdCmd $default_server_conf_args " . 'cmdline' => "$fwknopdCmd $default_server_conf_args " .
"-O $conf_dir/override_fwknopd.conf --dump-config", "-O $conf_dir/override_fwknopd.conf --dump-config",
}, },
{
'category' => 'basic operations',
'subcategory' => 'server',
'detail' => 'dump error codes ',
'function' => \&generic_exec,
'exec_err' => $NO,
'cmdline' => "$fwknopdCmd $default_server_conf_args " .
"--dump-serv-err-codes",
},
{ {
'category' => 'basic operations', 'category' => 'basic operations',
'subcategory' => 'client', 'subcategory' => 'client',