summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2011-04-13 11:28:48 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2011-04-13 11:28:48 +0000
commitc9487c00a11eabd06299ecd4e35c2a91a4e6d55e (patch)
tree6933b1c8ee4d85df9a7d21b094a3f9188258380d /sys/net
parent4bf4717f9dcf45b07bb04cd8ddd7c86d02ce38bd (diff)
export udpencap state of SA to userland; unbreaks sasyncd(8) with NAT/T.
ok mikeb@ fries@ mpf@ henning@ dlg@ matthew@
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/pfkeyv2_convert.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c
index 8de7fdadc56..a029328b025 100644
--- a/sys/net/pfkeyv2_convert.c
+++ b/sys/net/pfkeyv2_convert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2_convert.c,v 1.34 2010/10/06 22:19:20 mikeb Exp $ */
+/* $OpenBSD: pfkeyv2_convert.c,v 1.35 2011/04/13 11:28:47 markus Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@keromytis.org)
*
@@ -289,6 +289,9 @@ export_sa(void **p, struct tdb *tdb)
if (tdb->tdb_flags & TDBF_NOREPLAY)
sadb_sa->sadb_sa_flags |= SADB_X_SAFLAGS_NOREPLAY;
+ if (tdb->tdb_flags & TDBF_UDPENCAP)
+ sadb_sa->sadb_sa_flags |= SADB_X_SAFLAGS_UDPENCAP;
+
*p += sizeof(struct sadb_sa);
}