diff options
Diffstat (limited to 'sys/net/pf.c')
| -rw-r--r-- | sys/net/pf.c | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index ce3ad1968ec..f0abe32b822 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.741 2011/04/23 10:00:36 bluhm Exp $ */ +/* $OpenBSD: pf.c,v 1.742 2011/04/24 19:36:54 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -953,6 +953,9 @@ pf_find_state(struct pfi_kif *kif, struct pf_state_key_cmp *key, u_int dir, if (dir == PF_OUT && m->m_pkthdr.pf.statekey && ((struct pf_state_key *)m->m_pkthdr.pf.statekey)->reverse) sk = ((struct pf_state_key *)m->m_pkthdr.pf.statekey)->reverse; + else if (dir == PF_OUT && m->m_pkthdr.pf.inp && + ((struct inpcb *)m->m_pkthdr.pf.inp)->inp_pf_sk) + sk = ((struct inpcb *)m->m_pkthdr.pf.inp)->inp_pf_sk; else { if ((sk = RB_FIND(pf_state_tree, &pf_statetbl, (struct pf_state_key *)key)) == NULL) @@ -963,11 +966,16 @@ pf_find_state(struct pfi_kif *kif, struct pf_state_key_cmp *key, u_int dir, ((struct pf_state_key *) m->m_pkthdr.pf.statekey)->reverse = sk; sk->reverse = m->m_pkthdr.pf.statekey; + } else if (dir == PF_OUT && m->m_pkthdr.pf.inp && !sk->inp) { + ((struct inpcb *)m->m_pkthdr.pf.inp)->inp_pf_sk = sk; + sk->inp = m->m_pkthdr.pf.inp; } } - if (dir == PF_OUT) + if (dir == PF_OUT) { m->m_pkthdr.pf.statekey = NULL; + m->m_pkthdr.pf.inp = NULL; + } /* list is sorted, if-bound states before floating ones */ TAILQ_FOREACH(si, &sk->states, entry) @@ -5938,6 +5946,13 @@ done: if (dir == PF_IN && s && s->key[PF_SK_STACK]) m->m_pkthdr.pf.statekey = s->key[PF_SK_STACK]; + if (dir == PF_OUT && m->m_pkthdr.pf.inp && + !((struct inpcb *)m->m_pkthdr.pf.inp)->inp_pf_sk && + s && s->key[PF_SK_STACK] && !s->key[PF_SK_STACK]->inp) { + ((struct inpcb *)m->m_pkthdr.pf.inp)->inp_pf_sk = + s->key[PF_SK_STACK]; + s->key[PF_SK_STACK]->inp = m->m_pkthdr.pf.inp; + } #ifdef ALTQ if (action == PF_PASS && qid) { @@ -6223,6 +6238,13 @@ done: if (dir == PF_IN && s && s->key[PF_SK_STACK]) m->m_pkthdr.pf.statekey = s->key[PF_SK_STACK]; + if (dir == PF_OUT && m->m_pkthdr.pf.inp && + !((struct inpcb *)m->m_pkthdr.pf.inp)->inp_pf_sk && + s && s->key[PF_SK_STACK] && !s->key[PF_SK_STACK]->inp) { + ((struct inpcb *)m->m_pkthdr.pf.inp)->inp_pf_sk = + s->key[PF_SK_STACK]; + s->key[PF_SK_STACK]->inp = m->m_pkthdr.pf.inp; + } #ifdef ALTQ if (action == PF_PASS && qid) { @@ -6319,4 +6341,5 @@ void pf_pkt_addr_changed(struct mbuf *m) { m->m_pkthdr.pf.statekey = NULL; + m->m_pkthdr.pf.inp = NULL; } |