diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2017-01-04 14:50:54 -0600 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-07-17 21:45:49 -0500 |
| commit | 0cb4ca23471654a154f33db0ac419f8d37fc8cf8 (patch) | |
| tree | 721d736f13536a14772e8d49832d3bf310891253 | |
| parent | 19578e75e06ca0c1b4127c9331a02eba3b1a66b0 (diff) | |
| download | FreeBSD-src-0cb4ca23471654a154f33db0ac419f8d37fc8cf8.zip FreeBSD-src-0cb4ca23471654a154f33db0ac419f8d37fc8cf8.tar.gz | |
Revert this change from the previous commit, it actually breaks the nat undo/redo.
(cherry picked from commit 3af193c1cec01f6188c35021a07e3f43201f105f)
| -rw-r--r-- | sys/netpfil/pf/pf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 7b279c8..ecb86a6 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -316,8 +316,7 @@ VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]); #define PACKET_UNDO_NAT(_m, _pd, _off, _s, _dir) \ do { \ struct pf_state_key *nk; \ - if ((_dir) == PF_OUT && \ - (_s)->nat_rule.ptr->action == PF_NAT) \ + if ((_dir) == PF_OUT) \ nk = (_s)->key[PF_SK_STACK]; \ else \ nk = (_s)->key[PF_SK_WIRE]; \ @@ -326,8 +325,7 @@ VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]); #define PACKET_REDO_NAT(_m, _pd, _off, _s, _dir) \ do { \ struct pf_state_key *nk; \ - if ((_dir) == PF_OUT && \ - (_s)->nat_rule.ptr->action == PF_NAT) \ + if ((_dir) == PF_OUT) \ nk = (_s)->key[PF_SK_WIRE]; \ else \ nk = (_s)->key[PF_SK_STACK]; \ |
