diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2012-07-16 18:05:37 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2012-07-16 18:05:37 +0000 |
| commit | c1c071f56546d75090dad47c26f4b82cf1c4db31 (patch) | |
| tree | 9dc5da863568ebde526eef4650292746c9c86155 /sys/netinet6 | |
| parent | f298cc988d97280917f4b9ff77d0db5501c66744 (diff) | |
add IP_IPSECFLOWINFO option to sendmsg() and recvmsg(), so npppd(4)
can use this to select the IPsec tunnel for sending L2TP packets.
this fixes Windows (always binding to 1701) and Android clients
(negotiating wildcard flows); feedback mpf@ and yasuoka@;
ok henning@ and yasuoka@; ok jmc@ for the manpage
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_forward.c | 4 | ||||
| -rw-r--r-- | sys/netinet6/ip6_output.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 4045cc1d6a1..3c63ac1c6df 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_forward.c,v 1.53 2011/07/04 06:54:49 claudio Exp $ */ +/* $OpenBSD: ip6_forward.c,v 1.54 2012/07/16 18:05:36 markus Exp $ */ /* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */ /* @@ -171,7 +171,7 @@ reroute: m_tag_delete(m, mtag); } else tdb = ipsp_spd_lookup(m, AF_INET6, sizeof(struct ip6_hdr), - &error, IPSP_DIRECTION_OUT, NULL, NULL); + &error, IPSP_DIRECTION_OUT, NULL, NULL, 0); if (tdb == NULL) { splx(s); diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 328d561dbeb..07aedeed4d2 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.124 2012/04/13 09:38:32 deraadt Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.125 2012/07/16 18:05:36 markus Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -248,7 +248,7 @@ ip6_output(struct mbuf *m0, struct ip6_pktopts *opt, struct route_in6 *ro, m_tag_delete(m, mtag); } else tdb = ipsp_spd_lookup(m, AF_INET6, sizeof(struct ip6_hdr), - &error, IPSP_DIRECTION_OUT, NULL, inp); + &error, IPSP_DIRECTION_OUT, NULL, inp, 0); if (tdb == NULL) { splx(s); |