diff options
| author |   cedric <cedric@openbsd.org> | 2004-06-14 20:38:19 +0000 |
|---|---|---|
| committer | cedric <cedric@openbsd.org> | 2004-06-14 20:38:19 +0000 |
| commit | 9bde19f466b4f20c6336dbd3c0b3e5227e7a1f28 (patch) | |
| tree | e71eb81c0f3c4525103ffc33331b78f3f7fe8db9 | |
| parent | Set relay session id in outgoing packets properly. Report with patch (diff) | |
| download | wireguard-openbsd-9bde19f466b4f20c6336dbd3c0b3e5227e7a1f28.tar.xz wireguard-openbsd-9bde19f466b4f20c6336dbd3c0b3e5227e7a1f28.zip | |
Use new ioctls. ok beck@ henning@
| -rw-r--r-- | usr.sbin/authpf/authpf.c | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/usr.sbin/authpf/authpf.c b/usr.sbin/authpf/authpf.c index a359bb20cfd..7c49ea0f3b8 100644 --- a/usr.sbin/authpf/authpf.c +++ b/usr.sbin/authpf/authpf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authpf.c,v 1.83 2004/05/21 23:10:49 dhartmei Exp $ */ +/* $OpenBSD: authpf.c,v 1.84 2004/06/14 20:38:19 cedric Exp $ */ /* * Copyright (C) 1998 - 2002 Bob Beck (beck@openbsd.org). @@ -563,8 +563,6 @@ static int remove_stale_rulesets(void) { struct pfioc_ruleset prs; - const int action[PF_RULESET_MAX] = { PF_SCRUB, - PF_PASS, PF_NAT, PF_BINAT, PF_RDR }; u_int32_t nr, mnr; memset(&prs, 0, sizeof(prs)); @@ -595,20 +593,25 @@ remove_stale_rulesets(void) (*s && (t == prs.name || *s != ')'))) return (1); if (kill(pid, 0) && errno != EPERM) { - int i; - - for (i = 0; i < PF_RULESET_MAX; ++i) { - struct pfioc_rule pr; - - memset(&pr, 0, sizeof(pr)); - snprintf(pr.anchor, sizeof(pr.anchor), + int i; + struct pfioc_trans_e t_e[PF_RULESET_MAX+1]; + struct pfioc_trans t; + + bzero(&t, sizeof(t)); + bzero(t_e, sizeof(t_e)); + t.size = PF_RULESET_MAX+1; + t.esize = sizeof(t_e[0]); + t.array = t_e; + for (i = 0; i < PF_RULESET_MAX+1; ++i) { + t_e[i].rs_num = i; + snprintf(t_e[i].anchor, sizeof(t_e[i].anchor), "%s/%s", anchorname, prs.name); - pr.rule.action = action[i]; - if ((ioctl(dev, DIOCBEGINRULES, &pr) || - ioctl(dev, DIOCCOMMITRULES, &pr)) && - errno != EINVAL) - return (1); } + t_e[PF_RULESET_MAX].rs_num = PF_RULESET_TABLE; + if ((ioctl(dev, DIOCXBEGIN, &t) || + ioctl(dev, DIOCXCOMMIT, &t)) && + errno != EINVAL) + return (1); mnr--; } else nr++; |