diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-09-15 12:26:31 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-10-20 11:10:10 -0500 |
| commit | ea42509b231a17a52b0623895f91cb6add0d4cf8 (patch) | |
| tree | cbd62d8a2bef7b010211284d66bc601ac0701bdd /sys/netipsec | |
| parent | e52aa5f667faebee85874ec39c29fa1257dd554f (diff) | |
| download | FreeBSD-src-ea42509b231a17a52b0623895f91cb6add0d4cf8.zip FreeBSD-src-ea42509b231a17a52b0623895f91cb6add0d4cf8.tar.gz | |
Revert IPSEC patches.
Revert "Importing pfSense patch ipsec_transport_filterfix.diff"
This reverts commit 924a927559577e9cea5abf4a725e679acad834bf.
TAG: IPSEC-HEAD
Issue: #4841
Diffstat (limited to 'sys/netipsec')
| -rw-r--r-- | sys/netipsec/ipsec_input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index 405806f..c906d91 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -353,9 +353,9 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, encif->if_ibytes += m->m_pkthdr.len; /* Pass the mbuf to enc0 for bpf and pfil. */ - ipsec_bpf(m, sav, AF_INET, saidx->mode == IPSEC_MODE_TRANSPORT ? ENC_IN|ENC_AFTER : ENC_IN|ENC_BEFORE); + ipsec_bpf(m, sav, AF_INET, ENC_IN|ENC_BEFORE); if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_IN, - saidx->mode == IPSEC_MODE_TRANSPORT ? ENC_IN|ENC_AFTER : ENC_IN|ENC_BEFORE)) != 0) + ENC_IN|ENC_BEFORE)) != 0) return (error); #endif /* DEV_ENC */ @@ -657,9 +657,9 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, int proto encif->if_ibytes += m->m_pkthdr.len; /* Pass the mbuf to enc0 for bpf and pfil. */ - ipsec_bpf(m, sav, AF_INET6, saidx->mode == IPSEC_MODE_TRANSPORT ? ENC_IN|ENC_AFTER : ENC_IN|ENC_BEFORE); + ipsec_bpf(m, sav, AF_INET6, ENC_IN|ENC_BEFORE); if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_IN, - saidx->mode == IPSEC_MODE_TRANSPORT ? ENC_IN|ENC_AFTER : ENC_IN|ENC_BEFORE)) != 0) + ENC_IN|ENC_BEFORE)) != 0) return (error); #endif /* DEV_ENC */ |
