From owner-p4-projects@FreeBSD.ORG  Tue Jul  8 08:52:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D2AB81065679; Tue,  8 Jul 2008 08:52:27 +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 966B8106564A
	for <perforce@FreeBSD.org>; Tue,  8 Jul 2008 08:52:27 +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 84B488FC14
	for <perforce@FreeBSD.org>; Tue,  8 Jul 2008 08:52:27 +0000 (UTC)
	(envelope-from rfrench@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m688qRo6010622
	for <perforce@FreeBSD.org>; Tue, 8 Jul 2008 08:52:27 GMT
	(envelope-from rfrench@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m688qRUd010620
	for perforce@freebsd.org; Tue, 8 Jul 2008 08:52:27 GMT
	(envelope-from rfrench@FreeBSD.org)
Date: Tue, 8 Jul 2008 08:52:27 GMT
Message-Id: <200807080852.m688qRUd010620@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 144866 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: Tue, 08 Jul 2008 08:52:28 -0000

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

Change 144866 by rfrench@rfrench_mpls on 2008/07/08 08:52:13

	Imported the switch cases for the MPLS protocol	
	from the OpenBSD implementation.

Affected files ...

.. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#2 edit

Differences ...

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

@@ -97,6 +97,10 @@
 extern u_char	aarp_org_code[3];
 #endif /* NETATALK */
 
+#ifdef MPLS
+#include <netmpls/mpls.h>
+#endif /* MPLS */
+
 #include <security/mac/mac_framework.h>
 
 /* netgraph node hooks for ng_ether(4) */
@@ -767,11 +771,6 @@
 	 */
 	switch (ether_type) {
 
-	/* MPLS switch case */
- 	case ETHERTYPE_MPLS:
-		isr = NETISR_MPLS;
-		break;
-
 #ifdef INET
 	case ETHERTYPE_IP:
 		if ((m = ip_fastforward(m)) == NULL)
@@ -808,6 +807,36 @@
 		isr = NETISR_AARP;
 		break;
 #endif /* NETATALK */
+#ifdef MPLS
+	case AF_MPLS:
+		printf("mpls packet received\n");
+		if (rt)
+			dst = rt_key(rt);
+		else
+			senderr(EHOSTUNREACH);
+			
+		switch (dst->sa_family) {
+			case AF_LINK:
+				if (((struct sockaddr_dl *) dst)->sdl_alen <
+					sizeof(edst))
+						senderr(EHOSTUNREACH);
+				bcopy(LLADDR(((struct sockaddr_dl *)dst)), edst,
+					sizeof(edst));
+				break;
+			case AF_INET:
+				if (!arpresolve(ac, rt, m, dst, edst))
+					return (0); /* if not yet resolved */
+				break;
+			default:
+				senderr(EHOSTUNREACH);
+		}
+		/* XXX handling for simplex devices in case of M/BCAST ?? */
+		if (m->m_flags & (M_BCAST | M_MCAST))
+			etype = htons(ETHERTYPE_MPLS_MCAST);
+		else
+			etype = htons(ETHERTYPE_MPLS);
+		break;
+#endif /* MPLS */
 	default:
 #ifdef IPX
 		if (ef_inputp && ef_inputp(ifp, eh, m) == 0)