DeforaNetworks/fwknop
3
0
Fork 0
Code Releases Activity

Added linking libnfnetlink. Tweaks to get NFQ working with firewalld.

Browse Source
This commit is contained in:
Damien Stuart
2015-12-20 23:46:32 -05:00
parent ba611a2d2c
commit db28efae25
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/Makefile.am
+2 -2
View File
@@ -30,7 +30,7 @@ if WANT_C_UNIT_TESTS
fwknopd_utests_LDFLAGS = -lcunit $(GPGME_LIBS)
if NFQ_CAPTURE
fwknopd_utests_LDFLAGS += -lnetfilter_queue
fwknopd_utests_LDFLAGS += -lnetfilter_queue -lnfnetlink
else
if !UDP_SERVER
fwknopd_utests_LDFLAGS += -lpcap
@@ -40,7 +40,7 @@ endif
endif
if NFQ_CAPTURE
fwknopd_LDADD += -lnetfilter_queue
fwknopd_LDADD += -lnetfilter_queue -lnfnetlink
else
if !UDP_SERVER
fwknopd_LDADD += -lpcap
server/config_init.c
+5 -6
View File
@@ -905,13 +905,12 @@ validate_options(fko_srv_options_t *opts)
/* Enable NFQ Capture
*/
if(opts->config[CONF_ENABLE_NFQ_CAPTURE] == NULL)
{
if((strncasecmp(DEF_ENABLE_NFQ_CAPTURE, "Y", 1) == 0) &&
!opts->enable_nfq_capture)
{
opts->enable_nfq_capture = 1;
}
set_config_entry(opts, CONF_ENABLE_NFQ_CAPTURE, DEF_ENABLE_NFQ_CAPTURE);
if((strncasecmp(opts->config[CONF_ENABLE_NFQ_CAPTURE], "Y", 1) == 0) &&
!opts->enable_nfq_capture)
{
opts->enable_nfq_capture = 1;
}
/* NFQ Interface
server/fw_util_firewalld.c
+8 -5
View File
@@ -709,7 +709,7 @@ delete_all_chains(const fko_srv_options_t * const opts)
/* Delete the rule to direct traffic to the NFQ chain.
*/
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_DEL_RULE_ARGS,
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_DEL_RULE_ARGS,
fwc.fw_command,
opts->config[CONF_NFQ_TABLE],
"INPUT",
@@ -730,7 +730,7 @@ delete_all_chains(const fko_srv_options_t * const opts)
/* Flush the NFQ chain
*/
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_FLUSH_CHAIN_ARGS,
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_FLUSH_CHAIN_ARGS,
fwc.fw_command,
opts->config[CONF_NFQ_TABLE],
opts->config[CONF_NFQ_CHAIN]
@@ -750,7 +750,7 @@ delete_all_chains(const fko_srv_options_t * const opts)
/* Delete the NF_QUEUE chains and rules
*/
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_DEL_CHAIN_ARGS,
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_DEL_CHAIN_ARGS,
fwc.fw_command,
opts->config[CONF_NFQ_TABLE],
opts->config[CONF_NFQ_CHAIN]
@@ -827,6 +827,9 @@ static int
create_fw_chains(const fko_srv_options_t * const opts)
{
int i, got_err = 0;
#if USE_LIBNETFILTER_QUEUE
int res = 0;
#endif
for(i=0; i < NUM_FWKNOP_ACCESS_TYPES; i++)
{
@@ -842,7 +845,7 @@ create_fw_chains(const fko_srv_options_t * const opts)
/* Create the NF_QUEUE chains and rules
*/
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_NEW_CHAIN_ARGS,
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_NEW_CHAIN_ARGS,
fwc.fw_command,
opts->config[CONF_NFQ_TABLE],
opts->config[CONF_NFQ_CHAIN]
@@ -865,7 +868,7 @@ create_fw_chains(const fko_srv_options_t * const opts)
/* Create the rule to direct traffic to the NFQ chain.
*/
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_ADD_JUMP_RULE_ARGS,
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " FIREWD_ADD_JUMP_RULE_ARGS,
fwc.fw_command,
opts->config[CONF_NFQ_TABLE],
"INPUT",