From owner-p4-projects@FreeBSD.ORG  Mon Sep 29 03:01:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9AAC61065698; Mon, 29 Sep 2008 03:01:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 51A851065693
	for <perforce@FreeBSD.org>; Mon, 29 Sep 2008 03:01:23 +0000 (UTC)
	(envelope-from rfrench@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3F3AD8FC21
	for <perforce@FreeBSD.org>; Mon, 29 Sep 2008 03:01:23 +0000 (UTC)
	(envelope-from rfrench@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8T31Nvu059619
	for <perforce@FreeBSD.org>; Mon, 29 Sep 2008 03:01:23 GMT
	(envelope-from rfrench@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8T31NHH059617
	for perforce@freebsd.org; Mon, 29 Sep 2008 03:01:23 GMT
	(envelope-from rfrench@FreeBSD.org)
Date: Mon, 29 Sep 2008 03:01:23 GMT
Message-Id: <200809290301.m8T31NHH059617@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rfrench@FreeBSD.org using -f
From: Ryan French <rfrench@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 150640 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Sep 2008 03:01:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=150640

Change 150640 by rfrench@rfrench_mpls on 2008/09/29 03:00:37

		MPLS protocol is now being registered properly with netisr. Unfortunately when an MPLS packet is received a page fault occurs. I believe this is happeneing somewhere between netisr_dispatch and the mpls_input functions being called due to the debug statements I have in there. Hopefully I can get that figured out tomorrow.	

Affected files ...

.. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#8 edit
.. //depot/projects/soc2008/rfrench_mpls/net/netisr.h#4 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#6 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#6 edit

Differences ...

==== //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#8 (text+ko) ====

@@ -37,6 +37,7 @@
 #include "opt_mac.h"
 #include "opt_netgraph.h"
 #include "opt_carp.h"
+#include "opt_mpls.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -99,7 +100,7 @@
 
 #ifdef MPLS
 #include <netmpls/mpls.h>
-#endif /* MPLS */
+#endif /*MPLS*/
 
 #include <security/mac/mac_framework.h>
 
@@ -832,11 +833,12 @@
 // 		}
 		/* XXX handling for simplex devices in case of M/BCAST ?? */
 		if (m->m_flags && (M_BCAST | M_MCAST))
-			isr = NETISR_MPLS_MCAST;
+// 			isr = NETISR_MPLS_MCAST;
+			isr = NETISR_MPLS;
 		else
 			isr = NETISR_MPLS;
 		break;
-#endif /* MPLS */
+#endif
 	default:
 #ifdef IPX
 		if (ef_inputp && ef_inputp(ifp, eh, m) == 0)

==== //depot/projects/soc2008/rfrench_mpls/net/netisr.h#4 (text+ko) ====

@@ -51,7 +51,7 @@
 #define	NETISR_POLL	0		/* polling callback, must be first */
 #define	NETISR_IP	2		/* same as AF_INET */
 #define NETISR_MPLS	4		/* mpls packet */
-#define NETISR_MPLS_MCAST	/* mpls multicase packet */
+#define NETISR_MPLS_MCAST 5	/* mpls multicast packet */
 #define	NETISR_ROUTE	14		/* routing socket */
 #define	NETISR_AARP	15		/* Appletalk ARP */
 #define	NETISR_ATALK2	16		/* Appletalk phase 2 */

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#6 (text+ko) ====

@@ -43,7 +43,9 @@
 {
         mplsintrq.ifq_maxlen = mplsqmaxlen;
         netisr_register(NETISR_MPLS, mpls_input, &mplsintrq, 0);
-        printf("mpls initialised");
+#ifdef MPLS_DEBUG
+        printf("mpls initialised\n");
+#endif
 }
 
 void
@@ -78,6 +80,10 @@
         u_int32_t ttl;
         int i, hasbos;
 
+#ifdef MPLS_DEBUG
+		printf("entering mpls_input\n");
+#endif
+
         if (!mpls_enable) {
                 m_freem(m);
                 return;

==== //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_proto.c#6 (text+ko) ====

@@ -82,3 +82,5 @@
 	offsetof(struct sockaddr_mpls, smpls_in_ifindex) << 3,
 	sizeof(struct sockaddr_mpls)
 };
+
+DOMAIN_SET(mpls);