diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/files | 4 | ||||
| -rw-r--r-- | sys/net/if_mobileip.c | 659 | ||||
| -rw-r--r-- | sys/net/if_mobileip.h | 41 | ||||
| -rw-r--r-- | sys/netinet/in.h | 4 | ||||
| -rw-r--r-- | sys/netinet/in_proto.c | 21 | ||||
| -rw-r--r-- | sys/netinet/ip_gre.h | 13 |
6 files changed, 5 insertions, 737 deletions
diff --git a/sys/conf/files b/sys/conf/files index fc4c7783882..b370fd08177 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.675 2019/10/05 05:33:14 dlg Exp $ +# $OpenBSD: files,v 1.676 2019/11/04 23:52:27 dlg Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -554,7 +554,6 @@ pseudo-device carp: ifnet, ether pseudo-device sppp: ifnet pseudo-device gif: ifnet pseudo-device gre: ifnet -pseudo-device mobileip: ifnet pseudo-device crypto: ifnet pseudo-device trunk: ifnet, ether, ifmedia pseudo-device aggr: ifnet, ether, ifmedia @@ -810,7 +809,6 @@ file net/rtsock.c file net/slcompress.c ppp file net/if_enc.c enc needs-count file net/if_gre.c gre needs-count -file net/if_mobileip.c mobileip needs-count file net/if_trunk.c trunk needs-count file net/trunklacp.c trunk file net/if_aggr.c aggr diff --git a/sys/net/if_mobileip.c b/sys/net/if_mobileip.c deleted file mode 100644 index dc740714d18..00000000000 --- a/sys/net/if_mobileip.c +++ /dev/null @@ -1,659 +0,0 @@ -/* $OpenBSD: if_mobileip.c,v 1.8 2018/02/18 23:53:17 dlg Exp $ */ - -/* - * Copyright (c) 2016 David Gwynne <dlg@openbsd.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "mobileip.h" - -#include "bpfilter.h" -#include "pf.h" - -#include <sys/param.h> -#include <sys/mbuf.h> -#include <sys/socket.h> -#include <sys/sockio.h> -#include <sys/kernel.h> -#include <sys/systm.h> -#include <sys/timeout.h> -#include <sys/queue.h> - -#include <net/if.h> -#include <net/if_types.h> -#include <net/if_var.h> -#include <net/route.h> - -#include <netinet/in.h> -#include <netinet/ip.h> -#include <netinet/ip_var.h> - -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif - -#if NPF > 0 -#include <net/pfvar.h> -#endif - -#include <net/if_mobileip.h> - -struct mobileip_tunnel { - unsigned int t_rtableid; - struct in_addr t_src; - struct in_addr t_dst; - - TAILQ_ENTRY(mobileip_tunnel) - t_entry; -}; - -TAILQ_HEAD(mobileip_list, mobileip_tunnel); - -struct mobileip_softc { - struct mobileip_tunnel sc_tunnel; - struct ifnet sc_if; -}; - -static int mobileip_clone_create(struct if_clone *, int); -static int mobileip_clone_destroy(struct ifnet *); - -static struct if_clone mobileip_cloner = IF_CLONE_INITIALIZER("mobileip", - mobileip_clone_create, mobileip_clone_destroy); - -static inline int - mobileip_cmp(const struct mobileip_tunnel *, - const struct mobileip_tunnel *); - -struct mobileip_list mobileip_list = TAILQ_HEAD_INITIALIZER(mobileip_list); - -#define MOBILEIPMTU (1500 - (sizeof(struct mobileip_header) + \ - sizeof(struct mobileip_h_src))) \ - -static int mobileip_ioctl(struct ifnet *, u_long, caddr_t); -static int mobileip_up(struct mobileip_softc *); -static int mobileip_down(struct mobileip_softc *); -static int mobileip_set_tunnel(struct mobileip_softc *, - struct if_laddrreq *); -static int mobileip_get_tunnel(struct mobileip_softc *, - struct if_laddrreq *); -static int mobileip_del_tunnel(struct mobileip_softc *); - -static int mobileip_output(struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *); -static void mobileip_start(struct ifnet *); -static int mobileip_encap(struct mobileip_softc *, struct mbuf *); -static struct mobileip_softc * - mobileip_find(const struct mobileip_tunnel *); - -/* - * let's begin - */ - -int mobileip_allow = 0; - -void -mobileipattach(int n) -{ - if_clone_attach(&mobileip_cloner); -} - -int -mobileip_clone_create(struct if_clone *ifc, int unit) -{ - struct mobileip_softc *sc; - - sc = malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT|M_ZERO); - if (!sc) - return (ENOMEM); - - sc->sc_tunnel.t_rtableid = 0; - sc->sc_tunnel.t_src.s_addr = INADDR_ANY; - sc->sc_tunnel.t_dst.s_addr = INADDR_ANY; - - snprintf(sc->sc_if.if_xname, sizeof sc->sc_if.if_xname, "%s%d", - ifc->ifc_name, unit); - sc->sc_if.if_softc = sc; - sc->sc_if.if_type = IFT_TUNNEL; - sc->sc_if.if_addrlen = 0; - sc->sc_if.if_mtu = MOBILEIPMTU; - sc->sc_if.if_flags = IFF_POINTOPOINT|IFF_MULTICAST; - sc->sc_if.if_output = mobileip_output; - sc->sc_if.if_start = mobileip_start; - sc->sc_if.if_ioctl = mobileip_ioctl; - sc->sc_if.if_rtrequest = p2p_rtrequest; - - if_attach(&sc->sc_if); - if_alloc_sadl(&sc->sc_if); - -#if NBPFILTER > 0 - bpfattach(&sc->sc_if.if_bpf, &sc->sc_if, DLT_LOOP, sizeof(uint32_t)); -#endif - - NET_LOCK(); - TAILQ_INSERT_TAIL(&mobileip_list, &sc->sc_tunnel, t_entry); - NET_UNLOCK(); - - return (0); -} - -int -mobileip_clone_destroy(struct ifnet *ifp) -{ - struct mobileip_softc *sc = ifp->if_softc; - - if_detach(ifp); - - NET_LOCK(); - if (ISSET(ifp->if_flags, IFF_RUNNING)) - mobileip_down(sc); - - TAILQ_REMOVE(&mobileip_list, &sc->sc_tunnel, t_entry); - NET_UNLOCK(); - - free(sc, M_DEVBUF, sizeof(*sc)); - - return (0); -} - -/* - * do a checksum of a header. - * - * assumes len is aligned correctly, and not an odd number of bytes. - */ -static inline uint16_t -mobileip_cksum(const void *buf, size_t len) -{ - const uint16_t *p = buf; - uint32_t sum = 0; - - do { - sum += bemtoh16(p++); - } while (len -= 2); - - /* end-around-carry */ - sum = (sum >> 16) + (sum & 0xffff); - sum += (sum >> 16); - return (~sum); -} - -static inline int -mobileip_cmp(const struct mobileip_tunnel *a, const struct mobileip_tunnel *b) -{ - if (a->t_src.s_addr > b->t_src.s_addr) - return (1); - if (a->t_src.s_addr < b->t_src.s_addr) - return (-1); - - if (a->t_dst.s_addr > b->t_dst.s_addr) - return (1); - if (a->t_dst.s_addr < b->t_dst.s_addr) - return (-1); - - if (a->t_rtableid > b->t_rtableid) - return (1); - if (a->t_rtableid < b->t_rtableid) - return (-1); - - return (0); -} - -static int -mobileip_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, - struct rtentry *rt) -{ - struct m_tag *mtag; - int error = 0; - - if (!mobileip_allow) { - m_freem(m); - error = EACCES; - goto end; - } - - if (!ISSET(ifp->if_flags, IFF_RUNNING)) { - m_freem(m); - error = ENETDOWN; - goto end; - } - - if (dst->sa_family != AF_INET) { - m_freem(m); - error = EAFNOSUPPORT; - goto end; - } - - /* Try to limit infinite recursion through misconfiguration. */ - for (mtag = m_tag_find(m, PACKET_TAG_GRE, NULL); mtag; - mtag = m_tag_find(m, PACKET_TAG_GRE, mtag)) { - if (memcmp(mtag + 1, &ifp->if_index, - sizeof(ifp->if_index)) == 0) { - m_freem(m); - error = EIO; - goto end; - } - } - - mtag = m_tag_get(PACKET_TAG_GRE, sizeof(ifp->if_index), M_NOWAIT); - if (mtag == NULL) { - m_freem(m); - error = ENOBUFS; - goto end; - } - memcpy(mtag + 1, &ifp->if_index, sizeof(ifp->if_index)); - m_tag_prepend(m, mtag); - - error = if_enqueue(ifp, m); - end: - if (error) - ifp->if_oerrors++; - return (error); -} - -static void -mobileip_start(struct ifnet *ifp) -{ - struct mobileip_softc *sc = ifp->if_softc; - struct mbuf *m; - - while ((m = ifq_dequeue(&ifp->if_snd)) != NULL) { -#if NBPFILTER > 0 - if (ifp->if_bpf) - bpf_mtap_af(ifp->if_bpf, AF_INET, m, BPF_DIRECTION_OUT); -#endif - - if (mobileip_encap(sc, m) != 0) - ifp->if_oerrors++; - } -} - -static int -mobileip_encap(struct mobileip_softc *sc, struct mbuf *m) -{ - struct ip *ip; - struct mobileip_tunnel *tunnel = &sc->sc_tunnel; - struct mobileip_header *mh; - struct mobileip_h_src *msh; - caddr_t hdr; - int iphlen, hlen; - - /* look at the current IP header */ - m = m_pullup(m, sizeof(*ip)); - if (m == NULL) - return (ENOBUFS); - - /* figure out how long it is */ - ip = mtod(m, struct ip *); - iphlen = ip->ip_hl << 2; - - /* figure out how much extra space we'll need */ - hlen = sizeof(*mh); - if (ip->ip_src.s_addr != tunnel->t_src.s_addr) - hlen += sizeof(*msh); - - /* add the space */ - m = m_prepend(m, hlen, M_DONTWAIT); - if (m == NULL) - return (ENOBUFS); - - /* make the IP and mobileip headers contig */ - m = m_pullup(m, iphlen + hlen); - if (m == NULL) - return (ENOBUFS); - - /* move the IP header to the front */ - hdr = mtod(m, caddr_t); - memmove(hdr, hdr + hlen, iphlen); - - /* fill in the headers */ - ip = (struct ip *)hdr; - mh = (struct mobileip_header *)(hdr + iphlen); - mh->mip_proto = ip->ip_p; - mh->mip_flags = 0; - mh->mip_hcrc = 0; - mh->mip_dst = ip->ip_dst.s_addr; - - if (ip->ip_src.s_addr != tunnel->t_src.s_addr) { - mh->mip_flags |= MOBILEIP_SP; - - msh = (struct mobileip_h_src *)(mh + 1); - msh->mip_src = ip->ip_src.s_addr; - - ip->ip_src.s_addr = tunnel->t_src.s_addr; - } - - htobem16(&mh->mip_hcrc, mobileip_cksum(mh, hlen)); - - ip->ip_p = IPPROTO_MOBILE; - htobem16(&ip->ip_len, bemtoh16(&ip->ip_len) + hlen); - ip->ip_dst = tunnel->t_dst; - - m->m_flags &= ~(M_BCAST|M_MCAST); - m->m_pkthdr.ph_rtableid = tunnel->t_rtableid; - -#if NPF > 0 - pf_pkt_addr_changed(m); -#endif - - ip_send(m); - - return (0); -} - -int -mobileip_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) -{ - struct mobileip_softc *sc = ifp->if_softc; - struct ifreq *ifr = (struct ifreq *)data; - struct ifaddr *ifa = (struct ifaddr *)data; - int error = 0; - - switch(cmd) { - case SIOCSIFADDR: - if (ifa->ifa_addr->sa_family != AF_INET) { - error = EAFNOSUPPORT; - break; - } - - ifp->if_flags |= IFF_UP; - /* FALLTHROUGH */ - case SIOCSIFFLAGS: - if (ISSET(ifp->if_flags, IFF_UP)) { - if (!ISSET(ifp->if_flags, IFF_RUNNING)) - error = mobileip_up(sc); - else - error = 0; - } else { - if (ISSET(ifp->if_flags, IFF_RUNNING)) - error = mobileip_down(sc); - } - break; - case SIOCSIFDSTADDR: - break; - case SIOCSIFMTU: - if (ifr->ifr_mtu < 576) { - error = EINVAL; - break; - } - ifp->if_mtu = ifr->ifr_mtu; - break; - case SIOCGIFMTU: - ifr->ifr_mtu = sc->sc_if.if_mtu; - break; - case SIOCADDMULTI: - case SIOCDELMULTI: - break; - - case SIOCSLIFPHYADDR: - error = mobileip_set_tunnel(sc, (struct if_laddrreq *)data); - break; - case SIOCGLIFPHYADDR: - error = mobileip_get_tunnel(sc, (struct if_laddrreq *)data); - break; - case SIOCDIFPHYADDR: - error = mobileip_del_tunnel(sc); - break; - - case SIOCGLIFPHYTTL: - ifr->ifr_ttl = -1; - break; - - case SIOCSLIFPHYRTABLE: - if (ifr->ifr_rdomainid < 0 || - ifr->ifr_rdomainid > RT_TABLEID_MAX || - !rtable_exists(ifr->ifr_rdomainid)) { - error = EINVAL; - break; - } - sc->sc_tunnel.t_rtableid = ifr->ifr_rdomainid; - break; - case SIOCGLIFPHYRTABLE: - ifr->ifr_rdomainid = sc->sc_tunnel.t_rtableid; - break; - - default: - error = ENOTTY; - break; - } - - return (error); -} - -static int -mobileip_up(struct mobileip_softc *sc) -{ - NET_ASSERT_LOCKED(); - - SET(sc->sc_if.if_flags, IFF_RUNNING); - - return (0); -} - -static int -mobileip_down(struct mobileip_softc *sc) -{ - NET_ASSERT_LOCKED(); - - CLR(sc->sc_if.if_flags, IFF_RUNNING); - - ifq_barrier(&sc->sc_if.if_snd); - - return (0); -} - -static int -mobileip_set_tunnel(struct mobileip_softc *sc, struct if_laddrreq *req) -{ - struct sockaddr_in *src = (struct sockaddr_in *)&req->addr; - struct sockaddr_in *dst = (struct sockaddr_in *)&req->dstaddr; - - /* sa_family and sa_len must be equal */ - if (src->sin_family != dst->sin_family || src->sin_len != dst->sin_len) - return (EINVAL); - - if (dst->sin_family != AF_INET) - return (EAFNOSUPPORT); - if (dst->sin_len != sizeof(*dst)) - return (EINVAL); - - if (in_nullhost(src->sin_addr) || - IN_MULTICAST(src->sin_addr.s_addr) || - in_nullhost(dst->sin_addr) || - IN_MULTICAST(dst->sin_addr.s_addr)) - return (EINVAL); - - /* commit */ - sc->sc_tunnel.t_src = src->sin_addr; - sc->sc_tunnel.t_dst = dst->sin_addr; - - return (0); -} - -static int -mobileip_get_tunnel(struct mobileip_softc *sc, struct if_laddrreq *req) -{ - struct sockaddr_in *src = (struct sockaddr_in *)&req->addr; - struct sockaddr_in *dst = (struct sockaddr_in *)&req->dstaddr; - - if (sc->sc_tunnel.t_dst.s_addr == INADDR_ANY) - return (EADDRNOTAVAIL); - - memset(src, 0, sizeof(*src)); - src->sin_family = AF_INET; - src->sin_len = sizeof(*src); - src->sin_addr = sc->sc_tunnel.t_src; - - memset(dst, 0, sizeof(*dst)); - dst->sin_family = AF_INET; - dst->sin_len = sizeof(*dst); - dst->sin_addr = sc->sc_tunnel.t_dst; - - return (0); -} - -static int -mobileip_del_tunnel(struct mobileip_softc *sc) -{ - /* commit */ - sc->sc_tunnel.t_src.s_addr = INADDR_ANY; - sc->sc_tunnel.t_dst.s_addr = INADDR_ANY; - - return (0); -} - -static struct mobileip_softc * -mobileip_find(const struct mobileip_tunnel *key) -{ - struct mobileip_tunnel *t; - struct mobileip_softc *sc; - - TAILQ_FOREACH(t, &mobileip_list, t_entry) { - if (mobileip_cmp(key, t) != 0) - continue; - - sc = (struct mobileip_softc *)t; - if (!ISSET(sc->sc_if.if_flags, IFF_RUNNING)) - continue; - - return (sc); - } - - return (NULL); -} - -int -mobileip_input(struct mbuf **mp, int *offp, int type, int af) -{ - struct mobileip_tunnel key; - struct mbuf *m = *mp; - struct ifnet *ifp; - struct mobileip_softc *sc; - caddr_t hdr; - struct ip *ip; - struct mobileip_header *mh; - struct mobileip_h_src *msh; - int iphlen = 0; - int hlen; - - if (!mobileip_allow) - goto drop; - - ip = mtod(m, struct ip *); - - key.t_rtableid = m->m_pkthdr.ph_rtableid; - key.t_src = ip->ip_dst; - key.t_dst = ip->ip_src; - - /* NET_ASSERT_READ_LOCKED() */ - sc = mobileip_find(&key); - if (sc == NULL) - goto drop; - - /* it's ours now, we can do what we want */ - - iphlen = ip->ip_hl << 2; - hlen = sizeof(*mh); - m = m_pullup(m, iphlen + hlen); - if (m == NULL) - return (IPPROTO_DONE); - - hdr = mtod(m, caddr_t); - ip = (struct ip *)hdr; - mh = (struct mobileip_header *)(hdr + iphlen); - - if (mh->mip_flags & ~MOBILEIP_SP) - goto drop; - - if (ISSET(mh->mip_flags, MOBILEIP_SP)) { - hlen += sizeof(*msh); - m = m_pullup(m, iphlen + hlen); - if (m == NULL) - return (IPPROTO_DONE); - - hdr = mtod(m, caddr_t); - ip = (struct ip *)hdr; - mh = (struct mobileip_header *)(hdr + iphlen); - msh = (struct mobileip_h_src *)(mh + 1); - - ip->ip_src.s_addr = msh->mip_src; - } - - if (mobileip_cksum(mh, hlen) != 0) - goto drop; - - ip->ip_p = mh->mip_proto; - htobem16(&ip->ip_len, bemtoh16(&ip->ip_len) - hlen); - ip->ip_dst.s_addr = mh->mip_dst; - - memmove(hdr + hlen, hdr, iphlen); - m_adj(m, hlen); - - ifp = &sc->sc_if; - - CLR(m->m_flags, M_MCAST|M_BCAST); - SET(m->m_pkthdr.csum_flags, M_IPV4_CSUM_IN_OK); - m->m_pkthdr.ph_ifidx = ifp->if_index; - m->m_pkthdr.ph_rtableid = ifp->if_rdomain; - -#if NPF > 0 - pf_pkt_addr_changed(m); -#endif - - ifp->if_ipackets++; - ifp->if_ibytes += m->m_pkthdr.len; - -#if NBPFILTER > 0 - if (ifp->if_bpf) - bpf_mtap_af(ifp->if_bpf, AF_INET, m, BPF_DIRECTION_IN); -#endif - - ipv4_input(ifp, m); - - return (IPPROTO_DONE); - -drop: - m_freem(m); - return (IPPROTO_DONE); -} - -#include <sys/sysctl.h> -#include <netinet/ip_gre.h> - -int -mobileip_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, - void *newp, size_t newlen) -{ - int allow; - int error; - - /* All sysctl names at this level are terminal. */ - if (namelen != 1) - return (ENOTDIR); - - switch (name[0]) { - case MOBILEIPCTL_ALLOW: - allow = mobileip_allow; - - error = sysctl_int(oldp, oldlenp, newp, newlen, - &allow); - if (error != 0) - return (error); - - mobileip_allow = allow; - break; - default: - return (ENOPROTOOPT); - } - - return (0); -} diff --git a/sys/net/if_mobileip.h b/sys/net/if_mobileip.h deleted file mode 100644 index 1055f36a254..00000000000 --- a/sys/net/if_mobileip.h +++ /dev/null @@ -1,41 +0,0 @@ -/* $OpenBSD: if_mobileip.h,v 1.1 2018/02/07 01:09:57 dlg Exp $ */ - -/* - * Copyright (c) 2016 David Gwynne <dlg@openbsd.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef _NET_IF_MOBILEIP_H -#define _NET_IF_MOBILEIP_H - -struct mobileip_header { - uint8_t mip_proto; /* original protocol */ - uint8_t mip_flags; -#define MOBILEIP_SP 0x80 /* src address is present */ - uint16_t mip_hcrc; /* header checksum */ - uint32_t mip_dst; /* original dst address */ -} __packed __aligned(4); - -struct mobileip_h_src { - uint32_t mip_src; /* original src address */ -} __packed __aligned(4); - -#ifdef _KERNEL -void mobileipattach(int); -int mobileip_input(struct mbuf **, int *, int, int); -int mobileip_sysctl(int *, u_int, void *, size_t *, - void *, size_t); -#endif /* _KERNEL */ - -#endif /* _NET_IF_MOBILEIP_H_ */ diff --git a/sys/netinet/in.h b/sys/netinet/in.h index 3d19d0a9d48..a52ed23c127 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in.h,v 1.136 2019/10/25 01:46:02 dlg Exp $ */ +/* $OpenBSD: in.h,v 1.137 2019/11/04 23:52:28 dlg Exp $ */ /* $NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $ */ /* @@ -441,7 +441,7 @@ struct ip_mreq { { 0, 0 }, \ { 0, 0 }, \ { 0, 0 }, \ - { "mobileip", CTLTYPE_NODE }, \ + { 0, 0 }, \ { 0, 0 }, \ { 0, 0 }, \ { 0, 0 }, \ diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index 53e86b16b33..f474f0ca901 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_proto.c,v 1.93 2019/07/15 12:40:42 bluhm Exp $ */ +/* $OpenBSD: in_proto.c,v 1.94 2019/11/04 23:52:28 dlg Exp $ */ /* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */ /* @@ -172,11 +172,6 @@ #include <net/if_etherip.h> #endif -#include "mobileip.h" -#if NMOBILEIP > 0 -#include <net/if_mobileip.h> -#endif - u_char ip_protox[IPPROTO_MAX]; const struct protosw inetsw[] = { @@ -354,20 +349,6 @@ const struct protosw inetsw[] = { .pr_sysctl = gre_sysctl }, #endif /* NGRE > 0 */ -#if NMOBILEIP > 0 -{ - .pr_type = SOCK_RAW, - .pr_domain = &inetdomain, - .pr_protocol = IPPROTO_MOBILE, - .pr_flags = PR_ATOMIC|PR_ADDR, - .pr_input = mobileip_input, - .pr_ctloutput = rip_ctloutput, - .pr_usrreq = rip_usrreq, - .pr_attach = rip_attach, - .pr_detach = rip_detach, - .pr_sysctl = mobileip_sysctl -}, -#endif /* NMOBILEIP > 0 */ #if NCARP > 0 { .pr_type = SOCK_RAW, diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h index 3a517896cf3..8c5f742d145 100644 --- a/sys/netinet/ip_gre.h +++ b/sys/netinet/ip_gre.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_gre.h,v 1.13 2018/02/07 22:30:59 dlg Exp $ */ +/* $OpenBSD: ip_gre.h,v 1.14 2019/11/04 23:52:28 dlg Exp $ */ /* $NetBSD: ip_gre.h,v 1.3 1998/10/07 23:33:02 thorpej Exp $ */ /* @@ -52,17 +52,6 @@ { "wccp", CTLTYPE_INT }, \ } -/* - * Names for MobileIP sysctl objects - */ -#define MOBILEIPCTL_ALLOW 1 /* accept incoming MobileIP packets */ -#define MOBILEIPCTL_MAXID 2 - -#define MOBILEIPCTL_NAMES { \ - { 0, 0 }, \ - { "allow", CTLTYPE_INT }, \ -} - #ifdef _KERNEL int gre_usrreq(struct socket *, int, struct mbuf *, struct mbuf *, struct mbuf *, struct proc *); #endif /* _KERNEL */ |