Hello,
On Sat, Dec 08, 2018 at 09:25:04AM +0100, Klemens Nanni wrote:
> 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?
your patch seems to be a follow up to mcbride's commit [1]
I have no objections. just make sure not to exceed 80 chars per line.
see below.
</snip>
> Index: net/pf.c
> ===================================================================
> RCS file: /cvs/src/sys/net/pf.c,v
> retrieving revision 1.1078
> diff -u -p -r1.1078 pf.c
</snip>
> @@ -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 */
chunk above seems to exceed 80 chars limit.
</snip>
> 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;
> @@ -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
and also here the line seems too long.
</snip>
otherwise looks good.
thanks and
regards
sashan
[1]
https://github.com/openbsd/src/commit/88a02e3254a5fc933c2d4b2d9ac064f49c6560d2#diff-4cf042ffd245af805800bc2ec46a3b6e
