summaryrefslogtreecommitdiffstats
path: root/sys/netinet/ipsec_input.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2004-11-25 21:54:54 +0000
committermarkus <markus@openbsd.org>2004-11-25 21:54:54 +0000
commit7287cf4e2884f49ee7ba220ca712934e982e131b (patch)
tree9839bca0f65c967a5680ffe31257652090af31b2 /sys/netinet/ipsec_input.c
parentuse ttl from setsockopt(), similar to bsd/os; ok henning, mcbride, fgsch (diff)
downloadwireguard-openbsd-7287cf4e2884f49ee7ba220ca712934e982e131b.tar.xz
wireguard-openbsd-7287cf4e2884f49ee7ba220ca712934e982e131b.zip
resolve conflict between M_TUNNEL and M_ANYCAST6, remove M_COMP (it's
only set and never read), update documentation; ok fgsch, deraadt, millert
Diffstat (limited to 'sys/netinet/ipsec_input.c')
-rw-r--r--sys/netinet/ipsec_input.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index 43bd253b723..cb7aa669434 100644
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec_input.c,v 1.74 2004/06/21 23:50:37 tholo Exp $ */
+/* $OpenBSD: ipsec_input.c,v 1.75 2004/11/25 21:54:54 markus Exp $ */
/*
* The authors of this code are John Ioannidis (ji@tla.org),
* Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -551,9 +551,7 @@ ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff,
/* Check if we had authenticated ESP. */
if (tdbp->tdb_authalgxform)
m->m_flags |= M_AUTH;
- } else if (sproto == IPPROTO_IPCOMP)
- m->m_flags |= M_COMP;
- else
+ } else if (sproto == IPPROTO_AH)
m->m_flags |= M_AUTH | M_AUTH_AH;
if (tdbp->tdb_flags & TDBF_TUNNELING)