GRE/MobileIP input routine processing, from NetBSD (with a few

changes). Also, minor cleanup in in_proto.c

3 files changed, 464 insertions, 41 deletions

diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 3b8505f2dc3..accb3870077 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_proto.c,v 1.20 2000/01/02 09:06:11 angelos Exp $	*/
+/*	$OpenBSD: in_proto.c,v 1.21 2000/01/07 21:38:01 angelos Exp $	*/
 /*	$NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $	*/
 
 /*
@@ -115,14 +115,6 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
  * TCP/IP protocol family: IP, ICMP, UDP, TCP.
  */
 
-#if 0 /*KAME IPSEC*/
-#include <netinet6/ah.h>
-#ifdef IPSEC_ESP
-#include <netinet6/esp.h>
-#endif
-#include <netinet6/ipcomp.h>
-#endif /* IPSEC */
-
 #include "gif.h"
 #if NGIF > 0
 #include <netinet/in_gif.h>
@@ -169,6 +161,12 @@ void	iplinit __P((void));
 
 #include <netinet/ip_ip4.h>
 
+#include "gre.h"
+#if NGRE > 0
+#include <netinet/ip_gre.h>
+#include <net/if_gre.h>
+#endif
+
 extern	struct domain inetdomain;
 
 struct protosw inetsw[] = {
@@ -276,23 +274,19 @@ struct protosw inetsw[] = {
   rip_usrreq,
   0,          0,              0,              0,		etherip_sysctl
 },
-#endif
-#if 0 /*NRL IPv6*/
-/* IPv6 in IPv4 tunneled packets... */
-{ SOCK_RAW,   &inetdomain,    IPPROTO_IPV6,   PR_ATOMIC|PR_ADDR,
-  ip6_input,  rip_output,     ipv6_trans_ctlinput, rip_ctloutput,
+#endif /* IPSEC */
+#if NGRE > 0
+{ SOCK_RAW,     &inetdomain,    IPPROTO_GRE,    PR_ATOMIC|PR_ADDR,
+  gre_input,    rip_output,     0,              rip_ctloutput,
   rip_usrreq,
-  0,          0,              0,              0
+  0,            0,              0,             0,		gre_sysctl
 },
-#if 0
-/* IPv4 in IPv4 tunneled packets... */
-{ SOCK_RAW,   &inetdomain,    IPPROTO_IPV4,   PR_ATOMIC|PR_ADDR,
-  ipv4_input, 0,              0,              0,
-  0,
-  0,          0,              0,              0
+{ SOCK_RAW,     &inetdomain,    IPPROTO_MOBILE, PR_ATOMIC|PR_ADDR,
+  gre_mobile_input,     rip_output,     0,              rip_ctloutput,
+  rip_usrreq,
+  0,            0,              0,              0,		ipmobile_sysctl
 },
-#endif /* 0 */
-#endif /* defined(INET6) */
+#endif /* NGRE > 0 */
 /* raw wildcard */
 { SOCK_RAW,	&inetdomain,	0,		PR_ATOMIC|PR_ADDR,
   rip_input,	rip_output,	0,		rip_ctloutput,
@@ -307,24 +301,6 @@ struct domain inetdomain =
       rn_inithead, 32, sizeof(struct sockaddr_in) };
 
 #ifdef notyet /* XXXX */
-#include "imp.h"
-#if NIMP > 0
-extern	struct domain impdomain;
-int	rimp_output(), hostslowtimo();
-
-struct protosw impsw[] = {
-{ SOCK_RAW,	&impdomain,	0,		PR_ATOMIC|PR_ADDR,
-  0,		rimp_output,	0,		0,
-  rip_usrreq,
-  0,		0,		hostslowtimo,	0,
-},
-};
-
-struct domain impdomain =
-    { AF_IMPLINK, "imp", 0, 0, 0,
-      impsw, &impsw[sizeof (impsw)/sizeof(impsw[0])] };
-#endif
-
 #include "hy.h"
 #if NHY > 0
 /*
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
new file mode 100644
index 00000000000..f3c61ea18a1
--- /dev/null
+++ b/sys/netinet/ip_gre.c
@@ -0,0 +1,375 @@
+/*      $OpenBSD: ip_gre.c,v 1.1 2000/01/07 21:38:01 angelos Exp $ */
+/*	$NetBSD: ip_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
+
+/*
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Heiko W.Rupp <hwr@pilhuhn.de>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *    
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * deencapsulate tunneled packets and send them on
+ * output half is in net/if_gre.[ch]
+ * This currently handles IPPROTO_GRE, IPPROTO_MOBILE
+ */
+
+
+#include "gre.h"
+#if NGRE > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/protosw.h>
+#include <sys/errno.h>
+#include <sys/time.h>
+#include <sys/kernel.h>
+#include <sys/ioctl.h>
+#include <sys/syslog.h>
+#include <net/if.h>
+#include <net/netisr.h>
+#include <net/route.h>
+#include <net/raw_cb.h>
+
+#ifdef INET
+#include <netinet/in.h>
+#include <netinet/in_var.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/ip_gre.h>
+#include <netinet/if_ether.h>
+#else
+#error "ip_gre used without inet"
+#endif
+
+#ifdef NS
+#include <netns/ns.h>
+#include <netns/ns_if.h>
+#endif
+
+#ifdef NETATALK
+#include <netatalk/at.h>
+#include <netatalk/at_var.h>
+#include <netatalk/at_extern.h>
+#endif
+
+/* Needs IP headers. */
+#include <net/if_gre.h>
+
+#include <machine/stdarg.h>
+
+struct gre_softc *gre_lookup __P((struct mbuf *, u_int8_t));
+
+/*
+ * Decapsulate.
+ * Does the real work and is called from gre_input() (above)
+ * returns 0 if packet is not yet processed 
+ * and 1 if it needs no further processing
+ * proto is the protocol number of the "calling" foo_input()
+ * routine.
+ */
+
+static int
+gre_input2(struct mbuf *m ,int hlen,u_char proto)
+{
+	register struct greip *gip = mtod(m, struct greip *);
+	register int s;
+	register struct ifqueue *ifq;
+	struct gre_softc *sc;
+	u_short flags;
+
+	if ((sc = gre_lookup(m, proto)) == NULL) {
+		/* No matching tunnel or tunnel is down. */
+		return (0);
+	}
+
+	sc->sc_if.if_ipackets++;
+	sc->sc_if.if_ibytes += m->m_pkthdr.len;
+
+	switch (proto) {
+	case IPPROTO_GRE:
+		hlen += sizeof (struct gre_h);
+
+		/* process GRE flags as packet can be of variable len */
+		flags = ntohs(gip->gi_flags);
+
+		/* Checksum & Offset are present */
+		if ((flags & GRE_CP) | (flags & GRE_RP))
+			hlen += 4;
+
+		/* We don't support routing fields (variable length) */
+		if (flags & GRE_RP)
+			return (0);
+
+		if (flags & GRE_KP)
+			hlen += 4;
+
+		if (flags & GRE_SP)
+			hlen += 4;
+
+		switch (ntohs(gip->gi_ptype)) { /* ethertypes */
+		case ETHERTYPE_IP: /* shouldn't need a schednetisr(), as */
+			ifq = &ipintrq;          /* we are in ip_input */
+			break;
+#ifdef NS
+		case ETHERTYPE_NS:
+			ifq = &nsintrq;
+			schednetisr(NETISR_NS);
+			break;
+#endif
+#ifdef NETATALK
+		case ETHERTYPE_ATALK:
+			ifq = &atintrq1;
+			schednetisr(NETISR_ATALK);
+			break;
+#endif
+#ifdef INET6
+		case ETHERTYPE_IPV6:
+		        ifq = &ip6intrq;
+			schednetisr(NETISR_IPV6);
+			break;
+#endif /* INET6 */
+		default:	   /* others not yet supported */
+			return (0);
+		}
+		break;
+	default:
+		/* others not yet supported */
+		return(0);
+	}
+		
+	m->m_data += hlen; 
+	m->m_len -= hlen;
+	m->m_pkthdr.len -= hlen;
+
+	s = splimp();		/* possible */
+	if (IF_QFULL(ifq)) {
+		IF_DROP(ifq);
+		m_freem(m);
+	} else {
+		IF_ENQUEUE(ifq, m);
+	}
+	splx(s);
+
+	return (1);	/* packet is done, no further processing needed */
+}
+
+/*
+ * Decapsulate a packet and feed it back through ip_input (this
+ * routine is called whenever IP gets a packet with proto type
+ * IPPROTO_GRE and a local destination address).
+ */
+void
+#if __STDC__
+gre_input(struct mbuf *m, ...)
+#else
+gre_input(m, va_alist)
+        struct mbuf *m;
+        va_dcl
+#endif
+{
+	register int hlen,ret;
+	va_list ap;
+
+	va_start(ap, m);
+	hlen = va_arg(ap, int);
+	va_end(ap);
+
+	if (!gre_allow) {
+	        m_freem(m);
+		return;
+	}
+	
+	ret = gre_input2(m, hlen, IPPROTO_GRE);
+	/* 
+ 	 * ret == 0: packet not processed, but input from here
+	 * means no matching tunnel that is up is found,
+	 * so we can just free the mbuf and return
+	 */
+	if (!ret)
+		m_freem(m);
+}
+
+/*
+ * Input routine for IPPRPOTO_MOBILE.
+ * This is a little bit diffrent from the other modes, as the 
+ * encapsulating header was not prepended, but instead inserted
+ * between IP header and payload.
+ */
+
+void
+#if __STDC__
+gre_mobile_input(struct mbuf *m, ...)
+#else
+gre_mobile_input(m, va_alist)
+        struct mbuf *m;
+        va_dcl
+#endif
+{
+	register struct ip *ip = mtod(m, struct ip *);
+	register struct mobip_h *mip = mtod(m, struct mobip_h *);
+	register struct ifqueue *ifq;
+	struct gre_softc *sc;
+	register int hlen,s;
+	va_list ap;
+	u_char osrc = 0;
+	int msiz;
+
+	va_start(ap,m);
+	hlen = va_arg(ap, int);
+	va_end(ap);
+
+	if (!ip_mobile_allow) {
+	        m_freem(m);
+		return;
+	}
+
+	if ((sc = gre_lookup(m, IPPROTO_MOBILE)) == NULL) {
+		/* No matching tunnel or tunnel is down. */
+		m_freem(m);
+		return;
+	}
+
+	sc->sc_if.if_ipackets++;  
+	sc->sc_if.if_ibytes += m->m_pkthdr.len;
+
+	if(ntohs(mip->mh.proto) & MOB_H_SBIT) {
+		osrc = 1;
+		msiz = MOB_H_SIZ_L;
+		mip->mi.ip_src.s_addr = mip->mh.osrc;
+	} else {
+		msiz = MOB_H_SIZ_S;
+	}
+	mip->mi.ip_dst.s_addr = mip->mh.odst;
+	mip->mi.ip_p = (ntohs(mip->mh.proto) >> 8);
+	
+	if (gre_in_cksum((u_short*) &mip->mh,msiz) != 0) {
+		m_freem(m);
+		return;
+	}
+
+	bcopy(ip + (ip->ip_hl << 2) + msiz, ip + (ip->ip_hl << 2),
+	      m->m_len - msiz - (ip->ip_hl << 2));
+
+	m->m_len -= msiz;
+	ip->ip_len -= msiz;
+	HTONS(ip->ip_len);
+	m->m_pkthdr.len -= msiz;
+
+	ip->ip_sum = 0;
+	ip->ip_sum = in_cksum(m,(ip->ip_hl << 2));
+
+	ifq = &ipintrq;
+
+	s = splimp();       /* possible */
+	if (IF_QFULL(ifq)) {
+		IF_DROP(ifq);
+		m_freem(m);
+	} else { 
+		IF_ENQUEUE(ifq, m);  
+	}
+	splx(s);
+}
+
+/*
+ * Find the gre interface associated with our src/dst/proto set.
+ */
+struct gre_softc *
+gre_lookup(m, proto)
+	struct mbuf *m;
+	u_int8_t proto;
+{
+	struct ip *ip = mtod(m, struct ip *);
+	struct gre_softc *sc;
+	int i;
+
+	for (i = 0; i < NGRE; i++) {
+		sc = &gre_softc[i];
+		if ((sc->g_dst.s_addr == ip->ip_src.s_addr) &&
+		    (sc->g_src.s_addr == ip->ip_dst.s_addr) &&
+		    (sc->g_proto == proto) &&
+		    ((sc->sc_if.if_flags & IFF_UP) != 0))
+			return (sc);
+	}
+
+	return (NULL);
+}
+
+int
+gre_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
+        int *name;
+        u_int namelen;
+        void *oldp;
+        size_t *oldlenp;
+        void *newp;
+        size_t newlen;
+{
+        /* All sysctl names at this level are terminal. */
+        if (namelen != 1)
+                return (ENOTDIR);
+ 
+        switch (name[0]) {
+        case GRECTL_ALLOW:
+                return (sysctl_int(oldp, oldlenp, newp, newlen, &gre_allow));
+        default:
+                return (ENOPROTOOPT);
+        }
+        /* NOTREACHED */
+}
+
+int
+ipmobile_sysctl(name, namelen, oldp, oldlenp, newp, newlen)
+        int *name;
+        u_int namelen;
+        void *oldp;
+        size_t *oldlenp;
+        void *newp;
+        size_t newlen;
+{
+        /* All sysctl names at this level are terminal. */
+        if (namelen != 1)
+                return (ENOTDIR);
+ 
+        switch (name[0]) {
+        case MOBILEIPCTL_ALLOW:
+                return (sysctl_int(oldp, oldlenp, newp, newlen,
+				   &ip_mobile_allow));
+        default:
+                return (ENOPROTOOPT);
+        }
+        /* NOTREACHED */
+}
+#endif /* if NGRE > 0 */
diff --git a/sys/netinet/ip_gre.h b/sys/netinet/ip_gre.h
new file mode 100644
index 00000000000..9359558157a
--- /dev/null
+++ b/sys/netinet/ip_gre.h
@@ -0,0 +1,72 @@
+/*      $OpenBSD: ip_gre.h,v 1.1 2000/01/07 21:38:01 angelos Exp $ */
+/*	$NetBSD: ip_gre.h,v 1.3 1998/10/07 23:33:02 thorpej Exp $ */
+
+/*
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Heiko W.Rupp <hwr@pilhuhn.de>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *    
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Names for GRE sysctl objects
+ */
+#define GRECTL_ALLOW    1		/* accept incoming GRE packets */
+#define GRECTL_MAXID    2
+ 
+#define GRECTL_NAMES { \
+        { 0, 0 }, \
+        { "allow", 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
+void gre_input __P((struct mbuf *, ...));
+void gre_mobile_input __P((struct mbuf *, ...));
+
+int     ipmobile_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
+int     gre_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
+
+#ifndef MROUTING
+void gre_ipip_input __P((struct mbuf *, ...));
+#endif
+#endif /* _KERNEL */