summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/net/if_pflog.c7
-rw-r--r--sys/net/if_pfsync.c5
-rw-r--r--sys/net/pf.c270
-rw-r--r--sys/net/pf_norm.c10
-rw-r--r--sys/net/pf_osfp.c4
-rw-r--r--sys/net/pfvar.h8
-rw-r--r--sys/net/pfvar_priv.h32
7 files changed, 155 insertions, 181 deletions
diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c
index d9daa9f195c..ec032eb7f81 100644
--- a/sys/net/if_pflog.c
+++ b/sys/net/if_pflog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pflog.c,v 1.75 2016/10/26 21:07:22 bluhm Exp $ */
+/* $OpenBSD: if_pflog.c,v 1.76 2016/11/22 19:29:54 procter Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -298,7 +298,6 @@ pflog_bpfcopy(const void *src_arg, void *dst_arg, size_t len)
u_int count;
u_char *dst, *mdst;
int afto, hlen, mlen, off;
- union pf_headers pdhdrs;
struct pf_pdesc pd;
struct pf_addr osaddr, odaddr;
@@ -404,7 +403,7 @@ pflog_bpfcopy(const void *src_arg, void *dst_arg, size_t len)
* Rewrite addresses if needed. Reason pointer must be NULL to avoid
* counting the packet here again.
*/
- if (pf_setup_pdesc(&pd, &pdhdrs, pfloghdr->af, pfloghdr->dir, NULL,
+ if (pf_setup_pdesc(&pd, pfloghdr->af, pfloghdr->dir, NULL,
mhdr, NULL) != PF_PASS)
goto copy;
pd.naf = pfloghdr->naf;
@@ -421,7 +420,7 @@ pflog_bpfcopy(const void *src_arg, void *dst_arg, size_t len)
pfloghdr->sport, &pfloghdr->daddr, pfloghdr->dport, 0,
pfloghdr->dir))) {
m_copyback(pd.m, pd.off, min(pd.m->m_len - pd.off, pd.hdrlen),
- pd.hdr.any, M_NOWAIT);
+ &pd.hdr, M_NOWAIT);
#ifdef INET6
if (afto) {
PF_ACPY(&pd.nsaddr, &pfloghdr->saddr, pd.naf);
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 3818e1a6777..691123053b0 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pfsync.c,v 1.237 2016/11/14 13:25:00 bluhm Exp $ */
+/* $OpenBSD: if_pfsync.c,v 1.238 2016/11/22 19:29:54 procter Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff
@@ -1733,7 +1733,6 @@ pfsync_undefer(struct pfsync_deferral *pd, int drop)
{
struct pfsync_softc *sc = pfsyncif;
struct pf_pdesc pdesc;
- union pf_headers pdhdrs;
splsoftassert(IPL_SOFTNET);
@@ -1745,7 +1744,7 @@ pfsync_undefer(struct pfsync_deferral *pd, int drop)
m_freem(pd->pd_m);
else {
if (pd->pd_st->rule.ptr->rt == PF_ROUTETO) {
- if (pf_setup_pdesc(&pdesc, &pdhdrs,
+ if (pf_setup_pdesc(&pdesc,
pd->pd_st->key[PF_SK_WIRE]->af,
pd->pd_st->direction, pd->pd_st->rt_kif,
pd->pd_m, NULL) != PF_PASS) {
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 65652bd06e3..b749f03ebda 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.1000 2016/11/21 15:23:18 bluhm Exp $ */
+/* $OpenBSD: pf.c,v 1.1001 2016/11/22 19:29:54 procter Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -773,25 +773,22 @@ pf_state_key_addr_setup(struct pf_pdesc *pd, void *arg, int sidx,
{
struct pf_state_key_cmp *key = arg;
#ifdef INET6
- struct nd_neighbor_solicit *nd;
struct pf_addr *target;
if (af == AF_INET || pd->proto != IPPROTO_ICMPV6)
goto copy;
- switch (pd->hdr.icmp6->icmp6_type) {
+ switch (pd->hdr.icmp6.icmp6_type) {
case ND_NEIGHBOR_SOLICIT:
if (multi)
return (-1);
- nd = (void *)pd->hdr.icmp6;
- target = (struct pf_addr *)&nd->nd_ns_target;
+ target = (struct pf_addr *)&pd->hdr.nd_ns.nd_ns_target;
daddr = target;
break;
case ND_NEIGHBOR_ADVERT:
if (multi)
return (-1);
- nd = (void *)pd->hdr.icmp6;
- target = (struct pf_addr *)&nd->nd_ns_target;
+ target = (struct pf_addr *)&pd->hdr.nd_ns.nd_ns_target;
saddr = target;
if (IN6_IS_ADDR_MULTICAST(&pd->dst->v6)) {
key->addr[didx].addr32[0] = 0;
@@ -1978,7 +1975,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, int *icmp_dir,
/* FALLTHROUGH */
case ICMP_ECHOREPLY:
*virtual_type = ICMP_ECHO;
- *virtual_id = pd->hdr.icmp->icmp_id;
+ *virtual_id = pd->hdr.icmp.icmp_id;
break;
case ICMP_TSTAMP:
@@ -1986,7 +1983,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, int *icmp_dir,
/* FALLTHROUGH */
case ICMP_TSTAMPREPLY:
*virtual_type = ICMP_TSTAMP;
- *virtual_id = pd->hdr.icmp->icmp_id;
+ *virtual_id = pd->hdr.icmp.icmp_id;
break;
case ICMP_IREQ:
@@ -1994,7 +1991,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, int *icmp_dir,
/* FALLTHROUGH */
case ICMP_IREQREPLY:
*virtual_type = ICMP_IREQ;
- *virtual_id = pd->hdr.icmp->icmp_id;
+ *virtual_id = pd->hdr.icmp.icmp_id;
break;
case ICMP_MASKREQ:
@@ -2002,7 +1999,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, int *icmp_dir,
/* FALLTHROUGH */
case ICMP_MASKREPLY:
*virtual_type = ICMP_MASKREQ;
- *virtual_id = pd->hdr.icmp->icmp_id;
+ *virtual_id = pd->hdr.icmp.icmp_id;
break;
case ICMP_IPV6_WHEREAREYOU:
@@ -2060,14 +2057,14 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, int *icmp_dir,
/* FALLTHROUGH */
case ICMP6_ECHO_REPLY:
*virtual_type = ICMP6_ECHO_REQUEST;
- *virtual_id = pd->hdr.icmp6->icmp6_id;
+ *virtual_id = pd->hdr.icmp6.icmp6_id;
break;
case MLD_LISTENER_QUERY:
*icmp_dir = PF_IN;
/* FALLTHROUGH */
case MLD_LISTENER_REPORT: {
- struct mld_hdr *mld = (void *)pd->hdr.icmp6;
+ struct mld_hdr *mld = &pd->hdr.mld;
u_int32_t h;
*virtual_type = MLD_LISTENER_QUERY;
@@ -2104,7 +2101,7 @@ pf_icmp_mapping(struct pf_pdesc *pd, u_int8_t type, int *icmp_dir,
*icmp_dir = PF_IN;
/* FALLTHROUGH */
case ND_NEIGHBOR_ADVERT: {
- struct nd_neighbor_solicit *nd = (void *)pd->hdr.icmp6;
+ struct nd_neighbor_solicit *nd = &pd->hdr.nd_ns;
u_int32_t h;
*virtual_type = ND_NEIGHBOR_SOLICIT;
@@ -2307,7 +2304,7 @@ pf_translate_af(struct pf_pdesc *pd)
/* flush pd->pcksum */
if (copyback)
- m_copyback(pd->m, pd->off, pd->hdrlen, pd->hdr.any, M_NOWAIT);
+ m_copyback(pd->m, pd->off, pd->hdrlen, &pd->hdr, M_NOWAIT);
return (0);
}
@@ -2624,7 +2621,7 @@ pf_translate_icmp_af(struct pf_pdesc *pd, int af, void *arg)
int
pf_modulate_sack(struct pf_pdesc *pd, struct pf_state_peer *dst)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
int hlen = (th->th_off << 2) - sizeof(*th);
int thoptlen = hlen;
u_int8_t opts[MAX_TCPOPTLEN], *opt = opts;
@@ -2824,7 +2821,7 @@ pf_send_challenge_ack(struct pf_pdesc *pd, struct pf_state *s,
* memory.
*/
pf_send_tcp(s->rule.ptr, pd->af, pd->dst, pd->src,
- pd->hdr.tcp->th_dport, pd->hdr.tcp->th_sport, dst->seqlo,
+ pd->hdr.tcp.th_dport, pd->hdr.tcp.th_sport, dst->seqlo,
src->seqlo, TH_ACK, 0, 0, s->rule.ptr->return_ttl, 1, 0,
pd->rdomain);
}
@@ -3158,24 +3155,18 @@ pf_socket_lookup(struct pf_pdesc *pd)
struct inpcbtable *tb;
struct inpcb *inp;
- if (pd == NULL)
- return (-1);
pd->lookup.uid = UID_MAX;
pd->lookup.gid = GID_MAX;
pd->lookup.pid = NO_PID;
- switch (pd->proto) {
+ switch (pd->virtual_proto) {
case IPPROTO_TCP:
- if (pd->hdr.tcp == NULL)
- return (-1);
- sport = pd->hdr.tcp->th_sport;
- dport = pd->hdr.tcp->th_dport;
+ sport = pd->hdr.tcp.th_sport;
+ dport = pd->hdr.tcp.th_dport;
tb = &tcbtable;
break;
case IPPROTO_UDP:
- if (pd->hdr.udp == NULL)
- return (-1);
- sport = pd->hdr.udp->uh_sport;
- dport = pd->hdr.udp->uh_dport;
+ sport = pd->hdr.udp.uh_sport;
+ dport = pd->hdr.udp.uh_dport;
tb = &udbtable;
break;
default:
@@ -3232,7 +3223,7 @@ pf_socket_lookup(struct pf_pdesc *pd)
u_int8_t
pf_get_wscale(struct pf_pdesc *pd)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
int hlen;
u_int8_t hdr[60];
u_int8_t *opt, optlen;
@@ -3273,7 +3264,7 @@ pf_get_wscale(struct pf_pdesc *pd)
u_int16_t
pf_get_mss(struct pf_pdesc *pd)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
int hlen;
u_int8_t hdr[60];
u_int8_t *opt, optlen;
@@ -3410,8 +3401,8 @@ pf_tcp_iss(struct pf_pdesc *pd)
ctx = pf_tcp_secret_ctx;
SHA512Update(&ctx, &pd->rdomain, sizeof(pd->rdomain));
- SHA512Update(&ctx, &pd->hdr.tcp->th_sport, sizeof(u_short));
- SHA512Update(&ctx, &pd->hdr.tcp->th_dport, sizeof(u_short));
+ SHA512Update(&ctx, &pd->hdr.tcp.th_sport, sizeof(u_short));
+ SHA512Update(&ctx, &pd->hdr.tcp.th_dport, sizeof(u_short));
switch (pd->af) {
case AF_INET:
SHA512Update(&ctx, &pd->src->v4, sizeof(struct in_addr));
@@ -3476,7 +3467,6 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm,
struct pf_rule_slist rules;
struct pf_rule_item *ri;
struct pf_src_node *sns[PF_SN_MAX];
- struct tcphdr *th = pd->hdr.tcp;
struct pf_state_key *skw = NULL, *sks = NULL;
struct pf_rule_actions act;
int rewrite = 0;
@@ -3500,8 +3490,8 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm,
switch (pd->virtual_proto) {
case IPPROTO_ICMP:
- icmptype = pd->hdr.icmp->icmp_type;
- icmpcode = pd->hdr.icmp->icmp_code;
+ icmptype = pd->hdr.icmp.icmp_type;
+ icmpcode = pd->hdr.icmp.icmp_code;
state_icmp = pf_icmp_mapping(pd, icmptype,
&icmp_dir, &virtual_id, &virtual_type);
if (icmp_dir == PF_IN) {
@@ -3514,8 +3504,8 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm,
break;
#ifdef INET6
case IPPROTO_ICMPV6:
- icmptype = pd->hdr.icmp6->icmp6_type;
- icmpcode = pd->hdr.icmp6->icmp6_code;
+ icmptype = pd->hdr.icmp6.icmp6_type;
+ icmpcode = pd->hdr.icmp6.icmp6_code;
state_icmp = pf_icmp_mapping(pd, icmptype,
&icmp_dir, &virtual_id, &virtual_type);
if (icmp_dir == PF_IN) {
@@ -3571,7 +3561,7 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm,
break;
case IPPROTO_TCP:
- PF_TEST_ATTRIB(((r->flagset & th->th_flags) !=
+ PF_TEST_ATTRIB(((r->flagset & pd->hdr.tcp.th_flags) !=
r->flags),
TAILQ_NEXT(r, entries));
PF_TEST_ATTRIB((r->os_fingerprint != PF_OSFP_ANY &&
@@ -3725,8 +3715,9 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm,
if (pd->proto == IPPROTO_TCP &&
((r->rule_flag & PFRULE_RETURNRST) ||
(r->rule_flag & PFRULE_RETURN)) &&
- !(th->th_flags & TH_RST)) {
- u_int32_t ack = ntohl(th->th_seq) + pd->p_len;
+ !(pd->hdr.tcp.th_flags & TH_RST)) {
+ struct tcphdr *th = &pd->hdr.tcp;
+ u_int32_t ack = ntohl(th->th_seq) + pd->p_len;
if (pf_check_tcp_cksum(pd->m, pd->off,
pd->tot_len - pd->off, pd->af))
@@ -3824,7 +3815,7 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm,
/* copy back packet headers if needed */
if (rewrite && pd->hdrlen) {
- m_copyback(pd->m, pd->off, pd->hdrlen, pd->hdr.any, M_NOWAIT);
+ m_copyback(pd->m, pd->off, pd->hdrlen, &pd->hdr, M_NOWAIT);
}
#if NPFSYNC > 0
@@ -3865,7 +3856,7 @@ pf_create_state(struct pf_pdesc *pd, struct pf_rule *r, struct pf_rule *a,
struct pf_rule_actions *act, struct pf_src_node *sns[PF_SN_MAX])
{
struct pf_state *s = NULL;
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
u_int16_t mss = tcp_mssdflt;
u_short reason;
u_int i;
@@ -4082,7 +4073,7 @@ pf_translate(struct pf_pdesc *pd, struct pf_addr *saddr, u_int16_t sport,
if (afto) {
#ifdef INET6
- if (pf_translate_icmp_af(pd, AF_INET6, pd->hdr.icmp))
+ if (pf_translate_icmp_af(pd, AF_INET6, &pd->hdr.icmp))
return (0);
pd->proto = IPPROTO_ICMPV6;
rewrite = 1;
@@ -4091,7 +4082,7 @@ pf_translate(struct pf_pdesc *pd, struct pf_addr *saddr, u_int16_t sport,
if (virtual_type == htons(ICMP_ECHO)) {
u_int16_t icmpid = (icmp_dir == PF_IN) ? sport : dport;
rewrite += pf_patch_16(pd,
- &pd->hdr.icmp->icmp_id, icmpid);
+ &pd->hdr.icmp.icmp_id, icmpid);
}
break;
@@ -4102,7 +4093,7 @@ pf_translate(struct pf_pdesc *pd, struct pf_addr *saddr, u_int16_t sport,
return (0);
if (afto) {
- if (pf_translate_icmp_af(pd, AF_INET, pd->hdr.icmp6))
+ if (pf_translate_icmp_af(pd, AF_INET, &pd->hdr.icmp6))
return (0);
pd->proto = IPPROTO_ICMP;
rewrite = 1;
@@ -4110,7 +4101,7 @@ pf_translate(struct pf_pdesc *pd, struct pf_addr *saddr, u_int16_t sport,
if (virtual_type == htons(ICMP6_ECHO_REQUEST)) {
u_int16_t icmpid = (icmp_dir == PF_IN) ? sport : dport;
rewrite += pf_patch_16(pd,
- &pd->hdr.icmp6->icmp6_id, icmpid);
+ &pd->hdr.icmp6.icmp6_id, icmpid);
}
break;
#endif /* INET6 */
@@ -4129,7 +4120,7 @@ pf_tcp_track_full(struct pf_pdesc *pd, struct pf_state_peer *src,
struct pf_state_peer *dst, struct pf_state **state, u_short *reason,
int *copyback)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
u_int16_t win = ntohs(th->th_win);
u_int32_t ack, end, data_end, seq, orig_seq;
u_int8_t sws, dws;
@@ -4452,7 +4443,7 @@ int
pf_tcp_track_sloppy(struct pf_pdesc *pd, struct pf_state_peer *src,
struct pf_state_peer *dst, struct pf_state **state, u_short *reason)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
if (th->th_flags & TH_SYN)
if (src->state < TCPS_SYN_SENT)
@@ -4525,7 +4516,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_state **state, u_short *reason)
struct pf_state_key *sk = (*state)->key[pd->didx];
if ((*state)->src.state == PF_TCPS_PROXY_SRC) {
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
if (pd->dir != (*state)->direction) {
REASON_SET(reason, PFRES_SYNPROXY);
@@ -4556,7 +4547,7 @@ pf_synproxy(struct pf_pdesc *pd, struct pf_state **state, u_short *reason)
(*state)->src.state = PF_TCPS_PROXY_DST;
}
if ((*state)->src.state == PF_TCPS_PROXY_DST) {
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
if (pd->dir == (*state)->direction) {
if (((th->th_flags & (TH_SYN|TH_ACK)) != TH_ACK) ||
@@ -4645,14 +4636,14 @@ pf_test_state(struct pf_pdesc *pd, struct pf_state **state, u_short *reason)
case IPPROTO_TCP:
if ((action = pf_synproxy(pd, state, reason)) != PF_PASS)
return (action);
- if ((pd->hdr.tcp->th_flags & (TH_SYN|TH_ACK)) == TH_SYN) {
+ if ((pd->hdr.tcp.th_flags & (TH_SYN|TH_ACK)) == TH_SYN) {
if (dst->state >= TCPS_FIN_WAIT_2 &&
src->state >= TCPS_FIN_WAIT_2) {
if (pf_status.debug >= LOG_NOTICE) {
log(LOG_NOTICE, "pf: state reuse ");
pf_print_state(*state);
- pf_print_flags(pd->hdr.tcp->th_flags);
+ pf_print_flags(pd->hdr.tcp.th_flags);
addlog("\n");
}
/* XXX make sure it's the same direction ?? */
@@ -4770,7 +4761,7 @@ pf_test_state(struct pf_pdesc *pd, struct pf_state **state, u_short *reason)
}
if (copyback && pd->hdrlen > 0) {
- m_copyback(pd->m, pd->off, pd->hdrlen, pd->hdr.any, M_NOWAIT);
+ m_copyback(pd->m, pd->off, pd->hdrlen, &pd->hdr, M_NOWAIT);
}
return (action);
@@ -4838,11 +4829,11 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
switch (pd->proto) {
case IPPROTO_ICMP:
- icmptype = pd->hdr.icmp->icmp_type;
+ icmptype = pd->hdr.icmp.icmp_type;
break;
#ifdef INET6
case IPPROTO_ICMPV6:
- icmptype = pd->hdr.icmp6->icmp6_type;
+ icmptype = pd->hdr.icmp6.icmp6_type;
break;
#endif /* INET6 */
default:
@@ -4906,32 +4897,32 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
#ifdef INET6
if (afto) {
if (pf_translate_icmp_af(pd, AF_INET6,
- pd->hdr.icmp))
+ &pd->hdr.icmp))
return (PF_DROP);
pd->proto = IPPROTO_ICMPV6;
}
#endif /* INET6 */
pf_patch_16(pd,
- &pd->hdr.icmp->icmp_id, nk->port[iidx]);
+ &pd->hdr.icmp.icmp_id, nk->port[iidx]);
m_copyback(pd->m, pd->off, ICMP_MINLEN,
- pd->hdr.icmp, M_NOWAIT);
+ &pd->hdr.icmp, M_NOWAIT);
copyback = 1;
break;
#ifdef INET6
case AF_INET6:
if (afto) {
if (pf_translate_icmp_af(pd, AF_INET,
- pd->hdr.icmp6))
+ &pd->hdr.icmp6))
return (PF_DROP);
pd->proto = IPPROTO_ICMP;
}
pf_patch_16(pd,
- &pd->hdr.icmp6->icmp6_id, nk->port[iidx]);
+ &pd->hdr.icmp6.icmp6_id, nk->port[iidx]);
m_copyback(pd->m, pd->off,
- sizeof(struct icmp6_hdr), pd->hdr.icmp6,
+ sizeof(struct icmp6_hdr), &pd->hdr.icmp6,
M_NOWAIT);
copyback = 1;
break;
@@ -5019,7 +5010,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
switch (pd2.proto) {
case IPPROTO_TCP: {
- struct tcphdr th;
+ struct tcphdr *th = &pd2.hdr.tcp;
u_int32_t seq;
struct pf_state_peer *src, *dst;
u_int8_t dws;
@@ -5029,7 +5020,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
* expected. Don't access any TCP header fields after
* th_seq, an ackskew test is not possible.
*/
- if (!pf_pull_hdr(pd2.m, pd2.off, &th, 8, NULL, reason,
+ if (!pf_pull_hdr(pd2.m, pd2.off, th, 8, NULL, reason,
pd2.af)) {
DPFPRINTF(LOG_NOTICE,
"ICMP error message too short (tcp)");
@@ -5041,8 +5032,8 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
key.rdomain = pd2.rdomain;
PF_ACPY(&key.addr[pd2.sidx], pd2.src, key.af);
PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af);
- key.port[pd2.sidx] = th.th_sport;
- key.port[pd2.didx] = th.th_dport;
+ key.port[pd2.sidx] = th->th_sport;
+ key.port[pd2.didx] = th->th_dport;
STATE_LOOKUP(pd2.kif, &key, pd2.dir, *state, pd2.m);
@@ -5070,9 +5061,9 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
dws = 0;
/* Demodulate sequence number */
- seq = ntohl(th.th_seq) - src->seqdiff;
+ seq = ntohl(th->th_seq) - src->seqdiff;
if (src->seqdiff) {
- pf_patch_32(pd, &th.th_seq, htonl(seq));
+ pf_patch_32(pd, &th->th_seq, htonl(seq));
copyback = 1;
}
@@ -5082,7 +5073,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
if (pf_status.debug >= LOG_NOTICE) {
log(LOG_NOTICE,
"pf: BAD ICMP %d:%d ",
- icmptype, pd->hdr.icmp->icmp_code);
+ icmptype, pd->hdr.icmp.icmp_code);
pf_print_host(pd->src, 0, pd->af);
addlog(" -> ");
pf_print_host(pd->dst, 0, pd->af);
@@ -5096,7 +5087,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
if (pf_status.debug >= LOG_DEBUG) {
log(LOG_DEBUG,
"pf: OK ICMP %d:%d ",
- icmptype, pd->hdr.icmp->icmp_code);
+ icmptype, pd->hdr.icmp.icmp_code);
pf_print_host(pd->src, 0, pd->af);
addlog(" -> ");
pf_print_host(pd->dst, 0, pd->af);
@@ -5124,11 +5115,11 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
#ifdef INET6
if (afto) {
if (pf_translate_icmp_af(pd, nk->af,
- pd->hdr.icmp))
+ &pd->hdr.icmp))
return (PF_DROP);
m_copyback(pd->m, pd->off,
sizeof(struct icmp6_hdr),
- pd->hdr.icmp6, M_NOWAIT);
+ &pd->hdr.icmp6, M_NOWAIT);
if (pf_change_icmp_af(pd->m, ipoff2,
pd, &pd2, &nk->addr[sidx],
&nk->addr[didx], pd->af, nk->af))
@@ -5147,20 +5138,20 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
pd->naf = nk->af;
pf_patch_16(pd,
- &th.th_sport, nk->port[sidx]);
+ &th->th_sport, nk->port[sidx]);
pf_patch_16(pd,
- &th.th_dport, nk->port[didx]);
+ &th->th_dport, nk->port[didx]);
- m_copyback(pd2.m, pd2.off, 8, &th,
+ m_copyback(pd2.m, pd2.off, 8, th,
M_NOWAIT);
return (PF_AFRT);
}
#endif /* INET6 */
if (PF_ANEQ(pd2.src,
&nk->addr[pd2.sidx], pd2.af) ||
- nk->port[pd2.sidx] != th.th_sport)
+ nk->port[pd2.sidx] != th->th_sport)
pf_translate_icmp(pd, pd2.src,
- &th.th_sport, pd->dst,
+ &th->th_sport, pd->dst,
&nk->addr[pd2.sidx],
nk->port[pd2.sidx]);
@@ -5171,9 +5162,9 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
if (PF_ANEQ(pd2.dst,
&nk->addr[pd2.didx], pd2.af) ||
- nk->port[pd2.didx] != th.th_dport)
+ nk->port[pd2.didx] != th->th_dport)
pf_translate_icmp(pd, pd2.dst,
- &th.th_dport, pd->src,
+ &th->th_dport, pd->src,
&nk->addr[pd2.didx],
nk->port[pd2.didx]);
copyback = 1;
@@ -5183,7 +5174,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
switch (pd2.af) {
case AF_INET:
m_copyback(pd->m, pd->off, ICMP_MINLEN,
- pd->hdr.icmp, M_NOWAIT);
+ &pd->hdr.icmp, M_NOWAIT);
m_copyback(pd2.m, ipoff2, sizeof(h2),
&h2, M_NOWAIT);
break;
@@ -5191,20 +5182,20 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
case AF_INET6:
m_copyback(pd->m, pd->off,
sizeof(struct icmp6_hdr),
- pd->hdr.icmp6, M_NOWAIT);
+ &pd->hdr.icmp6, M_NOWAIT);
m_copyback(pd2.m, ipoff2, sizeof(h2_6),
&h2_6, M_NOWAIT);
break;
#endif /* INET6 */
}
- m_copyback(pd2.m, pd2.off, 8, &th, M_NOWAIT);
+ m_copyback(pd2.m, pd2.off, 8, th, M_NOWAIT);
}
break;
}
case IPPROTO_UDP: {
- struct udphdr uh;
+ struct udphdr *uh = &pd2.hdr.udp;
- if (!pf_pull_hdr(pd2.m, pd2.off, &uh, sizeof(uh),
+ if (!pf_pull_hdr(pd2.m, pd2.off, uh, sizeof(*uh),
NULL, reason, pd2.af)) {
DPFPRINTF(LOG_NOTICE,
"ICMP error message too short (udp)");
@@ -5216,8 +5207,8 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
key.rdomain = pd2.rdomain;
PF_ACPY(&key.addr[pd2.sidx], pd2.src, key.af);
PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af);
- key.port[pd2.sidx] = uh.uh_sport;
- key.port[pd2.didx] = uh.uh_dport;
+ key.port[pd2.sidx] = uh->uh_sport;
+ key.port[pd2.didx] = uh->uh_dport;
STATE_LOOKUP(pd2.kif, &key, pd2.dir, *state, pd2.m);
@@ -5239,11 +5230,11 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
#ifdef INET6
if (afto) {
if (pf_translate_icmp_af(pd, nk->af,
- pd->hdr.icmp))
+ &pd->hdr.icmp))
return (PF_DROP);
m_copyback(pd->m, pd->off,
sizeof(struct icmp6_hdr),
- pd->hdr.icmp6, M_NOWAIT);
+ &pd->hdr.icmp6, M_NOWAIT);
if (pf_change_icmp_af(pd->m, ipoff2,
pd, &pd2, &nk->addr[sidx],
&nk->addr[didx], pd->af, nk->af))
@@ -5262,21 +5253,21 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
pd->naf = nk->af;
pf_patch_16(pd,
- &uh.uh_sport, nk->port[sidx]);
+ &uh->uh_sport, nk->port[sidx]);
pf_patch_16(pd,
- &uh.uh_dport, nk->port[didx]);
+ &uh->uh_dport, nk->port[didx]);
m_copyback(pd2.m, pd2.off, sizeof(uh),
- &uh, M_NOWAIT);
+ uh, M_NOWAIT);
return (PF_AFRT);
}
#endif /* INET6 */
if (PF_ANEQ(pd2.src,
&nk->addr[pd2.sidx], pd2.af) ||
- nk->port[pd2.sidx] != uh.uh_sport)
+ nk->port[pd2.sidx] != uh->uh_sport)
pf_translate_icmp(pd, pd2.src,
- &uh.uh_sport, pd->dst,
+ &uh->uh_sport, pd->dst,
&nk->addr[pd2.sidx],
nk->port[pd2.sidx]);
@@ -5287,16 +5278,16 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
if (PF_ANEQ(pd2.dst,
&nk->addr[pd2.didx], pd2.af) ||
- nk->port[pd2.didx] != uh.uh_dport)
+ nk->port[pd2.didx] != uh->uh_dport)
pf_translate_icmp(pd, pd2.dst,
- &uh.uh_dport, pd->src,
+ &uh->uh_dport, pd->src,
&nk->addr[pd2.didx],
nk->port[pd2.didx]);
switch (pd2.af) {
case AF_INET:
m_copyback(pd->m, pd->off, ICMP_MINLEN,
- pd->hdr.icmp, M_NOWAIT);
+ &pd->hdr.icmp, M_NOWAIT);
m_copyback(pd2.m, ipoff2, sizeof(h2),
&h2, M_NOWAIT);
break;
@@ -5304,7 +5295,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
case AF_INET6:
m_copyback(pd->m, pd->off,
sizeof(struct icmp6_hdr),
- pd->hdr.icmp6, M_NOWAIT);
+ &pd->hdr.icmp6, M_NOWAIT);
m_copyback(pd2.m, ipoff2, sizeof(h2_6),
&h2_6, M_NOWAIT);
break;
@@ -5313,30 +5304,29 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
/* Avoid recomputing quoted UDP checksum.
* note: udp6 0 csum invalid per rfc2460 p27.
* but presumed nothing cares in this context */
- pf_patch_16(pd, &uh.uh_sum, 0);
- m_copyback(pd2.m, pd2.off, sizeof(uh), &uh,
+ pf_patch_16(pd, &uh->uh_sum, 0);
+ m_copyback(pd2.m, pd2.off, sizeof(*uh), uh,
M_NOWAIT);
copyback = 1;
}
break;
}
case IPPROTO_ICMP: {
- struct icmp iih;
+ struct icmp *iih = &pd2.hdr.icmp;
if (pd2.af != AF_INET) {
REASON_SET(reason, PFRES_NORM);
return (PF_DROP);
}
- if (!pf_pull_hdr(pd2.m, pd2.off, &iih, ICMP_MINLEN,
+ if (!pf_pull_hdr(pd2.m, pd2.off, iih, ICMP_MINLEN,
NULL, reason, pd2.af)) {
DPFPRINTF(LOG_NOTICE,
"ICMP error message too short (icmp)");
return (PF_DROP);
}
- pd2.hdr.icmp = &iih;
- pf_icmp_mapping(&pd2, iih.icmp_type,
+ pf_icmp_mapping(&pd2, iih->icmp_type,
&icmp_dir, &virtual_id, &virtual_type);
ret = pf_icmp_state_lookup(&pd2, &key, state,
@@ -5365,24 +5355,24 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
if (nk->af != AF_INET6)
return (PF_DROP);
if (pf_translate_icmp_af(pd, nk->af,
- pd->hdr.icmp))
+ &pd->hdr.icmp))
return (PF_DROP);
m_copyback(pd->m, pd->off,
sizeof(struct icmp6_hdr),
- pd->hdr.icmp6, M_NOWAIT);
+ &pd->hdr.icmp6, M_NOWAIT);
if (pf_change_icmp_af(pd->m, ipoff2,
pd, &pd2, &nk->addr[sidx],
&nk->addr[didx], pd->af, nk->af))
return (PF_DROP);
pd->proto = IPPROTO_ICMPV6;
if (pf_translate_icmp_af(pd,
- nk->af, &iih))
+ nk->af, iih))
return (PF_DROP);
if (virtual_type == htons(ICMP_ECHO))
- pf_patch_16(pd, &iih.icmp_id,
+ pf_patch_16(pd, &iih->icmp_id,
nk->port[iidx]);
m_copyback(pd2.m, pd2.off, ICMP_MINLEN,
- &iih, M_NOWAIT);
+ iih, M_NOWAIT);
pd->m->m_pkthdr.ph_rtableid =
nk->rdomain;
pd->destchg = 1;
@@ -5398,10 +5388,10 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
if (PF_ANEQ(pd2.src,
&nk->addr[pd2.sidx], pd2.af) ||
(virtual_type == htons(ICMP_ECHO) &&
- nk->port[iidx] != iih.icmp_id))
+ nk->port[iidx] != iih->icmp_id))
pf_translate_icmp(pd, pd2.src,
(virtual_type == htons(ICMP_ECHO)) ?
- &iih.icmp_id : NULL,
+ &iih->icmp_id : NULL,
pd->dst, &nk->addr[pd2.sidx],
(virtual_type == htons(ICMP_ECHO)) ?
nk->port[iidx] : 0);
@@ -5417,10 +5407,10 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
pd->src, &nk->addr[pd2.didx], 0);
m_copyback(pd->m, pd->off, ICMP_MINLEN,
- pd->hdr.icmp, M_NOWAIT);
+ &pd->hdr.icmp, M_NOWAIT);
m_copyback(pd2.m, ipoff2, sizeof(h2), &h2,
M_NOWAIT);
- m_copyback(pd2.m, pd2.off, ICMP_MINLEN, &iih,
+ m_copyback(pd2.m, pd2.off, ICMP_MINLEN, iih,
M_NOWAIT);
copyback = 1;
}
@@ -5428,22 +5418,21 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
}
#ifdef INET6
case IPPROTO_ICMPV6: {
- struct icmp6_hdr iih;
+ struct icmp6_hdr *iih = &pd2.hdr.icmp6;
if (pd2.af != AF_INET6) {
REASON_SET(reason, PFRES_NORM);
return (PF_DROP);
}
- if (!pf_pull_hdr(pd2.m, pd2.off, &iih,
+ if (!pf_pull_hdr(pd2.m, pd2.off, iih,
sizeof(struct icmp6_hdr), NULL, reason, pd2.af)) {
DPFPRINTF(LOG_NOTICE,
"ICMP error message too short (icmp6)");
return (PF_DROP);
}
- pd2.hdr.icmp6 = &iih;
- pf_icmp_mapping(&pd2, iih.icmp6_type,
+ pf_icmp_mapping(&pd2, iih->icmp6_type,
&icmp_dir, &virtual_id, &virtual_type);
ret = pf_icmp_state_lookup(&pd2, &key, state,
virtual_id, virtual_type, icmp_dir, &iidx, 0, 1);
@@ -5476,25 +5465,25 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
if (nk->af != AF_INET)
return (PF_DROP);
if (pf_translate_icmp_af(pd, nk->af,
- pd->hdr.icmp))
+ &pd->hdr.icmp))
return (PF_DROP);
m_copyback(pd->m, pd->off,
sizeof(struct icmp6_hdr),
- pd->hdr.icmp6, M_NOWAIT);
+ &pd->hdr.icmp6, M_NOWAIT);
if (pf_change_icmp_af(pd->m, ipoff2,
pd, &pd2, &nk->addr[sidx],
&nk->addr[didx], pd->af, nk->af))
return (PF_DROP);
pd->proto = IPPROTO_ICMP;
if (pf_translate_icmp_af(pd,
- nk->af, &iih))
+ nk->af, iih))
return (PF_DROP);
if (virtual_type ==
htons(ICMP6_ECHO_REQUEST))
- pf_patch_16(pd, &iih.icmp6_id,
+ pf_patch_16(pd, &iih->icmp6_id,
nk->port[iidx]);
m_copyback(pd2.m, pd2.off,
- sizeof(struct icmp6_hdr), &iih,
+ sizeof(struct icmp6_hdr), iih,
M_NOWAIT);
pd->m->m_pkthdr.ph_rtableid =
nk->rdomain;
@@ -5511,11 +5500,11 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
&nk->addr[pd2.sidx], pd2.af) ||
((virtual_type ==
htons(ICMP6_ECHO_REQUEST)) &&
- nk->port[pd2.sidx] != iih.icmp6_id))
+ nk->port[pd2.sidx] != iih->icmp6_id))
pf_translate_icmp(pd, pd2.src,
(virtual_type ==
htons(ICMP6_ECHO_REQUEST))
- ? &iih.icmp6_id : NULL,
+ ? &iih->icmp6_id : NULL,
pd->dst, &nk->addr[pd2.sidx],
(virtual_type ==
htons(ICMP6_ECHO_REQUEST))
@@ -5532,12 +5521,12 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
pd->src, &nk->addr[pd2.didx], 0);
m_copyback(pd->m, pd->off,
- sizeof(struct icmp6_hdr), pd->hdr.icmp6,
+ sizeof(struct icmp6_hdr), &pd->hdr.icmp6,
M_NOWAIT);
m_copyback(pd2.m, ipoff2, sizeof(h2_6), &h2_6,
M_NOWAIT);
m_copyback(pd2.m, pd2.off,
- sizeof(struct icmp6_hdr), &iih, M_NOWAIT);
+ sizeof(struct icmp6_hdr), iih, M_NOWAIT);
copyback = 1;
}
break;
@@ -5577,7 +5566,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
switch (pd2.af) {
case AF_INET:
m_copyback(pd->m, pd->off, ICMP_MINLEN,
- pd->hdr.icmp, M_NOWAIT);
+ &pd->hdr.icmp, M_NOWAIT);
m_copyback(pd2.m, ipoff2, sizeof(h2),
&h2, M_NOWAIT);
break;
@@ -5585,7 +5574,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
case AF_INET6:
m_copyback(pd->m, pd->off,
sizeof(struct icmp6_hdr),
- pd->hdr.icmp6, M_NOWAIT);
+ &pd->hdr.icmp6, M_NOWAIT);
m_copyback(pd2.m, ipoff2, sizeof(h2_6),
&h2_6, M_NOWAIT);
break;
@@ -5598,7 +5587,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
}
}
if (copyback) {
- m_copyback(pd->m, pd->off, pd->hdrlen, pd->hdr.any, M_NOWAIT);
+ m_copyback(pd->m, pd->off, pd->hdrlen, &pd->hdr, M_NOWAIT);
}
return (PF_PASS);
@@ -6307,11 +6296,10 @@ pf_walk_header6(struct pf_pdesc *pd, struct ip6_hdr *h, u_short *reason)
#endif /* INET6 */
int
-pf_setup_pdesc(struct pf_pdesc *pd, void *pdhdrs, sa_family_t af, int dir,
+pf_setup_pdesc(struct pf_pdesc *pd, sa_family_t af, int dir,
struct pfi_kif *kif, struct mbuf *m, u_short *reason)
{
bzero(pd, sizeof(*pd));
- pd->hdr.any = pdhdrs;
pd->dir = dir;
pd->kif = kif; /* kif is NULL when called by pflog */
pd->m = m;
@@ -6410,7 +6398,7 @@ pf_setup_pdesc(struct pf_pdesc *pd, void *pdhdrs, sa_family_t af, int dir,
switch (pd->virtual_proto) {
case IPPROTO_TCP: {
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
if (!pf_pull_hdr(pd->m, pd->off, th, sizeof(*th),
NULL, reason, pd->af))
@@ -6428,7 +6416,7 @@ pf_setup_pdesc(struct pf_pdesc *pd, void *pdhdrs, sa_family_t af, int dir,
break;
}
case IPPROTO_UDP: {
- struct udphdr *uh = pd->hdr.udp;
+ struct udphdr *uh = &pd->hdr.udp;
if (!pf_pull_hdr(pd->m, pd->off, uh, sizeof(*uh),
NULL, reason, pd->af))
@@ -6446,7 +6434,7 @@ pf_setup_pdesc(struct pf_pdesc *pd, void *pdhdrs, sa_family_t af, int dir,
break;
}
case IPPROTO_ICMP: {
- if (!pf_pull_hdr(pd->m, pd->off, pd->hdr.icmp, ICMP_MINLEN,
+ if (!pf_pull_hdr(pd->m, pd->off, &pd->hdr.icmp, ICMP_MINLEN,
NULL, reason, pd->af))
return (PF_DROP);
pd->hdrlen = ICMP_MINLEN;
@@ -6454,18 +6442,18 @@ pf_setup_pdesc(struct pf_pdesc *pd, void *pdhdrs, sa_family_t af, int dir,
REASON_SET(reason, PFRES_SHORT);
return (PF_DROP);
}
- pd->pcksum = &pd->hdr.icmp->icmp_cksum;
+ pd->pcksum = &pd->hdr.icmp.icmp_cksum;
break;
}
#ifdef INET6
case IPPROTO_ICMPV6: {
size_t icmp_hlen = sizeof(struct icmp6_hdr);
- if (!pf_pull_hdr(pd->m, pd->off, pd->hdr.icmp6, icmp_hlen,
+ if (!pf_pull_hdr(pd->m, pd->off, &pd->hdr.icmp6, icmp_hlen,
NULL, reason, pd->af))
return (PF_DROP);
/* ICMP headers we look further into to match state */
- switch (pd->hdr.icmp6->icmp6_type) {
+ switch (pd->hdr.icmp6.icmp6_type) {
case MLD_LISTENER_QUERY:
case MLD_LISTENER_REPORT:
icmp_hlen = sizeof(struct mld_hdr);
@@ -6476,7 +6464,7 @@ pf_setup_pdesc(struct pf_pdesc *pd, void *pdhdrs, sa_family_t af, int dir,
break;
}
if (icmp_hlen > sizeof(struct icmp6_hdr) &&
- !pf_pull_hdr(pd->m, pd->off, pd->hdr.icmp6, icmp_hlen,
+ !pf_pull_hdr(pd->m, pd->off, &pd->hdr.icmp6, icmp_hlen,
NULL, reason, pd->af))
return (PF_DROP);
pd->hdrlen = icmp_hlen;
@@ -6484,7 +6472,7 @@ pf_setup_pdesc(struct pf_pdesc *pd, void *pdhdrs, sa_family_t af, int dir,
REASON_SET(reason, PFRES_SHORT);
return (PF_DROP);
}
- pd->pcksum = &pd->hdr.icmp6->icmp6_cksum;
+ pd->pcksum = &pd->hdr.icmp6.icmp6_cksum;
break;
}
#endif /* INET6 */
@@ -6568,7 +6556,6 @@ pf_test(sa_family_t af, int fwdir, struct ifnet *ifp, struct mbuf **m0)
struct pf_state *s = NULL;
struct pf_ruleset *ruleset = NULL;
struct pf_pdesc pd;
- union pf_headers pdhdrs;
int dir = (fwdir == PF_FWD) ? PF_OUT : fwdir;
u_int32_t qid, pqid = 0;
@@ -6606,7 +6593,7 @@ pf_test(sa_family_t af, int fwdir, struct ifnet *ifp, struct mbuf **m0)
return (PF_PASS);
}
- action = pf_setup_pdesc(&pd, &pdhdrs, af, dir, kif, *m0, &reason);
+ action = pf_setup_pdesc(&pd, af, dir, kif, *m0, &reason);
if (action != PF_PASS) {
#if NPFLOG > 0
pd.pflog |= PF_LOG_FORCE;
@@ -6638,8 +6625,7 @@ pf_test(sa_family_t af, int fwdir, struct ifnet *ifp, struct mbuf **m0)
/* if packet has been reassembled, update packet description */
if (pf_status.reass && pd.virtual_proto == PF_VPROTO_FRAGMENT) {
- action = pf_setup_pdesc(&pd, &pdhdrs, af, dir, kif, pd.m,
- &reason);
+ action = pf_setup_pdesc(&pd, af, dir, kif, pd.m, &reason);
if (action != PF_PASS) {
#if NPFLOG > 0
pd.pflog |= PF_LOG_FORCE;
@@ -6714,7 +6700,7 @@ pf_test(sa_family_t af, int fwdir, struct ifnet *ifp, struct mbuf **m0)
default:
if (pd.virtual_proto == IPPROTO_TCP) {
- if ((pd.hdr.tcp->th_flags & TH_ACK) && pd.p_len == 0)
+ if ((pd.hdr.tcp.th_flags & TH_ACK) && pd.p_len == 0)
pqid = 1;
action = pf_normalize_tcp(&pd);
if (action == PF_DROP)
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index b8741645baf..b8981d8464e 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_norm.c,v 1.196 2016/11/21 17:52:20 bluhm Exp $ */
+/* $OpenBSD: pf_norm.c,v 1.197 2016/11/22 19:29:54 procter Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -854,7 +854,7 @@ no_fragment:
int
pf_normalize_tcp(struct pf_pdesc *pd)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
u_short reason;
u_int8_t flags;
u_int rewrite = 0;
@@ -910,7 +910,7 @@ tcp_drop:
int
pf_normalize_tcp_init(struct pf_pdesc *pd, struct pf_state_peer *src)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
u_int32_t tsval, tsecr;
u_int8_t hdr[60];
u_int8_t *opt;
@@ -1005,7 +1005,7 @@ pf_normalize_tcp_stateful(struct pf_pdesc *pd, u_short *reason,
struct pf_state *state, struct pf_state_peer *src,
struct pf_state_peer *dst, int *writeback)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
struct timeval uptime;
u_int32_t tsval, tsecr;
u_int tsval_from_last;
@@ -1396,7 +1396,7 @@ pf_normalize_tcp_stateful(struct pf_pdesc *pd, u_short *reason,
int
pf_normalize_mss(struct pf_pdesc *pd, u_int16_t maxmss)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
u_int16_t mss;
int thoff;
int opt, cnt, optlen = 0;
diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c
index 4e98517449d..d0c59392a4e 100644
--- a/sys/net/pf_osfp.c
+++ b/sys/net/pf_osfp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_osfp.c,v 1.38 2016/10/26 21:07:22 bluhm Exp $ */
+/* $OpenBSD: pf_osfp.c,v 1.39 2016/11/22 19:29:54 procter Exp $ */
/*
* Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
@@ -86,7 +86,7 @@ void pf_osfp_insert(struct pf_osfp_list *,
struct pf_osfp_enlist *
pf_osfp_fingerprint(struct pf_pdesc *pd)
{
- struct tcphdr *th = pd->hdr.tcp;
+ struct tcphdr *th = &pd->hdr.tcp;
struct ip *ip = NULL;
struct ip6_hdr *ip6 = NULL;
char hdr[60];
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index 6e77d6c1ba4..a7bb647077f 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfvar.h,v 1.444 2016/11/14 13:25:01 bluhm Exp $ */
+/* $OpenBSD: pfvar.h,v 1.445 2016/11/22 19:29:54 procter Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1648,9 +1648,9 @@ void pf_rm_rule(struct pf_rulequeue *,
struct pf_rule *);
void pf_purge_rule(struct pf_rule *);
struct pf_divert *pf_find_divert(struct mbuf *);
-int pf_setup_pdesc(struct pf_pdesc *, void *,
- sa_family_t, int, struct pfi_kif *,
- struct mbuf *, u_short *);
+int pf_setup_pdesc(struct pf_pdesc *, sa_family_t,
+ int, struct pfi_kif *, struct mbuf *,
+ u_short *);
int pf_test(sa_family_t, int, struct ifnet *, struct mbuf **);
diff --git a/sys/net/pfvar_priv.h b/sys/net/pfvar_priv.h
index 5d1570c7353..7f36bb06af3 100644
--- a/sys/net/pfvar_priv.h
+++ b/sys/net/pfvar_priv.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfvar_priv.h,v 1.1 2016/10/26 21:07:22 bluhm Exp $ */
+/* $OpenBSD: pfvar_priv.h,v 1.2 2016/11/22 19:29:54 procter Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -37,17 +37,6 @@
#ifdef _KERNEL
-union pf_headers {
- struct tcphdr tcp;
- struct udphdr udp;
- struct icmp icmp;
-#ifdef INET6
- struct icmp6_hdr icmp6;
- struct mld_hdr mld;
- struct nd_neighbor_solicit nd_ns;
-#endif /* INET6 */
-};
-
struct pf_pdesc {
struct {
int done;
@@ -56,15 +45,6 @@ struct pf_pdesc {
pid_t pid;
} lookup;
u_int64_t tot_len; /* Make Mickey money */
- union {
- struct tcphdr *tcp;
- struct udphdr *udp;
- struct icmp *icmp;
-#ifdef INET6
- struct icmp6_hdr *icmp6;
-#endif /* INET6 */
- void *any;
- } hdr;
struct pf_addr nsaddr; /* src address after NAT */
struct pf_addr ndaddr; /* dst address after NAT */
@@ -102,6 +82,16 @@ struct pf_pdesc {
u_int8_t didx; /* key index for destination */
u_int8_t destchg; /* flag set when destination changed */
u_int8_t pflog; /* flags for packet logging */
+ union {
+ struct tcphdr tcp;
+ struct udphdr udp;
+ struct icmp icmp;
+#ifdef INET6
+ struct icmp6_hdr icmp6;
+ struct mld_hdr mld;
+ struct nd_neighbor_solicit nd_ns;
+#endif /* INET6 */
+ } hdr;
};
#endif /* _KERNEL */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 07:15:26 +0000