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

Correct r349898. The default is add a rule.

Browse Source 
MFC after:	1 week
X-MFC with:	r349898
This commit is contained in:
Cy Schubert 2019-07-11 19:36:14 +00:00
parent cdd80cac4a
commit 3133f9c2a3
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/contrib/ipfilter/netinet/fil.c
View File

@ -4473,11 +4473,10 @@ frrequest(softc, unit, req, data, set, makecopy)
caddr_t data; caddr_t data;
{ {
int error = 0, in, family, need_free = 0; int error = 0, in, family, need_free = 0;
enum { OP_UNDEF, /* undefined */ enum { OP_ADD, /* add rule */
OP_ADD, /* add rule */ OP_REM, /* remove rule */
OP_REM, /* remove rule */ OP_ZERO /* zero statistics and counters */ }
OP_ZERO /* zero statistics and counters */ } addrem = OP_ADD;
addrem = OP_UNDEF;
frentry_t frd, *fp, *f, **fprev, **ftail; frentry_t frd, *fp, *f, **fprev, **ftail;
void *ptr, *uptr, *cptr; void *ptr, *uptr, *cptr;
u_int *p, *pp; u_int *p, *pp;
@ -4583,7 +4582,7 @@ frrequest(softc, unit, req, data, set, makecopy)
goto donenolock; goto donenolock;
} }
if (addrem == OP_UNDEF) { if (addrem == OP_ADD) {
error = ipf_funcinit(softc, fp); error = ipf_funcinit(softc, fp);
if (error != 0) if (error != 0)
goto donenolock; goto donenolock;
@ -4647,7 +4646,7 @@ frrequest(softc, unit, req, data, set, makecopy)
* them to be created if they don't already exit. * them to be created if they don't already exit.
*/ */
group = FR_NAME(fp, fr_group); group = FR_NAME(fp, fr_group);
if (addrem == OP_UNDEF) { if (addrem == OP_ADD) {
fg = ipf_group_add(softc, group, NULL, fg = ipf_group_add(softc, group, NULL,
fp->fr_flags, unit, set); fp->fr_flags, unit, set);
fp->fr_grp = fg; fp->fr_grp = fg;
@ -5111,7 +5110,7 @@ frrequest(softc, unit, req, data, set, makecopy)
if (fp->fr_next != NULL) if (fp->fr_next != NULL)
fp->fr_next->fr_pnext = &fp->fr_next; fp->fr_next->fr_pnext = &fp->fr_next;
*ftail = fp; *ftail = fp;
if (addrem == OP_UNDEF) if (addrem == OP_ADD)
ipf_fixskip(ftail, fp, 1); ipf_fixskip(ftail, fp, 1);
fp->fr_icmpgrp = NULL; fp->fr_icmpgrp = NULL;