diff options
| author |   mpi <mpi@openbsd.org> | 2015-09-12 20:26:06 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-09-12 20:26:06 +0000 |
| commit | 72064afc60daf787368454614b699be3bc7183fd (patch) | |
| tree | 1bb158951c41fe5701b390b9debf2c186124a8ea /sys/netinet/ip_output.c | |
| parent | explicit_bzero() the GOST premaster secret. (diff) | |
| download | wireguard-openbsd-72064afc60daf787368454614b699be3bc7183fd.tar.xz wireguard-openbsd-72064afc60daf787368454614b699be3bc7183fd.zip | |
Stop overwriting the rt_ifp pointer of RTF_LOCAL routes with lo0ifp.
Use instead the RTF_LOCAL flag to loop local traffic back to the
corresponding protocol queue.
With this change rt_ifp is now always the same as rt_ifa->ifa_ifp.
ok claudio@
Diffstat (limited to 'sys/netinet/ip_output.c')
| -rw-r--r-- | sys/netinet/ip_output.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index d33392c4d8e..805c3776eb6 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_output.c,v 1.295 2015/09/12 13:34:12 mpi Exp $ */ +/* $OpenBSD: ip_output.c,v 1.296 2015/09/12 20:26:07 mpi Exp $ */ /* $NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $ */ /* @@ -566,7 +566,7 @@ sendit: ip->ip_sum = in_cksum(m, hlen); } - error = (*ifp->if_output)(ifp, m, sintosa(dst), ro->ro_rt); + error = if_output(ifp, m, sintosa(dst), ro->ro_rt); goto done; } @@ -606,8 +606,7 @@ sendit: m0 = m->m_nextpkt; m->m_nextpkt = 0; if (error == 0) - error = (*ifp->if_output)(ifp, m, sintosa(dst), - ro->ro_rt); + error = if_output(ifp, m, sintosa(dst), ro->ro_rt); else m_freem(m); } @@ -1660,9 +1659,7 @@ ip_freemoptions(struct ip_moptions *imo) /* * Routine called from ip_output() to loop back a copy of an IP multicast - * packet to the input queue of a specified interface. Note that this - * calls the output routine of the loopback "driver", but with an interface - * pointer that might NOT be &loif -- easier than replicating that code here. + * packet to the input queue of a specified interface. */ void ip_mloopback(struct ifnet *ifp, struct mbuf *m, struct sockaddr_in *dst) |