diff options
| author | kn <kn@cvs.openbsd.org> | 2018-12-10 16:48:16 +0000 |
|---|---|---|
| committer | kn <kn@cvs.openbsd.org> | 2018-12-10 16:48:16 +0000 |
| commit | 8f7d43d902801bc373bd61161c92c6a50e2c1e30 (patch) | |
| tree | 6e1d97882e5bf21b45c6b90aea4bcb96f1f4be5a /sys/net/pf_ioctl.c | |
| parent | 6254ab4e5b46b478602584aefefc3538956b8844 (diff) | |
Remove useless macros
These are just unhelpful case conversion.
OK sashan henning
Diffstat (limited to 'sys/net/pf_ioctl.c')
| -rw-r--r-- | sys/net/pf_ioctl.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 1bd62586efc..29061e38a4e 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.338 2018/10/01 19:47:30 kn Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.339 2018/12/10 16:48:15 kn Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1582,9 +1582,9 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) sidx = 1; didx = 0; } - PF_ACPY(&key.addr[sidx], + pf_addrcpy(&key.addr[sidx], &psk->psk_src.addr.v.a.addr, key.af); - PF_ACPY(&key.addr[didx], + pf_addrcpy(&key.addr[didx], &psk->psk_dst.addr.v.a.addr, key.af); key.port[sidx] = psk->psk_src.port[0]; key.port[didx] = psk->psk_dst.port[0]; @@ -1641,11 +1641,11 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) if ((!psk->psk_af || sk->af == psk->psk_af) && (!psk->psk_proto || psk->psk_proto == sk->proto) && psk->psk_rdomain == sk->rdomain && - PF_MATCHA(psk->psk_src.neg, + pf_match_addr(psk->psk_src.neg, &psk->psk_src.addr.v.a.addr, &psk->psk_src.addr.v.a.mask, srcaddr, sk->af) && - PF_MATCHA(psk->psk_dst.neg, + pf_match_addr(psk->psk_dst.neg, &psk->psk_dst.addr.v.a.addr, &psk->psk_dst.addr.v.a.mask, dstaddr, sk->af) && @@ -1822,9 +1822,9 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) key.af = pnl->af; key.proto = pnl->proto; key.rdomain = pnl->rdomain; - PF_ACPY(&key.addr[sidx], &pnl->saddr, pnl->af); + pf_addrcpy(&key.addr[sidx], &pnl->saddr, pnl->af); key.port[sidx] = pnl->sport; - PF_ACPY(&key.addr[didx], &pnl->daddr, pnl->af); + pf_addrcpy(&key.addr[didx], &pnl->daddr, pnl->af); key.port[didx] = pnl->dport; PF_STATE_ENTER_READ(); @@ -1836,9 +1836,11 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) error = E2BIG; /* more than one state */ else if (state != NULL) { sk = state->key[sidx]; - PF_ACPY(&pnl->rsaddr, &sk->addr[sidx], sk->af); + pf_addrcpy(&pnl->rsaddr, &sk->addr[sidx], + sk->af); pnl->rsport = sk->port[sidx]; - PF_ACPY(&pnl->rdaddr, &sk->addr[didx], sk->af); + pf_addrcpy(&pnl->rdaddr, &sk->addr[didx], + sk->af); pnl->rdport = sk->port[didx]; pnl->rrdomain = sk->rdomain; } else @@ -2624,11 +2626,11 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p) PF_LOCK(); RB_FOREACH(sn, pf_src_tree, &tree_src_tracking) { - if (PF_MATCHA(psnk->psnk_src.neg, + if (pf_match_addr(psnk->psnk_src.neg, &psnk->psnk_src.addr.v.a.addr, &psnk->psnk_src.addr.v.a.mask, &sn->addr, sn->af) && - PF_MATCHA(psnk->psnk_dst.neg, + pf_match_addr(psnk->psnk_dst.neg, &psnk->psnk_dst.addr.v.a.addr, &psnk->psnk_dst.addr.v.a.mask, &sn->raddr, sn->af)) { |