diff options
| author |   dlg <dlg@openbsd.org> | 2020-05-31 03:14:59 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2020-05-31 03:14:59 +0000 |
| commit | 0315bf924272c73843bfe873662dacd6320b6db7 (patch) | |
| tree | a2fd295c8cb128d273a11b8041d6d97680e8ab3a | |
| parent | Switch Powerpc64 Big Endian to ELFv2 on OpenBSD, as least for now. (diff) | |
| download | wireguard-openbsd-0315bf924272c73843bfe873662dacd6320b6db7.tar.xz wireguard-openbsd-0315bf924272c73843bfe873662dacd6320b6db7.zip | |
use ip{,6}_send instead of ip{,6}_output for l2tp and pptp.
pipex output is part of pppx and pppac if_start functions, so it
can't rely on or know if it already has NET_LOCK. this defers the
ip output stuff to where it can take the NET_LOCK reliably.
tested by Vitaliy Makkoveev, who also found that this was necessary
after ifq.c 1.38 and provided an excellent analysis of the problem.
ok mpi@
| -rw-r--r-- | sys/net/pipex.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sys/net/pipex.c b/sys/net/pipex.c index c433e4beaa6..69032482cac 100644 --- a/sys/net/pipex.c +++ b/sys/net/pipex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.c,v 1.113 2020/04/07 07:11:22 claudio Exp $ */ +/* $OpenBSD: pipex.c,v 1.114 2020/05/31 03:14:59 dlg Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -1453,10 +1453,7 @@ pipex_pptp_output(struct mbuf *m0, struct pipex_session *session, gre->flags = htons(gre->flags); m0->m_pkthdr.ph_ifidx = session->pipex_iface->ifnet_this->if_index; - if (ip_output(m0, NULL, NULL, 0, NULL, NULL, 0) != 0) { - PIPEX_DBG((session, LOG_DEBUG, "ip_output failed.")); - goto drop; - } + ip_send(m0); if (len > 0) { /* network layer only */ /* countup statistics */ session->stat.opackets++; @@ -1901,11 +1898,7 @@ pipex_l2tp_output(struct mbuf *m0, struct pipex_session *session) ip->ip_tos = 0; ip->ip_off = 0; - if (ip_output(m0, NULL, NULL, 0, NULL, NULL, - session->proto.l2tp.ipsecflowinfo) != 0) { - PIPEX_DBG((session, LOG_DEBUG, "ip_output failed.")); - goto drop; - } + ip_send(m0); break; #ifdef INET6 case AF_INET6: @@ -1920,10 +1913,7 @@ pipex_l2tp_output(struct mbuf *m0, struct pipex_session *session) &session->peer.sin6, NULL); /* ip6->ip6_plen will be filled in ip6_output. */ - if (ip6_output(m0, NULL, NULL, 0, NULL, NULL) != 0) { - PIPEX_DBG((session, LOG_DEBUG, "ip6_output failed.")); - goto drop; - } + ip6_send(m0); break; #endif } |