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

[server] consolidate chain creation within mk_chain()

Browse Source
This commit is contained in:
Michael Rash 2015-04-12 16:05:01 -07:00
parent c0f3ed38a8
commit 1e9f7e94f0
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/fw_util_firewalld.c
View File

@ -682,7 +682,7 @@ mk_chain(const fko_srv_options_t * const opts, const int chain_num)
/* Make sure the required chain and jump rule exist
*/
if(! chain_exists(opts, chain_num))
if (! create_chain(opts, chain_num))
if(! create_chain(opts, chain_num))
err++;
if (jump_rule_exists(opts, chain_num))

30
server/fw_util_iptables.c
View File

@ -676,15 +676,19 @@ create_chain(const fko_srv_options_t * const opts, const int chain_num)
static void
mk_chain(const fko_srv_options_t * const opts, const int chain_num)
{
int err = 0;
/* Make sure the required chain and jump rule exist
*/
if(chain_exists(opts, chain_num) == 0)
create_chain(opts, chain_num);
if(! chain_exists(opts, chain_num))
if(! create_chain(opts, chain_num))
err++;
if (jump_rule_exists(opts, chain_num) == 0)
add_jump_rule(opts, chain_num);
if (! jump_rule_exists(opts, chain_num))
if(! add_jump_rule(opts, chain_num))
err++;
return;
return err;
}
/* Create the fwknop custom chains (at least those that are configured).
@ -699,21 +703,7 @@ create_fw_chains(const fko_srv_options_t * const opts)
if(fwc.chain[i].target[0] == '\0')
continue;
if(chain_exists(opts, i) == 0)
{
/* Create the chain
*/
if(! create_chain(opts, i))
got_err++;
/* Then create the jump rule to that chain if it
* doesn't already exist (which is possible)
*/
if(jump_rule_exists(opts, i) == 0)
if(! add_jump_rule(opts, i))
got_err++;
}
got_err += mk_chain(opts, i);
}
return(got_err);