d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ipfw range deletion.

Browse Source 
Spotted by:	ian,julian
This commit is contained in:
melifaro 2015-08-03 14:31:06 +00:00
parent 04e6a60087
commit bcaee5870c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sbin/ipfw/ipfw2.c
View File

@ -3033,9 +3033,10 @@ fill_flags_cmd(ipfw_insn *cmd, enum ipfw_opcodes opcode,
void
ipfw_delete(char *av[])
{
int i;
int i, j;
int exitval = EX_OK;
int do_set = 0;
char *sep;
ipfw_range_tlv rt;
av++;
@ -3053,7 +3054,11 @@ ipfw_delete(char *av[])
/* Rule number */
while (*av && isdigit(**av)) {
i = atoi(*av); av++;
i = strtol(*av, &sep, 10);
j = i;
if (*sep== '-')
j = strtol(sep + 1, NULL, 10);
av++;
if (co.do_nat) {
exitval = do_cmd(IP_FW_NAT_DEL, &i, sizeof i);
if (exitval) {
@ -3068,7 +3073,7 @@ ipfw_delete(char *av[])
rt.flags = IPFW_RCFLAG_SET;
} else {
rt.start_rule = i & 0xffff;
rt.end_rule = i & 0xffff;
rt.end_rule = j & 0xffff;
if (rt.start_rule == 0 && rt.end_rule == 0)
rt.flags |= IPFW_RCFLAG_ALL;
else