diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2009-08-09 12:47:51 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2009-08-09 12:47:51 +0000 |
| commit | 472e8d44c683b7b141f1c15d16ea056ae642c8f3 (patch) | |
| tree | 98d8279265ae0bb9d8ca6d602f01b941faab79d5 /sys/netinet/ipsec_input.c | |
| parent | 1778e353edc65e9ea30f24d9341dfad10dcd57d9 (diff) | |
once again ipsec tries to be clever and plays fast, this time by
recycling an mbuf tag and changing its type. just always get a new one.
theo ok
Diffstat (limited to 'sys/netinet/ipsec_input.c')
| -rw-r--r-- | sys/netinet/ipsec_input.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index 3fbc250574e..d371367d458 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.91 2008/10/22 23:04:45 mpf Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.92 2009/08/09 12:47:50 henning Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -520,7 +520,7 @@ ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff, * with a PACKET_TAG_IPSEC_IN_CRYPTO_DONE as opposed to * PACKET_TAG_IPSEC_IN_DONE type; in that case, just change the type. */ - if (mt == NULL && tdbp->tdb_sproto != IPPROTO_IPCOMP) { + if (tdbp->tdb_sproto != IPPROTO_IPCOMP) { mtag = m_tag_get(PACKET_TAG_IPSEC_IN_DONE, sizeof(struct tdb_ident), M_NOWAIT); if (mtag == NULL) { @@ -539,9 +539,6 @@ ipsec_common_input_cb(struct mbuf *m, struct tdb *tdbp, int skip, int protoff, tdbi->spi = tdbp->tdb_spi; m_tag_prepend(m, mtag); - } else { - if (mt != NULL) - mt->m_tag_id = PACKET_TAG_IPSEC_IN_DONE; } if (sproto == IPPROTO_ESP) { |