back out the previous changes. it was my misunderstanding.

pr_input of freebsd4 takes only 2 args.
kame · Oct 25, 2002 · 62088b9 · 62088b9
1 parent b305c62
commit 62088b9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/freebsd4/sys/netinet/ip_divert.c b/freebsd4/sys/netinet/ip_divert.c
@@ -133,7 +133,7 @@ div_init(void)
  * with that protocol number to enter the system from the outside.
  */
 void
-div_input(struct mbuf *m, int off, int proto)
+div_input(struct mbuf *m, int off)
 {
 	ipstat.ips_noproto++;
 	m_freem(m);

diff --git a/freebsd4/sys/netinet/ip_mroute.c b/freebsd4/sys/netinet/ip_mroute.c
@@ -1617,13 +1617,12 @@ encap_send(ip, vifp, m)
  */
 void
 #ifdef MROUTE_LKM
-X_ipip_input(m, off, proto)
+X_ipip_input(m, off)
 #else
-ipip_input(m, off, proto)
+ipip_input(m, off)
 #endif
 	register struct mbuf *m;
 	int off;
-	int proto;
 {
     struct ifnet *ifp = m->m_pkthdr.rcvif;
     register struct ip *ip = mtod(m, struct ip *);
@@ -1633,7 +1632,7 @@ ipip_input(m, off, proto)
     register struct vif *vifp;
 
     if (!have_encap_tunnel) {
-	    rip_input(m, off, proto);
+	    rip_input(m, off);
 	    return;
     }
     /*
@@ -2128,13 +2127,13 @@ ip_rsvp_force_done(so)
 }
 
 void
-rsvp_input(m, off, proto)		/* XXX must fixup manually */
+rsvp_input(m, off)
 	struct mbuf *m;
 	int off;
-	int proto;
 {
     int vifi;
     register struct ip *ip = mtod(m, struct ip *);
+    int proto = ip->ip_p;
     static struct sockaddr_in rsvp_src = { sizeof rsvp_src, AF_INET };
     register int s;
     struct ifnet *ifp;
@@ -2186,7 +2185,7 @@ rsvp_input(m, off, proto)		/* XXX must fixup manually */
 	if (ip_rsvpd != NULL) {
 	    if (rsvpdebug)
 		printf("rsvp_input: Sending packet up old-style socket\n");
-	    rip_input(m, off, proto);  /* xxx */
+	    rip_input(m, off);  /* xxx */
 	} else {
 	    if (rsvpdebug && vifi == numvifs)
 		printf("rsvp_input: Can't find vif for packet.\n");

diff --git a/kame/sys/netinet/ip_encap.c b/kame/sys/netinet/ip_encap.c
@@ -1,4 +1,4 @@
-/*	$KAME: ip_encap.c,v 1.83 2002/10/25 05:17:05 kjc Exp $	*/
+/*	$KAME: ip_encap.c,v 1.84 2002/10/25 11:43:41 kjc Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -390,6 +390,16 @@ encap4_input(m, va_alist)
 #elif (defined(__FreeBSD__) && __FreeBSD__ >= 5)
 	/* last resort: inject to raw socket */
 	rip_input(m, off);
+#elif defined(__FreeBSD__) && __FreeBSD__ >= 4
+#ifdef MROUTING
+	if (proto == IPPROTO_IPV4) {
+		ipip_input(m, off);
+		return;
+	}
+#endif
+
+	/* last resort: inject to raw socket */
+	rip_input(m, off, proto);
 #else
 #ifdef MROUTING
 	if (proto == IPPROTO_IPV4) {