diff options
| author |   dlg <dlg@openbsd.org> | 2019-01-27 04:20:59 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2019-01-27 04:20:59 +0000 |
| commit | c6de5097b19f89fef4de151fa9cfd25da3a0a05f (patch) | |
| tree | 034eb202f45c92facf8aeec383b00bff78bdb081 /sys/netmpls | |
| parent | zap a commented out line. 0RTT will need more thought than (diff) | |
| download | wireguard-openbsd-c6de5097b19f89fef4de151fa9cfd25da3a0a05f.tar.xz wireguard-openbsd-c6de5097b19f89fef4de151fa9cfd25da3a0a05f.zip | |
change how packets are pushed into mpe(4).
mpe(4) adds itself ot the mpls rtable with RTF_LOCAL set, which
pushes the packet through mpe_output, which sees RTF_LOCAL can calls
mpe_input. this follows what mpw(4) does, and removes a special
case in mpls_input.
Diffstat (limited to 'sys/netmpls')
| -rw-r--r-- | sys/netmpls/mpls.h | 7 | ||||
| -rw-r--r-- | sys/netmpls/mpls_input.c | 9 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sys/netmpls/mpls.h b/sys/netmpls/mpls.h index 89fcbc0f14d..bc6ee28196a 100644 --- a/sys/netmpls/mpls.h +++ b/sys/netmpls/mpls.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls.h,v 1.39 2019/01/27 02:41:56 dlg Exp $ */ +/* $OpenBSD: mpls.h,v 1.40 2019/01/27 04:20:59 dlg Exp $ */ /* * Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project. @@ -156,11 +156,6 @@ struct ifmpwreq { extern struct domain mplsdomain; -void mpe_input(struct mbuf *, struct ifnet *, struct sockaddr_mpls *, - u_int8_t); -void mpe_input6(struct mbuf *, struct ifnet *, struct sockaddr_mpls *, - u_int8_t); - extern int mpls_defttl; extern int mpls_mapttl_ip; extern int mpls_mapttl_ip6; diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c index f0b6ce11e09..57355e287cb 100644 --- a/sys/netmpls/mpls_input.c +++ b/sys/netmpls/mpls_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_input.c,v 1.71 2019/01/27 02:24:49 dlg Exp $ */ +/* $OpenBSD: mpls_input.c,v 1.72 2019/01/27 04:20:59 dlg Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -204,13 +204,6 @@ do_v6: m_freem(m); goto done; } -#if NMPE > 0 - if (ifp->if_type == IFT_MPLS) { - smpls = satosmpls(rt_key(rt)); - mpe_input(m, ifp, smpls, ttl); - goto done; - } -#endif KASSERT(rt->rt_gateway); |