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

[server] add --run-dir command line arg

Browse Source
This commit is contained in:
Michael Rash 2014-11-25 22:06:56 -05:00
parent 82cf8b1c9c
commit a64542c7a4
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
doc/fwknopd.man.asciidoc
View File

@ -167,6 +167,10 @@ COMMAND-LINE OPTIONS
starting a new one. The digest cache file is typically found in
'@localstatedir@/run/fwknop/digest.cache'.
*-r, --run-dir*='<path>'::
Specify the directory where *fwknopd* writes run time state files. The
default is '@localstatedir@/run'.
*-S, --status*::
Display the status of any *fwknopd* processes that may or not be
running. If there is an existing fwknopd process then 0 is returned for the
@ -331,6 +335,23 @@ See the '@sysconfdir@/fwknop/fwknopd.conf' file for the full list and correspond
Note that fwknopd still only gets its data via pcap, so the filter
defined by PCAP_FILTER needs to be updated to include this TCP port.
*TCPSERV_PORT* '<port>'::
Set the port number that the ``dummy'' TCP server listens on. This server
is only spawned when ``ENABLE_TCP_SERVER'' is set to ``Y''.
*ENABLE_UDP_SERVER* '<Y/N>'::
Enable the *fwknopd* UDP server. This instructs *fwknopd* to acquire SPA
packets via a UDP socket directly without having to use libpcap. When this
mode is enabled, *fwknop* should be compiled with *--enable-udp-server*
(passed to the *configure* script) so that libpcap can be removed as a
dependency. As one would expect, when the UDP server is used, no incoming
packets are ever acknowledged by *fwknopd* and therefore collecting SPA
packets in this mode is a good alternative to sniffing the wire directly.
*UDPSERV_PORT* '<port>'::
Set the port number that the UDP server listens on. This server
is only spawned when ``ENABLE_UDP_SERVER'' is set to ``Y''.
*PCAP_DISPATCH_COUNT* '<count>'::
Sets the number of packets that are processed when the *pcap_dispatch()*
call is made. The default is zero, since this allows *fwknopd* to process
@ -356,23 +377,6 @@ See the '@sysconfdir@/fwknop/fwknopd.conf' file for the full list and correspond
packets that are received on the sniffing interface (note that this is
independent of promiscuous mode).
*TCPSERV_PORT* '<port>'::
Set the port number that the ``dummy'' TCP server listens on. This server
is only spawned when ``ENABLE_TCP_SERVER'' is set to ``Y''.
*ENABLE_UDP_SERVER* '<Y/N>'::
Enable the *fwknopd* UDP server. This instructs *fwknopd* to acquire SPA
packets via a UDP socket directly without having to use libpcap. When this
mode is enabled, *fwknop* should be compiled with *--enable-udp-server*
(passed to the *configure* script) so that libpcap can be removed as a
dependency. As one would expect, when the UDP server is used, no incoming
packets are ever acknowledged by *fwknopd* and therefore collecting SPA
packets in this mode is a good alternative to sniffing the wire directly.
*UDPSERV_PORT* '<port>'::
Set the port number that the UDP server listens on. This server
is only spawned when ``ENABLE_UDP_SERVER'' is set to ``Y''.
*SYSLOG_IDENTITY* '<identity>'::
Override syslog identity on message logged by *fwknopd*. The defaults
are usually ok.
@ -381,6 +385,9 @@ See the '@sysconfdir@/fwknop/fwknopd.conf' file for the full list and correspond
Override syslog facility. The ``SYSLOG_FACILITY'' variable can be set to
one of ``LOG_LOCAL{0-7}'' or ``LOG_DAEMON'' (the default).
*FWKNOP_RUN_DIR* '<path>'::
Specify the directory where *fwknopd* writes run time state files. The
default is '@localstatedir@/run'.
ACCESS.CONF VARIABLES
~~~~~~~~~~~~~~~~~~~~~

3
server/cmd_opts.h
View File

@ -153,7 +153,7 @@ enum {
/* Our getopt_long options string.
*/
#define GETOPTS_OPTION_STRING "Aa:c:C:d:Dfhi:Kl:O:p:P:RStUvV"
#define GETOPTS_OPTION_STRING "Aa:c:C:d:Dfhi:Kl:O:p:P:Rr:StUvV"
/* Our program command-line options...
*/
@ -187,6 +187,7 @@ static struct option cmd_opts[] =
{"pcap-filter", 1, NULL, 'P'},
{"pcap-any-direction", 0, NULL, ENABLE_PCAP_ANY_DIRECTION },
{"pid-file", 1, NULL, 'p'},
{"run-dir", 1, NULL, 'r'},
{"restart", 0, NULL, 'R'},
{"status", 0, NULL, 'S'},
{"test", 0, NULL, 't'},

5
server/config_init.c
View File

@ -359,7 +359,6 @@ validate_options(fko_srv_options_t *opts)
if(tmp_path[strlen(tmp_path)-1] != '/')
strlcat(tmp_path, "/", sizeof(tmp_path));
#if USE_FILE_CACHE
strlcat(tmp_path, DEF_DIGEST_CACHE_FILENAME, sizeof(tmp_path));
set_config_entry(opts, CONF_DIGEST_FILE, tmp_path);
@ -1143,6 +1142,9 @@ config_init(fko_srv_options_t *opts, int argc, char **argv)
case 'R':
opts->restart = 1;
break;
case 'r':
set_config_entry(opts, CONF_FWKNOP_RUN_DIR, optarg);
break;
case 'S':
opts->status = 1;
break;
@ -1225,6 +1227,7 @@ usage(void)
" override the PCAP_FILTER variable in fwknopd.conf.\n"
" -R, --restart - Force the currently running fwknopd to restart.\n"
" --rotate-digest-cache\n"
" -r, --run-dir - Set path to local state run directory.\n"
" - Rotate the digest cache file by renaming it to\n"
" '<name>-old', and starting a new one.\n"
" -S, --status - Display the status of any running fwknopd process.\n"