All they do is case conversion^Wconfusion, so remove them.
Relevant pfvar.h diff at the top, all other hunks were done with sed(1).
Feedback? Objections? OK?
Index: net/pfvar.h
===================================================================
RCS file: /cvs/src/sys/net/pfvar.h,v
retrieving revision 1.486
diff -u -p -r1.486 pfvar.h
--- net/pfvar.h 13 Sep 2018 19:53:58 -0000 1.486
+++ net/pfvar.h 8 Dec 2018 08:12:30 -0000
@@ -278,19 +278,6 @@ struct pfi_dynaddr {
!(a)->addr32[0] && !(a)->addr32[1] && \
!(a)->addr32[2] && !(a)->addr32[3] )) \
-#define PF_MATCHA(n, a, m, b, f) \
- pf_match_addr(n, a, m, b, f)
-
-#define PF_ACPY(a, b, f) \
- pf_addrcpy(a, b, f)
-
-#define PF_AINC(a, f) \
- pf_addr_inc(a, f)
-
-#define PF_POOLMASK(a, b, c, d, f) \
- pf_poolmask(a, b, c, d, f)
-
-
#define PF_MISMATCHAW(aw, x, af, neg, ifp, rtid)
\
( \
(((aw)->type == PF_ADDR_NOROUTE && \
@@ -308,7 +295,7 @@ struct pfi_dynaddr {
&(aw)->v.a.mask, (x), (af))) || \
((aw)->type == PF_ADDR_ADDRMASK && \
!PF_AZERO(&(aw)->v.a.mask, (af)) && \
- !PF_MATCHA(0, &(aw)->v.a.addr, \
+ !pf_match_addr(0, &(aw)->v.a.addr, \
&(aw)->v.a.mask, (x), (af))))) != \
(neg) \
)
Index: net/if_pflog.c
===================================================================
RCS file: /cvs/src/sys/net/if_pflog.c,v
retrieving revision 1.81
diff -u -p -r1.81 if_pflog.c
--- net/if_pflog.c 9 Jan 2018 15:24:24 -0000 1.81
+++ net/if_pflog.c 8 Dec 2018 08:04:34 -0000
@@ -267,8 +267,8 @@ pflog_packet(struct pf_pdesc *pd, u_int8
hdr.rule_pid = rm->cpid;
hdr.dir = pd->dir;
- PF_ACPY(&hdr.saddr, &pd->nsaddr, pd->naf);
- PF_ACPY(&hdr.daddr, &pd->ndaddr, pd->naf);
+ pf_addrcpy(&hdr.saddr, &pd->nsaddr, pd->naf);
+ pf_addrcpy(&hdr.daddr, &pd->ndaddr, pd->naf);
hdr.af = pd->af;
hdr.naf = pd->naf;
hdr.sport = pd->nsport;
@@ -402,8 +402,8 @@ pflog_bpfcopy(const void *src_arg, void
goto copy;
pd.naf = pfloghdr->naf;
- PF_ACPY(&osaddr, pd.src, pd.af);
- PF_ACPY(&odaddr, pd.dst, pd.af);
+ pf_addrcpy(&osaddr, pd.src, pd.af);
+ pf_addrcpy(&odaddr, pd.dst, pd.af);
if (pd.sport)
osport = *pd.sport;
if (pd.dport)
@@ -417,12 +417,12 @@ pflog_bpfcopy(const void *src_arg, void
&pd.hdr, M_NOWAIT);
#ifdef INET6
if (afto) {
- PF_ACPY(&pd.nsaddr, &pfloghdr->saddr, pd.naf);
- PF_ACPY(&pd.ndaddr, &pfloghdr->daddr, pd.naf);
+ pf_addrcpy(&pd.nsaddr, &pfloghdr->saddr, pd.naf);
+ pf_addrcpy(&pd.ndaddr, &pfloghdr->daddr, pd.naf);
}
#endif /* INET6 */
- PF_ACPY(&pfloghdr->saddr, &osaddr, pd.af);
- PF_ACPY(&pfloghdr->daddr, &odaddr, pd.af);
+ pf_addrcpy(&pfloghdr->saddr, &osaddr, pd.af);
+ pf_addrcpy(&pfloghdr->daddr, &odaddr, pd.af);
pfloghdr->sport = osport;
pfloghdr->dport = odport;
}
Index: net/pf.c
===================================================================
RCS file: /cvs/src/sys/net/pf.c,v
retrieving revision 1.1078
diff -u -p -r1.1078 pf.c
--- net/pf.c 15 Nov 2018 13:16:37 -0000 1.1078
+++ net/pf.c 8 Dec 2018 08:04:34 -0000
@@ -549,7 +549,7 @@ pf_insert_src_node(struct pf_src_node **
if (*sn == NULL) {
k.af = af;
k.type = type;
- PF_ACPY(&k.addr, src, af);
+ pf_addrcpy(&k.addr, src, af);
k.rule.ptr = rule;
pf_status.scounters[SCNT_SRC_NODE_SEARCH]++;
*sn = RB_FIND(pf_src_tree, &tree_src_tracking, &k);
@@ -570,9 +570,9 @@ pf_insert_src_node(struct pf_src_node **
(*sn)->type = type;
(*sn)->af = af;
(*sn)->rule.ptr = rule;
- PF_ACPY(&(*sn)->addr, src, af);
+ pf_addrcpy(&(*sn)->addr, src, af);
if (raddr)
- PF_ACPY(&(*sn)->raddr, raddr, af);
+ pf_addrcpy(&(*sn)->raddr, raddr, af);
if (RB_INSERT(pf_src_tree,
&tree_src_tracking, *sn) != NULL) {
if (pf_status.debug >= LOG_NOTICE) {
@@ -855,9 +855,9 @@ pf_state_key_addr_setup(struct pf_pdesc
copy:
#endif /* INET6 */
if (saddr)
- PF_ACPY(&key->addr[sidx], saddr, af);
+ pf_addrcpy(&key->addr[sidx], saddr, af);
if (daddr)
- PF_ACPY(&key->addr[didx], daddr, af);
+ pf_addrcpy(&key->addr[didx], daddr, af);
return (0);
}
@@ -2250,7 +2250,7 @@ pf_translate_icmp(struct pf_pdesc *pd, s
/* change quoted ip address */
pf_cksum_fixup_a(pd->pcksum, qa, na, pd->af, pd->proto);
- PF_ACPY(qa, na, pd->af);
+ pf_addrcpy(qa, na, pd->af);
/* change network-header's ip address */
if (oa)
@@ -2279,7 +2279,7 @@ pf_translate_a(struct pf_pdesc *pd, stru
break; /* assume no pseudo-header */
}
- PF_ACPY(a, an, pd->af);
+ pf_addrcpy(a, an, pd->af);
rewrite = 1;
return (rewrite);
@@ -4768,8 +4768,8 @@ pf_test_state(struct pf_pdesc *pd, struc
key.af = pd->af;
key.proto = pd->virtual_proto;
key.rdomain = pd->rdomain;
- PF_ACPY(&key.addr[pd->sidx], pd->src, key.af);
- PF_ACPY(&key.addr[pd->didx], pd->dst, key.af);
+ pf_addrcpy(&key.addr[pd->sidx], pd->src, key.af);
+ pf_addrcpy(&key.addr[pd->didx], pd->dst, key.af);
key.port[pd->sidx] = pd->osport;
key.port[pd->didx] = pd->odport;
inp = pd->m->m_pkthdr.pf.inp;
@@ -4887,8 +4887,8 @@ pf_test_state(struct pf_pdesc *pd, struc
#ifdef INET6
if (afto) {
- PF_ACPY(&pd->nsaddr, &nk->addr[sidx], nk->af);
- PF_ACPY(&pd->ndaddr, &nk->addr[didx], nk->af);
+ pf_addrcpy(&pd->nsaddr, &nk->addr[sidx], nk->af);
+ pf_addrcpy(&pd->ndaddr, &nk->addr[didx], nk->af);
pd->naf = nk->af;
action = PF_AFRT;
}
@@ -5031,8 +5031,8 @@ pf_test_state_icmp(struct pf_pdesc *pd,
iidx = afto ? !iidx : iidx;
#ifdef INET6
if (afto) {
- PF_ACPY(&pd->nsaddr, &nk->addr[sidx], nk->af);
- PF_ACPY(&pd->ndaddr, &nk->addr[didx], nk->af);
+ pf_addrcpy(&pd->nsaddr, &nk->addr[sidx],
nk->af);
+ pf_addrcpy(&pd->ndaddr, &nk->addr[didx],
nk->af);
pd->naf = nk->af;
}
#endif /* INET6 */
@@ -5188,8 +5188,8 @@ pf_test_state_icmp(struct pf_pdesc *pd,
key.af = pd2.af;
key.proto = IPPROTO_TCP;
key.rdomain = pd2.rdomain;
- PF_ACPY(&key.addr[pd2.sidx], pd2.src, key.af);
- PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af);
+ pf_addrcpy(&key.addr[pd2.sidx], pd2.src, key.af);
+ pf_addrcpy(&key.addr[pd2.didx], pd2.dst, key.af);
key.port[pd2.sidx] = th->th_sport;
key.port[pd2.didx] = th->th_dport;
@@ -5291,9 +5291,9 @@ pf_test_state_icmp(struct pf_pdesc *pd,
pd->m->m_pkthdr.ph_rtableid =
nk->rdomain;
pd->destchg = 1;
- PF_ACPY(&pd->nsaddr,
+ pf_addrcpy(&pd->nsaddr,
&nk->addr[pd2.sidx], nk->af);
- PF_ACPY(&pd->ndaddr,
+ pf_addrcpy(&pd->ndaddr,
&nk->addr[pd2.didx], nk->af);
pd->naf = nk->af;
@@ -5366,8 +5366,8 @@ pf_test_state_icmp(struct pf_pdesc *pd,
key.af = pd2.af;
key.proto = IPPROTO_UDP;
key.rdomain = pd2.rdomain;
- PF_ACPY(&key.addr[pd2.sidx], pd2.src, key.af);
- PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af);
+ pf_addrcpy(&key.addr[pd2.sidx], pd2.src, key.af);
+ pf_addrcpy(&key.addr[pd2.didx], pd2.dst, key.af);
key.port[pd2.sidx] = uh->uh_sport;
key.port[pd2.didx] = uh->uh_dport;
@@ -5409,9 +5409,9 @@ pf_test_state_icmp(struct pf_pdesc *pd,
pd->m->m_pkthdr.ph_rtableid =
nk->rdomain;
pd->destchg = 1;
- PF_ACPY(&pd->nsaddr,
+ pf_addrcpy(&pd->nsaddr,
&nk->addr[pd2.sidx], nk->af);
- PF_ACPY(&pd->ndaddr,
+ pf_addrcpy(&pd->ndaddr,
&nk->addr[pd2.didx], nk->af);
pd->naf = nk->af;
@@ -5539,9 +5539,9 @@ pf_test_state_icmp(struct pf_pdesc *pd,
pd->m->m_pkthdr.ph_rtableid =
nk->rdomain;
pd->destchg = 1;
- PF_ACPY(&pd->nsaddr,
+ pf_addrcpy(&pd->nsaddr,
&nk->addr[pd2.sidx], nk->af);
- PF_ACPY(&pd->ndaddr,
+ pf_addrcpy(&pd->ndaddr,
&nk->addr[pd2.didx], nk->af);
pd->naf = nk->af;
return (PF_AFRT);
@@ -5651,9 +5651,9 @@ pf_test_state_icmp(struct pf_pdesc *pd,
pd->m->m_pkthdr.ph_rtableid =
nk->rdomain;
pd->destchg = 1;
- PF_ACPY(&pd->nsaddr,
+ pf_addrcpy(&pd->nsaddr,
&nk->addr[pd2.sidx], nk->af);
- PF_ACPY(&pd->ndaddr,
+ pf_addrcpy(&pd->ndaddr,
&nk->addr[pd2.didx], nk->af);
pd->naf = nk->af;
return (PF_AFRT);
@@ -5701,8 +5701,8 @@ pf_test_state_icmp(struct pf_pdesc *pd,
key.af = pd2.af;
key.proto = pd2.proto;
key.rdomain = pd2.rdomain;
- PF_ACPY(&key.addr[pd2.sidx], pd2.src, key.af);
- PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af);
+ pf_addrcpy(&key.addr[pd2.sidx], pd2.src, key.af);
+ pf_addrcpy(&key.addr[pd2.didx], pd2.dst, key.af);
key.port[0] = key.port[1] = 0;
action = pf_find_state(&pd2, &key, state);
@@ -6149,12 +6149,12 @@ pf_route6(struct pf_pdesc *pd, struct pf
goto bad;
}
if (!PF_AZERO(&naddr, AF_INET6))
- PF_ACPY((struct pf_addr *)&dst->sin6_addr,
+ pf_addrcpy((struct pf_addr *)&dst->sin6_addr,
&naddr, AF_INET6);
ifp = r->route.kif ? r->route.kif->pfik_ifp : NULL;
} else {
if (!PF_AZERO(&s->rt_addr, AF_INET6))
- PF_ACPY((struct pf_addr *)&dst->sin6_addr,
+ pf_addrcpy((struct pf_addr *)&dst->sin6_addr,
&s->rt_addr, AF_INET6);
ifp = s->rt_kif ? s->rt_kif->pfik_ifp : NULL;
}
@@ -6634,8 +6634,8 @@ pf_setup_pdesc(struct pf_pdesc *pd, sa_f
}
- PF_ACPY(&pd->nsaddr, pd->src, pd->af);
- PF_ACPY(&pd->ndaddr, pd->dst, pd->af);
+ pf_addrcpy(&pd->nsaddr, pd->src, pd->af);
+ pf_addrcpy(&pd->ndaddr, pd->dst, pd->af);
switch (pd->virtual_proto) {
case IPPROTO_TCP: {
Index: net/pf_if.c
===================================================================
RCS file: /cvs/src/sys/net/pf_if.c,v
retrieving revision 1.95
diff -u -p -r1.95 pf_if.c
--- net/pf_if.c 11 Jul 2018 21:18:23 -0000 1.95
+++ net/pf_if.c 8 Dec 2018 08:04:34 -0000
@@ -320,7 +320,7 @@ pfi_match_addr(struct pfi_dynaddr *dyn,
case 0:
return (0);
case 1:
- return (PF_MATCHA(0, &dyn->pfid_addr4,
+ return (pf_match_addr(0, &dyn->pfid_addr4,
&dyn->pfid_mask4, a, AF_INET));
default:
return (pfr_match_addr(dyn->pfid_kt, a, AF_INET));
@@ -332,7 +332,7 @@ pfi_match_addr(struct pfi_dynaddr *dyn,
case 0:
return (0);
case 1:
- return (PF_MATCHA(0, &dyn->pfid_addr6,
+ return (pf_match_addr(0, &dyn->pfid_addr6,
&dyn->pfid_mask6, a, AF_INET6));
default:
return (pfr_match_addr(dyn->pfid_kt, a, AF_INET6));
Index: net/pf_ioctl.c
===================================================================
RCS file: /cvs/src/sys/net/pf_ioctl.c,v
retrieving revision 1.338
diff -u -p -r1.338 pf_ioctl.c
--- net/pf_ioctl.c 1 Oct 2018 19:47:30 -0000 1.338
+++ net/pf_ioctl.c 8 Dec 2018 08:04:34 -0000
@@ -1582,9 +1582,9 @@ pfioctl(dev_t dev, u_long cmd, caddr_t a
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 a
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 a
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,9 @@ pfioctl(dev_t dev, u_long cmd, caddr_t a
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 +2624,11 @@ pfioctl(dev_t dev, u_long cmd, caddr_t a
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)) {
Index: net/pf_lb.c
===================================================================
RCS file: /cvs/src/sys/net/pf_lb.c,v
retrieving revision 1.62
diff -u -p -r1.62 pf_lb.c
--- net/pf_lb.c 6 Feb 2018 09:16:11 -0000 1.62
+++ net/pf_lb.c 8 Dec 2018 08:04:34 -0000
@@ -181,8 +181,8 @@ pf_get_sport(struct pf_pdesc *pd, struct
key.af = pd->naf;
key.proto = pd->proto;
key.rdomain = pd->rdomain;
- PF_ACPY(&key.addr[didx], &pd->ndaddr, key.af);
- PF_ACPY(&key.addr[sidx], naddr, key.af);
+ pf_addrcpy(&key.addr[didx], &pd->ndaddr, key.af);
+ pf_addrcpy(&key.addr[sidx], naddr, key.af);
key.port[didx] = pd->ndport;
/*
@@ -274,7 +274,7 @@ pf_map_addr_sticky(sa_family_t af, struc
k.af = af;
k.type = type;
- PF_ACPY(&k.addr, saddr, af);
+ pf_addrcpy(&k.addr, saddr, af);
k.rule.ptr = r;
pf_status.scounters[SCNT_SRC_NODE_SEARCH]++;
sns[type] = RB_FIND(pf_src_tree, &tree_src_tracking, &k);
@@ -320,7 +320,7 @@ pf_map_addr_sticky(sa_family_t af, struc
return (-1);
}
if (!PF_AZERO(cached, af))
- PF_ACPY(naddr, cached, af);
+ pf_addrcpy(naddr, cached, af);
if (pf_status.debug >= LOG_DEBUG) {
log(LOG_DEBUG, "pf: pf_map_addr: "
"src tracking (%u) maps ", type);
@@ -386,10 +386,10 @@ pf_map_addr(sa_family_t af, struct pf_ru
switch (rpool->opts & PF_POOL_TYPEMASK) {
case PF_POOL_NONE:
- PF_ACPY(naddr, raddr, af);
+ pf_addrcpy(naddr, raddr, af);
break;
case PF_POOL_BITMASK:
- PF_POOLMASK(naddr, raddr, rmask, saddr, af);
+ pf_poolmask(naddr, raddr, rmask, saddr, af);
break;
case PF_POOL_RANDOM:
if (rpool->addr.type == PF_ADDR_TABLE) {
@@ -401,7 +401,7 @@ pf_map_addr(sa_family_t af, struct pf_ru
memset(&rpool->counter, 0, sizeof(rpool->counter));
if (pfr_pool_get(rpool, &raddr, &rmask, af))
return (1);
- PF_ACPY(naddr, &rpool->counter, af);
+ pf_addrcpy(naddr, &rpool->counter, af);
} else if (rpool->addr.type == PF_ADDR_DYNIFTL) {
cnt = rpool->addr.p.dyn->pfid_kt->pfrkt_cnt;
if (cnt == 0)
@@ -411,7 +411,7 @@ pf_map_addr(sa_family_t af, struct pf_ru
memset(&rpool->counter, 0, sizeof(rpool->counter));
if (pfr_pool_get(rpool, &raddr, &rmask, af))
return (1);
- PF_ACPY(naddr, &rpool->counter, af);
+ pf_addrcpy(naddr, &rpool->counter, af);
} else if (init_addr != NULL && PF_AZERO(init_addr, af)) {
switch (af) {
case AF_INET:
@@ -438,12 +438,12 @@ pf_map_addr(sa_family_t af, struct pf_ru
default:
unhandled_af(af);
}
- PF_POOLMASK(naddr, raddr, rmask, &rpool->counter, af);
- PF_ACPY(init_addr, naddr, af);
+ pf_poolmask(naddr, raddr, rmask, &rpool->counter, af);
+ pf_addrcpy(init_addr, naddr, af);
} else {
- PF_AINC(&rpool->counter, af);
- PF_POOLMASK(naddr, raddr, rmask, &rpool->counter, af);
+ pf_addr_inc(&rpool->counter, af);
+ pf_poolmask(naddr, raddr, rmask, &rpool->counter, af);
}
break;
case PF_POOL_SRCHASH:
@@ -458,7 +458,7 @@ pf_map_addr(sa_family_t af, struct pf_ru
memset(&rpool->counter, 0, sizeof(rpool->counter));
if (pfr_pool_get(rpool, &raddr, &rmask, af))
return (1);
- PF_ACPY(naddr, &rpool->counter, af);
+ pf_addrcpy(naddr, &rpool->counter, af);
} else if (rpool->addr.type == PF_ADDR_DYNIFTL) {
cnt = rpool->addr.p.dyn->pfid_kt->pfrkt_cnt;
if (cnt == 0)
@@ -468,9 +468,9 @@ pf_map_addr(sa_family_t af, struct pf_ru
memset(&rpool->counter, 0, sizeof(rpool->counter));
if (pfr_pool_get(rpool, &raddr, &rmask, af))
return (1);
- PF_ACPY(naddr, &rpool->counter, af);
+ pf_addrcpy(naddr, &rpool->counter, af);
} else {
- PF_POOLMASK(naddr, raddr, rmask,
+ pf_poolmask(naddr, raddr, rmask,
(struct pf_addr *)&hash, af);
}
break;
@@ -508,16 +508,16 @@ pf_map_addr(sa_family_t af, struct pf_ru
}
if (rpool->weight >= rpool->curweight)
break;
- PF_AINC(&rpool->counter, af);
+ pf_addr_inc(&rpool->counter, af);
} while (1);
weight = rpool->weight;
}
- PF_ACPY(naddr, &rpool->counter, af);
+ pf_addrcpy(naddr, &rpool->counter, af);
if (init_addr != NULL && PF_AZERO(init_addr, af))
- PF_ACPY(init_addr, naddr, af);
- PF_AINC(&rpool->counter, af);
+ pf_addrcpy(init_addr, naddr, af);
+ pf_addr_inc(&rpool->counter, af);
break;
case PF_POOL_LEASTSTATES:
/* retrieve an address first */
@@ -544,18 +544,18 @@ pf_map_addr(sa_family_t af, struct pf_ru
else
load = states;
- PF_ACPY(&faddr, &rpool->counter, af);
+ pf_addrcpy(&faddr, &rpool->counter, af);
- PF_ACPY(naddr, &rpool->counter, af);
+ pf_addrcpy(naddr, &rpool->counter, af);
if (init_addr != NULL && PF_AZERO(init_addr, af))
- PF_ACPY(init_addr, naddr, af);
+ pf_addrcpy(init_addr, naddr, af);
/*
* iterate *once* over whole table and find destination with
* least connection
*/
do {
- PF_AINC(&rpool->counter, af);
+ pf_addr_inc(&rpool->counter, af);
if (rpool->addr.type == PF_ADDR_TABLE ||
rpool->addr.type == PF_ADDR_DYNIFTL) {
if (pfr_pool_get(rpool, &raddr, &rmask, af))
@@ -579,10 +579,10 @@ pf_map_addr(sa_family_t af, struct pf_ru
weight = rpool->weight;
load = cload;
- PF_ACPY(naddr, &rpool->counter, af);
+ pf_addrcpy(naddr, &rpool->counter, af);
if (init_addr != NULL &&
PF_AZERO(init_addr, af))
- PF_ACPY(init_addr, naddr, af);
+ pf_addrcpy(init_addr, naddr, af);
}
} while (pf_match_addr(1, &faddr, rmask, &rpool->counter, af) &&
(states > 0));
@@ -665,7 +665,7 @@ pf_get_transaddr(struct pf_rule *r, stru
return (-1);
}
*nr = r;
- PF_ACPY(&pd->nsaddr, &naddr, pd->af);
+ pf_addrcpy(&pd->nsaddr, &naddr, pd->af);
pd->nsport = nport;
}
if (r->rdr.addr.type != PF_ADDR_NONE) {
@@ -673,7 +673,7 @@ pf_get_transaddr(struct pf_rule *r, stru
&r->rdr, PF_SN_RDR))
return (-1);
if ((r->rdr.opts & PF_POOL_TYPEMASK) == PF_POOL_BITMASK)
- PF_POOLMASK(&naddr, &naddr, &r->rdr.addr.v.a.mask,
+ pf_poolmask(&naddr, &naddr, &r->rdr.addr.v.a.mask,
&pd->ndaddr, pd->af);
nport = 0;
@@ -693,7 +693,7 @@ pf_get_transaddr(struct pf_rule *r, stru
} else if (r->rdr.proxy_port[0])
nport = htons(r->rdr.proxy_port[0]);
*nr = r;
- PF_ACPY(&pd->ndaddr, &naddr, pd->af);
+ pf_addrcpy(&pd->ndaddr, &naddr, pd->af);
if (nport)
pd->ndport = nport;
}
@@ -815,8 +815,8 @@ pf_get_transaddr_af(struct pf_rule *r, s
}
}
- PF_ACPY(&pd->nsaddr, &nsaddr, pd->naf);
- PF_ACPY(&pd->ndaddr, &ndaddr, pd->naf);
+ pf_addrcpy(&pd->nsaddr, &nsaddr, pd->naf);
+ pf_addrcpy(&pd->ndaddr, &ndaddr, pd->naf);
if (pf_status.debug >= LOG_INFO) {
log(LOG_INFO, "pf: af-to %s %s done, prefixlen %d, ",
Index: net/pf_table.c
===================================================================
RCS file: /cvs/src/sys/net/pf_table.c,v
retrieving revision 1.129
diff -u -p -r1.129 pf_table.c
--- net/pf_table.c 15 Oct 2018 21:15:35 -0000 1.129
+++ net/pf_table.c 8 Dec 2018 08:04:34 -0000
@@ -2337,16 +2337,16 @@ pfr_pool_get(struct pf_pool *rpool, stru
if (use_counter && !PF_AZERO(counter, af)) {
/* is supplied address within block? */
- if (!PF_MATCHA(0, *raddr, *rmask, counter, af)) {
+ if (!pf_match_addr(0, *raddr, *rmask, counter, af)) {
/* no, go to next block in table */
idx++;
use_counter = 0;
goto _next_block;
}
- PF_ACPY(addr, counter, af);
+ pf_addrcpy(addr, counter, af);
} else {
/* use first address of block */
- PF_ACPY(addr, *raddr, af);
+ pf_addrcpy(addr, *raddr, af);
}
if (!KENTRY_NETWORK(ke)) {
@@ -2356,7 +2356,7 @@ pfr_pool_get(struct pf_pool *rpool, stru
idx++;
goto _next_block;
}
- PF_ACPY(counter, addr, af);
+ pf_addrcpy(counter, addr, af);
rpool->tblidx = idx;
kt->pfrkt_match++;
rpool->states = 0;
@@ -2396,7 +2396,7 @@ pfr_pool_get(struct pf_pool *rpool, stru
if (rpool->addr.type == PF_ADDR_DYNIFTL &&
pfr_islinklocal(af, addr))
goto _next_entry;
- PF_ACPY(counter, addr, af);
+ pf_addrcpy(counter, addr, af);
rpool->tblidx = idx;
kt->pfrkt_match++;
rpool->states = 0;
@@ -2419,9 +2419,9 @@ pfr_pool_get(struct pf_pool *rpool, stru
_next_entry:
/* we need to increase the counter past the nested block */
pfr_prepare_network(&mask, AF_INET, ke2->pfrke_net);
- PF_POOLMASK(addr, addr, SUNION2PF(&mask, af), &pfr_ffaddr, af);
- PF_AINC(addr, af);
- if (!PF_MATCHA(0, *raddr, *rmask, addr, af)) {
+ pf_poolmask(addr, addr, SUNION2PF(&mask, af), &pfr_ffaddr, af);
+ pf_addr_inc(addr, af);
+ if (!pf_match_addr(0, *raddr, *rmask, addr, af)) {
/* ok, we reached the end of our main block */
/* go to next block in table */
idx++;
