From owner-p4-projects@FreeBSD.ORG  Mon Oct  6 22:46:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 482D4106568F; Mon,  6 Oct 2008 22:46:42 +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 0BFB2106568B
	for <perforce@FreeBSD.org>; Mon,  6 Oct 2008 22:46:42 +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 EE0BF8FC14
	for <perforce@FreeBSD.org>; Mon,  6 Oct 2008 22:46:41 +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 m96MkfNo062547
	for <perforce@FreeBSD.org>; Mon, 6 Oct 2008 22:46:41 GMT
	(envelope-from rfrench@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m96Mkf1H062545
	for perforce@freebsd.org; Mon, 6 Oct 2008 22:46:41 GMT
	(envelope-from rfrench@FreeBSD.org)
Date: Mon, 6 Oct 2008 22:46:41 GMT
Message-Id: <200810062246.m96Mkf1H062545@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 151077 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, 06 Oct 2008 22:46:42 -0000

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

Change 151077 by rfrench@rfrench_mpls on 2008/10/06 22:46:03

	Removed the dropping of all broadcast MPLS packets for now while I am testing.	

Affected files ...

.. //depot/projects/soc2008/rfrench_mpls/net/if_ethersubr.c#11 edit
.. //depot/projects/soc2008/rfrench_mpls/netmpls/mpls_input.c#13 edit

Differences ...

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


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

@@ -56,21 +56,9 @@
 create_fake_entry(struct sockaddr_mpls *smpls)
 {
 	if (MPLS_LABEL_GET(smpls->smpls_in_label) == 44) {
-		smpls->smpls_operation = 1;
-		smpls->smpls_out_exp = 14;
-		smpls->smpls_out_label = MPLS_LABEL_SET(66);
-		smpls->smpls_out_ifindex = smpls->smpls_in_ifindex;
-	}
-	if (MPLS_LABEL_GET(smpls->smpls_in_label) == 55) {
-		smpls->smpls_operation = 2;
-		smpls->smpls_out_exp = 14;
-		smpls->smpls_out_label = MPLS_LABEL_SET(44);
-		smpls->smpls_out_ifindex = smpls->smpls_in_ifindex;
-	}
-	if (MPLS_LABEL_GET(smpls->smpls_in_label) == 66) {
 		smpls->smpls_operation = 3;
 		smpls->smpls_out_exp = 14;
-		smpls->smpls_out_label = MPLS_LABEL_SET(1000);
+		smpls->smpls_out_label = MPLS_LABEL_SET(100);
 		smpls->smpls_out_ifindex = smpls->smpls_in_ifindex;
 	}
 }
@@ -118,10 +106,10 @@
         }
 
         /* drop all broadcast and multicast packets */
-        if (m->m_flags & (M_BCAST | M_MCAST)) {
-                m_freem(m);
-                return;
-        }
+        //if (m->m_flags & (M_BCAST | M_MCAST)) {
+        //        m_freem(m);
+        //        return;
+        //}
 
         if (m->m_len < sizeof(*shim))
                 if ((m = m_pullup(m, sizeof(*shim))) == NULL)