DeforaNetworks/fwknop
DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Added --pcap-filter to the fwknopd command line

Browse Source 
To override the value of the PCAP_FILTER variable in the fwknopd.conf
config file, a new fwknopd command line argument "--pcap-filter" was
added.  This assists in various activities by making it trivial to
change how fwknopd acquires packet data without editing the fwknopd.conf
file.  Here is an example:

fwknopd -i lo -f --pcap-filter "udp port 12345"
This commit is contained in:
Michael Rash 2011-08-10 22:38:01 -04:00
parent 1e47243574
commit d2c5085843
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/fwknopd.man.asciidoc
View File

@ -50,7 +50,7 @@ COMMAND-LINE OPTIONS
*-D, --Dump-config*:: *-D, --Dump-config*::
Dump the configuration values that *fwknopd* derives from the Dump the configuration values that *fwknopd* derives from the
'fwknop.conf' (or override files) and 'access.conf' on stderr. 'fwknopd.conf' (or override files) and 'access.conf' on stderr.
*-i, --interface*='<interface>':: *-i, --interface*='<interface>'::
Manually specify interface on which to sniff, e.g. ``-i eth0''. This Manually specify interface on which to sniff, e.g. ``-i eth0''. This
@ -75,9 +75,14 @@ COMMAND-LINE OPTIONS
*-O, --Override-config*='<file>':: *-O, --Override-config*='<file>'::
Override config variable values that are normally read from the Override config variable values that are normally read from the
'fwknop.conf' file with values from the specified file. Multiple 'fwknopd.conf' file with values from the specified file. Multiple
override config files can be given as a comma-separated list. override config files can be given as a comma-separated list.
*-P, --pcap-filter*='<filter>'::
Specify a Berkeley packet filter statement on the *fwknopd* command
line. This overrides the value of the PCAP_FILTER variable taken
from the 'fwknopd.conf' file.
*-R, --Restart*:: *-R, --Restart*::
Restart the currently running *fwknopd* processes. This option Restart the currently running *fwknopd* processes. This option
will preserve the command line options that were supplied to the will preserve the command line options that were supplied to the
@ -369,7 +374,7 @@ directive starts a new stanza.
FILES FILES
----- -----
*fwknop.conf*:: *fwknopd.conf*::
The main configuration file for fwknop. The main configuration file for fwknop.
*access.conf*:: *access.conf*::

5
server/config_init.c
View File

@ -661,6 +661,9 @@ config_init(fko_srv_options_t *opts, int argc, char **argv)
case 'O': case 'O':
/* This was handled earlier */ /* This was handled earlier */
break; break;
case 'P':
set_config_entry(opts, CONF_PCAP_FILTER, optarg);
break;
case ROTATE_DIGEST_CACHE: case ROTATE_DIGEST_CACHE:
opts->rotate_digest_cache = 1; opts->rotate_digest_cache = 1;
break; break;
@ -734,6 +737,8 @@ usage(void)
" default.\n" " default.\n"
" -O, --override-config - Specify a file with configuration entries that will\n" " -O, --override-config - Specify a file with configuration entries that will\n"
" overide those in fwknopd.conf\n" " overide those in fwknopd.conf\n"
" -P, --pcap-filter - Specify a Berkeley packet filter statement to\n"
" override the PCAP_FILTER variable in fwknopd.conf.\n"
" -R, --restart - Force the currently running fwknopd to restart.\n" " -R, --restart - Force the currently running fwknopd to restart.\n"
" --rotate-digest-cache\n" " --rotate-digest-cache\n"
" - Rotate the digest cache file by renaming it to\n" " - Rotate the digest cache file by renaming it to\n"

3
server/config_init.h
View File

@ -66,7 +66,7 @@ enum {
/* Our getopt_long options string. /* Our getopt_long options string.
*/ */
#define GETOPTS_OPTION_STRING "a:c:C:Dfhi:Kl:O:RSvV" #define GETOPTS_OPTION_STRING "a:c:C:Dfhi:Kl:O:P:RSvV"
/* Our program command-line options... /* Our program command-line options...
*/ */
@ -85,6 +85,7 @@ static struct option cmd_opts[] =
{"locale", 1, NULL, 'l' }, {"locale", 1, NULL, 'l' },
{"rotate-digest-cache", 0, NULL, ROTATE_DIGEST_CACHE }, {"rotate-digest-cache", 0, NULL, ROTATE_DIGEST_CACHE },
{"override-config", 1, NULL, 'O' }, {"override-config", 1, NULL, 'O' },
{"pcap-filter", 1, NULL, 'P'},
{"restart", 0, NULL, 'R'}, {"restart", 0, NULL, 'R'},
{"status", 0, NULL, 'S'}, {"status", 0, NULL, 'S'},
{"verbose", 0, NULL, 'v'}, {"verbose", 0, NULL, 'v'},