Skip to content

Commit

Permalink
Remove support for IPv6 for rules shared with IPv4
Browse files Browse the repository at this point in the history
  • Loading branch information
@khorben
khorben committed Aug 8, 2018
1 parent e147a6b commit d33c240
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions server/fw_util_iptables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@ rule_exists_no_chk_support(const fko_srv_options_t * const opts,

static int
rule_exists_chk_support(const fko_srv_options_t * const opts,
const char * const chain, const char * const rule, int ipv6)
const char * const chain, const char * const rule)
{
int rule_exists = 0;
int res = 0;

zero_cmd_buffers();

snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_CHK_RULE_ARGS,
ipv6 ? opts->fw_config->fw_command6 : opts->fw_config->fw_command,
opts->fw_config->fw_command,
chain, rule);

res = run_extcmd(cmd_buf, err_buf, CMD_BUFSIZE,
Expand Down Expand Up @@ -239,7 +239,7 @@ rule_exists(const fko_srv_options_t * const opts,
int rule_exists = 0;

if(have_ipt_chk_support == 1)
rule_exists = rule_exists_chk_support(opts, fwc->to_chain, rule, ipv6);
rule_exists = rule_exists_chk_support(opts, fwc->to_chain, rule);
else
rule_exists = rule_exists_no_chk_support(opts, fwc, proto, srcip,
(opts->fw_config->use_destination ? dstip : NULL), port,
Expand Down Expand Up @@ -400,14 +400,14 @@ comment_match_exists(const fko_srv_options_t * const opts, int ipv6)
}

static int
add_jump_rule(const fko_srv_options_t * const opts, const int chain_num, int ipv6)
add_jump_rule(const fko_srv_options_t * const opts, const int chain_num)
{
int res = 0, rv = 0;

zero_cmd_buffers();

snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_ADD_JUMP_RULE_ARGS,
ipv6 ? fwc.fw_command6 : fwc.fw_command,
fwc.fw_command,
fwc.chain[chain_num].table,
fwc.chain[chain_num].from_chain,
fwc.chain[chain_num].jump_rule_pos,
Expand Down Expand Up @@ -435,14 +435,14 @@ add_jump_rule(const fko_srv_options_t * const opts, const int chain_num, int ipv
}

static int
chain_exists(const fko_srv_options_t * const opts, const int chain_num, int ipv6)
chain_exists(const fko_srv_options_t * const opts, const int chain_num)
{
int res = 0;

zero_cmd_buffers();

snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_CHAIN_EXISTS_ARGS,
ipv6 ? fwc.fw_command6 : fwc.fw_command,
fwc.fw_command,
fwc.chain[chain_num].table,
fwc.chain[chain_num].to_chain
);
Expand All @@ -466,7 +466,7 @@ chain_exists(const fko_srv_options_t * const opts, const int chain_num, int ipv6
}

static int
jump_rule_exists_chk_support(const fko_srv_options_t * const opts, const int chain_num, int ipv6)
jump_rule_exists_chk_support(const fko_srv_options_t * const opts, const int chain_num)
{
int exists = 0;
char rule_buf[CMD_BUFSIZE] = {0};
Expand All @@ -476,7 +476,7 @@ jump_rule_exists_chk_support(const fko_srv_options_t * const opts, const int cha
fwc.chain[chain_num].to_chain
);

if(rule_exists_chk_support(opts, fwc.chain[chain_num].from_chain, rule_buf, ipv6) == 1)
if(rule_exists_chk_support(opts, fwc.chain[chain_num].from_chain, rule_buf) == 1)
{
log_msg(LOG_DEBUG, "jump_rule_exists_chk_support() jump rule found");
exists = 1;
Expand Down Expand Up @@ -518,12 +518,12 @@ jump_rule_exists_no_chk_support(const fko_srv_options_t * const opts,
}

static int
jump_rule_exists(const fko_srv_options_t * const opts, const int chain_num, int ipv6)
jump_rule_exists(const fko_srv_options_t * const opts, const int chain_num)
{
int exists = 0;

if(have_ipt_chk_support == 1)
exists = jump_rule_exists_chk_support(opts, chain_num, ipv6);
exists = jump_rule_exists_chk_support(opts, chain_num);
else
exists = jump_rule_exists_no_chk_support(opts, chain_num);

Expand Down Expand Up @@ -696,7 +696,7 @@ delete_all_chains(const fko_srv_options_t * const opts, int ipv6)
* is there.
*/
cmd_ctr = 0;
while(cmd_ctr < CMD_LOOP_TRIES && (jump_rule_exists(opts, i, ipv6) == 1))
while(cmd_ctr < CMD_LOOP_TRIES && (jump_rule_exists(opts, i) == 1))
{
zero_cmd_buffers();

Expand Down Expand Up @@ -834,7 +834,7 @@ delete_all_chains(const fko_srv_options_t * const opts, int ipv6)
}

static int
create_chain(const fko_srv_options_t * const opts, const int chain_num, int ipv6)
create_chain(const fko_srv_options_t * const opts, const int chain_num)
{
int res = 0, rv = 0;

Expand All @@ -843,7 +843,7 @@ create_chain(const fko_srv_options_t * const opts, const int chain_num, int ipv6
/* Create the custom chain.
*/
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_NEW_CHAIN_ARGS,
ipv6 ? fwc.fw_command6 : fwc.fw_command,
fwc.fw_command,
fwc.chain[chain_num].table,
fwc.chain[chain_num].to_chain
);
Expand All @@ -866,18 +866,18 @@ create_chain(const fko_srv_options_t * const opts, const int chain_num, int ipv6
}

static int
mk_chain(const fko_srv_options_t * const opts, const int chain_num, int ipv6)
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, ipv6))
if(! create_chain(opts, chain_num, ipv6))
if(! chain_exists(opts, chain_num))
if(! create_chain(opts, chain_num))
err++;

if (! jump_rule_exists(opts, chain_num, ipv6))
if(! add_jump_rule(opts, chain_num, ipv6))
if (! jump_rule_exists(opts, chain_num))
if(! add_jump_rule(opts, chain_num))
err++;

return err;
Expand All @@ -898,7 +898,7 @@ create_fw_chains(const fko_srv_options_t * const opts, int ipv6)
if(fwc.chain[i].target[0] == '\0')
continue;

got_err += mk_chain(opts, i, ipv6);
got_err += mk_chain(opts, i);
}

#if USE_LIBNETFILTER_QUEUE
Expand Down Expand Up @@ -932,7 +932,7 @@ create_fw_chains(const fko_srv_options_t * const opts, int ipv6)
/* Create the rule to direct traffic to the NFQ chain.
*/
snprintf(cmd_buf, CMD_BUFSIZE-1, "%s " IPT_ADD_JUMP_RULE_ARGS,
ipv6 ? fwc.fw_command6 : fwc.fw_command,
fwc.fw_command,
opts->config[CONF_NFQ_TABLE],
"INPUT",
1,
Expand Down Expand Up @@ -1301,7 +1301,7 @@ ipt_rule(const fko_srv_options_t * const opts,

/* Check to make sure that the chain and jump rule exist
*/
mk_chain(opts, chain->type, ipv6);
mk_chain(opts, chain->type);

if(rule_exists(opts, chain, rule_buf, proto, srcip,
dstip, port, nat_ip, nat_port, exp_ts, ipv6) == 0)
Expand Down

0 comments on commit d33c240

Please sign in to comment.