diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2015-09-15 12:30:58 -0500 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2015-10-20 11:33:42 -0500 |
| commit | 49d7fe39863f0ffcf4ac6c559ef84589ea42bd0a (patch) | |
| tree | 24cdbb3972d1aead1ff420f1e8e4984c8ef906a0 /sys/netipsec/ipsec_output.c | |
| parent | 15988797df0ce562e67d6fa1c912e4cda6194678 (diff) | |
| download | FreeBSD-src-49d7fe39863f0ffcf4ac6c559ef84589ea42bd0a.zip FreeBSD-src-49d7fe39863f0ffcf4ac6c559ef84589ea42bd0a.tar.gz | |
Revert IPSEC patches.
Revert "Importing pfSense patch ipsec_altq.RELENG_10.diff"
This reverts commit 5b128f054452e56b96564210c998510e0dd45130.
TAG: IPSEC-HEAD
Issue: #4841
Diffstat (limited to 'sys/netipsec/ipsec_output.c')
| -rw-r--r-- | sys/netipsec/ipsec_output.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c index 33b84e0..442fb7a 100644 --- a/sys/netipsec/ipsec_output.c +++ b/sys/netipsec/ipsec_output.c @@ -43,11 +43,6 @@ #include <sys/errno.h> #include <sys/syslog.h> -#ifdef DEV_ENC -#include <altq/if_altq.h> -#include <netpfil/pf/pf_mtag.h> -#endif - #include <net/if.h> #include <net/pfil.h> #include <net/vnet.h> @@ -103,7 +98,6 @@ ipsec_process_done(struct mbuf *m, struct ipsecrequest *isr) struct m_tag *mtag; struct secasvar *sav; struct secasindex *saidx; - struct pf_mtag *atag = NULL; int error; IPSEC_ASSERT(m != NULL, ("null mbuf")); @@ -195,15 +189,6 @@ ipsec_process_done(struct mbuf *m, struct ipsecrequest *isr) } key_sa_recordxfer(sav, m); /* record data transfer */ -#ifdef DEV_ENC - if (saidx->qid && (atag = pf_find_mtag(m)) != NULL) { - atag->qid = saidx->qid; - /* add hints for ecn */ - atag->af = saidx->dst.sa.sa_family; - atag->hdr = NULL; /* This should be safe! */ - } -#endif - /* * We're done with IPsec processing, transmit the packet using the * appropriate network protocol (IP or IPv6). SPD lookup will be @@ -470,8 +455,7 @@ ipsec4_process_packet( /* pass the mbuf to enc0 for bpf processing */ ipsec_bpf(m, sav, AF_INET, ENC_OUT|ENC_BEFORE); /* pass the mbuf to enc0 for packet filtering */ - if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_OUT, - ENC_OUT|ENC_BEFORE)) != 0) + if ((error = ipsec_filter(&m, PFIL_OUT, ENC_OUT|ENC_BEFORE)) != 0) goto bad; #endif @@ -570,8 +554,7 @@ ipsec4_process_packet( /* pass the mbuf to enc0 for bpf processing */ ipsec_bpf(m, sav, sav->sah->saidx.dst.sa.sa_family, ENC_OUT|ENC_AFTER); /* pass the mbuf to enc0 for packet filtering */ - if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_OUT, - ENC_OUT|ENC_AFTER)) != 0) + if ((error = ipsec_filter(&m, PFIL_OUT, ENC_OUT|ENC_AFTER)) != 0) goto bad; #endif @@ -674,8 +657,7 @@ ipsec6_process_packet( /* pass the mbuf to enc0 for bpf processing */ ipsec_bpf(m, isr->sav, AF_INET6, ENC_OUT|ENC_BEFORE); /* pass the mbuf to enc0 for packet filtering */ - if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_OUT, - ENC_OUT|ENC_BEFORE)) != 0) + if ((error = ipsec_filter(&m, PFIL_OUT, ENC_OUT|ENC_BEFORE)) != 0) goto bad; #endif /* DEV_ENC */ @@ -727,8 +709,7 @@ ipsec6_process_packet( #ifdef DEV_ENC ipsec_bpf(m, isr->sav, dst->sa.sa_family, ENC_OUT|ENC_AFTER); /* pass the mbuf to enc0 for packet filtering */ - if ((error = ipsec_filter(&m, &sav->sah->saidx, PFIL_OUT, - ENC_OUT|ENC_AFTER)) != 0) + if ((error = ipsec_filter(&m, PFIL_OUT, ENC_OUT|ENC_AFTER)) != 0) goto bad; #endif /* DEV_ENC */ |
