diff options
Diffstat (limited to 'net/pf_ioctl.c')
| -rw-r--r-- | net/pf_ioctl.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/net/pf_ioctl.c b/net/pf_ioctl.c index 4c1e18c89d6e..a7546e3649b8 100644 --- a/net/pf_ioctl.c +++ b/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.209 2008/06/29 08:42:15 mcbride Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.213 2009/02/15 21:46:12 mbalmer Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1164,7 +1164,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) if (rule->overload_tblname[0]) { if ((rule->overload_tbl = pfr_attach_table(ruleset, - rule->overload_tblname)) == NULL) + rule->overload_tblname, 0)) == NULL) error = EINVAL; else rule->overload_tbl->pfrkt_flags |= @@ -1401,7 +1401,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) if (newrule->overload_tblname[0]) { if ((newrule->overload_tbl = pfr_attach_table( - ruleset, newrule->overload_tblname)) == + ruleset, newrule->overload_tblname, 0)) == NULL) error = EINVAL; else @@ -1489,16 +1489,16 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) if (!psk->psk_ifname[0] || !strcmp(psk->psk_ifname, s->kif->pfik_name)) { -#if NPFSYNC +#if NPFSYNC > 0 /* don't send out individual delete messages */ - s->sync_flags = PFSTATE_NOSYNC; + SET(s->state_flags, PFSTATE_NOSYNC); #endif pf_unlink_state(s); killed++; } } psk->psk_killed = killed; -#if NPFSYNC +#if NPFSYNC > 0 pfsync_clear_states(pf_status.hostid, psk->psk_ifname); #endif break; @@ -1516,11 +1516,6 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) if (psk->psk_pfcmp.creatorid == 0) psk->psk_pfcmp.creatorid = pf_status.hostid; if ((s = pf_find_state_byid(&psk->psk_pfcmp))) { -#if NPFSYNC > 0 - /* send immediate delete of state */ - pfsync_delete_state(s); - s->sync_flags |= PFSTATE_NOSYNC; -#endif pf_unlink_state(s); psk->psk_killed = 1; } @@ -1566,11 +1561,6 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) !strcmp(psk->psk_label, s->rule.ptr->label))) && (!psk->psk_ifname[0] || !strcmp(psk->psk_ifname, s->kif->pfik_name))) { -#if NPFSYNC > 0 - /* send immediate delete of state */ - pfsync_delete_state(s); - s->sync_flags |= PFSTATE_NOSYNC; -#endif pf_unlink_state(s); killed++; } |