diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2017-01-09 11:53:29 -0600 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-07-17 21:46:59 -0500 |
| commit | 5220451c59ae584fe77f5060d634d44475db71ed (patch) | |
| tree | ab791d6f681232edfa7988fbf1ec34d67b7e9a29 | |
| parent | 34a1694802ca6f9800e3acc36c422a6dfc5de73b (diff) | |
| download | FreeBSD-src-5220451c59ae584fe77f5060d634d44475db71ed.zip FreeBSD-src-5220451c59ae584fe77f5060d634d44475db71ed.tar.gz | |
Apply the previous dummynet fixes on v6 version of the code.
(cherry picked from commit c5118da571b9ef9e22fd40b1cab8dec097e9fd7d)
| -rw-r--r-- | sys/netpfil/pf/pf.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 3a741ee..ce055ac 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7015,7 +7015,8 @@ done: /* XXX: ipfw has the same behaviour! */ action = PF_DROP; REASON_SET(&reason, PFRES_MEMORY); - } else if ((pd.act.dnpipe || pd.act.pdnpipe) && !PACKET_LOOPED(&pd)) { + } else if (action == PF_PASS && + (pd.act.dnpipe || pd.act.pdnpipe) && !PACKET_LOOPED(&pd)) { if (dir != r->direction && pd.act.pdnpipe) { dnflow.rule.info = pd.act.pdnpipe; } else if (dir == r->direction && pd.act.dnpipe) { @@ -7039,17 +7040,17 @@ done: if (s != NULL && s->nat_rule.ptr) PACKET_UNDO_NAT(m, &pd, off, s, dir); - if (ip_dn_io_ptr(m0, - ((dir == PF_IN) ? DIR_IN : DIR_OUT) | PROTO_IPV6, - &dnflow) != 0) - action = PF_DROP; + ip_dn_io_ptr(m0, + ((dir == PF_IN) ? DIR_IN : DIR_OUT) | PROTO_IPV6, &dnflow); if (*m0 == NULL) { if (s) PF_STATE_UNLOCK(s); return (action); } /* This is dummynet fast io processing */ - m_tag_delete(*m0, m_tag_first(*m0)); + ipfwtag = m_tag_locate(m, MTAG_IPFW_RULE, 0, NULL); + if (ipfwtag != NULL) + m_tag_delete(*m0, ipfwtag); if (s != NULL && s->nat_rule.ptr) PACKET_REDO_NAT(m, &pd, off, s, dir); } @@ -7060,7 +7061,7 @@ continueprocessing6: (s->nat_rule.ptr->action == PF_RDR || s->nat_rule.ptr->action == PF_BINAT) && IN6_IS_ADDR_LOOPBACK(&pd.dst->v6)) - m->m_flags |= M_SKIP_FIREWALL; + m->m_flags |= M_FASTFWD_OURS; /* XXX: Anybody working on it?! */ if (r->divert.port) |
