On Sun, Aug 30, 2015 at 06:22:30PM +1200, Richard Procter wrote:
> * Remove local aliases saddr, daddr
>
> - eases refactoring later on
I fail to see how yet, but ...
[...]
>
> ok?
... with the assumption that the above statement will
become true in the bigger picture, ok jung@
> to apply:
> $ cd /usr/src/sys
> $ cat - | patch
>
> Index: net/pf.c
> ===================================================================
> --- net.orig/pf.c
> +++ net/pf.c
> @@ -4490,7 +4490,6 @@ int
> pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
> u_short *reason)
> {
> - struct pf_addr *const saddr = pd->src, *const daddr = pd->dst;
> u_int16_t virtual_id, virtual_type;
> u_int8_t icmptype;
> int icmp_dir, iidx, ret, copyback = 0;
> @@ -4560,12 +4559,12 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> #endif /* INET6 */
> if (!afto && PF_ANEQ(pd->src,
> &nk->addr[sidx], AF_INET))
> - pf_change_a(pd, &saddr->v4.s_addr,
> + pf_change_a(pd, &pd->src->v4.s_addr,
> nk->addr[sidx].v4.s_addr);
>
> if (!afto && PF_ANEQ(pd->dst,
> &nk->addr[didx], AF_INET)) {
> - pf_change_a(pd, &daddr->v4.s_addr,
> + pf_change_a(pd, &pd->dst->v4.s_addr,
> nk->addr[didx].v4.s_addr);
> pd->destchg = 1;
> }
> @@ -4592,12 +4591,12 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> }
> if (!afto && PF_ANEQ(pd->src,
> &nk->addr[sidx], AF_INET6))
> - pf_change_a6(pd, saddr,
> + pf_change_a6(pd, pd->src,
> &nk->addr[sidx]);
>
> if (!afto && PF_ANEQ(pd->dst,
> &nk->addr[didx], AF_INET6)) {
> - pf_change_a6(pd, daddr,
> + pf_change_a6(pd, pd->dst,
> &nk->addr[didx]);
> pd->destchg = 1;
> }
> @@ -4845,7 +4844,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> &nk->addr[pd2.sidx], pd2.af) ||
> nk->port[pd2.sidx] != th.th_sport)
> pf_change_icmp(pd, pd2.src,
> - &th.th_sport, daddr,
> + &th.th_sport, pd->dst,
> &nk->addr[pd2.sidx],
> nk->port[pd2.sidx], pd2.af);
>
> @@ -4858,7 +4857,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> &nk->addr[pd2.didx], pd2.af) ||
> nk->port[pd2.didx] != th.th_dport)
> pf_change_icmp(pd, pd2.dst,
> - &th.th_dport, saddr,
> + &th.th_dport, pd->src,
> &nk->addr[pd2.didx],
> nk->port[pd2.didx], pd2.af);
> copyback = 1;
> @@ -4961,7 +4960,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> &nk->addr[pd2.sidx], pd2.af) ||
> nk->port[pd2.sidx] != uh.uh_sport)
> pf_change_icmp(pd, pd2.src,
> - &uh.uh_sport, daddr,
> + &uh.uh_sport, pd->dst,
> &nk->addr[pd2.sidx],
> nk->port[pd2.sidx], pd2.af);
>
> @@ -4974,7 +4973,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> &nk->addr[pd2.didx], pd2.af) ||
> nk->port[pd2.didx] != uh.uh_dport)
> pf_change_icmp(pd, pd2.dst,
> - &uh.uh_dport, saddr,
> + &uh.uh_dport, pd->src,
> &nk->addr[pd2.didx],
> nk->port[pd2.didx], pd2.af);
>
> @@ -5083,7 +5082,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> pf_change_icmp(pd, pd2.src,
> (virtual_type == htons(ICMP_ECHO)) ?
> &iih.icmp_id : NULL,
> - daddr, &nk->addr[pd2.sidx],
> + pd->dst, &nk->addr[pd2.sidx],
> (virtual_type == htons(ICMP_ECHO)) ?
> nk->port[iidx] : 0, AF_INET);
>
> @@ -5095,7 +5094,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> if (PF_ANEQ(pd2.dst,
> &nk->addr[pd2.didx], pd2.af))
> pf_change_icmp(pd, pd2.dst, NULL,
> - saddr, &nk->addr[pd2.didx], 0,
> + pd->src, &nk->addr[pd2.didx], 0,
> AF_INET);
>
> m_copyback(pd->m, pd->off, ICMP_MINLEN,
> @@ -5197,7 +5196,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> (virtual_type ==
> htons(ICMP6_ECHO_REQUEST))
> ? &iih.icmp6_id : NULL,
> - daddr, &nk->addr[pd2.sidx],
> + pd->dst, &nk->addr[pd2.sidx],
> (virtual_type ==
> htons(ICMP6_ECHO_REQUEST))
> ? nk->port[iidx] : 0, AF_INET6);
> @@ -5210,7 +5209,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> if (PF_ANEQ(pd2.dst,
> &nk->addr[pd2.didx], pd2.af))
> pf_change_icmp(pd, pd2.dst, NULL,
> - saddr, &nk->addr[pd2.didx], 0,
> + pd->src, &nk->addr[pd2.didx], 0,
> AF_INET6);
>
> m_copyback(pd->m, pd->off,
> @@ -5244,7 +5243,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> if (PF_ANEQ(pd2.src,
> &nk->addr[pd2.sidx], pd2.af))
> pf_change_icmp(pd, pd2.src, NULL,
> - daddr, &nk->addr[pd2.sidx], 0,
> + pd->dst, &nk->addr[pd2.sidx], 0,
> pd2.af);
>
> if (PF_ANEQ(pd2.dst, &nk->addr[pd2.didx],
> @@ -5255,7 +5254,7 @@ pf_test_state_icmp(struct pf_pdesc *pd,
> if (PF_ANEQ(pd2.dst,
> &nk->addr[pd2.didx], pd2.af))
> pf_change_icmp(pd, pd2.dst, NULL,
> - saddr, &nk->addr[pd2.didx], 0,
> + pd->src, &nk->addr[pd2.didx], 0,
> pd2.af);
>
> switch (pd2.af) {
>
