From owner-svn-src-all@FreeBSD.ORG  Sat Sep 28 15:49:36 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B4377BBA;
 Sat, 28 Sep 2013 15:49:36 +0000 (UTC)
 (envelope-from philip@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A182022BC;
 Sat, 28 Sep 2013 15:49:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8SFna9S064054;
 Sat, 28 Sep 2013 15:49:36 GMT (envelope-from philip@svn.freebsd.org)
Received: (from philip@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8SFnamK064053;
 Sat, 28 Sep 2013 15:49:36 GMT (envelope-from philip@svn.freebsd.org)
Message-Id: <201309281549.r8SFnamK064053@svn.freebsd.org>
From: Philip Paeps <philip@FreeBSD.org>
Date: Sat, 28 Sep 2013 15:49:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255928 - head/sys/netpfil/ipfw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Sep 2013 15:49:36 -0000

Author: philip
Date: Sat Sep 28 15:49:36 2013
New Revision: 255928
URL: http://svnweb.freebsd.org/changeset/base/255928

Log:
  Use the correct EtherType for logging IPv6 packets.
  
  Reviewed by:	melifaro
  Approved by:	re (kib, glebius)
  MFC after:	3 days

Modified:
  head/sys/netpfil/ipfw/ip_fw_log.c

Modified: head/sys/netpfil/ipfw/ip_fw_log.c
==============================================================================
--- head/sys/netpfil/ipfw/ip_fw_log.c	Sat Sep 28 15:46:03 2013	(r255927)
+++ head/sys/netpfil/ipfw/ip_fw_log.c	Sat Sep 28 15:49:36 2013	(r255928)
@@ -255,11 +255,18 @@ ipfw_log(struct ip_fw *f, u_int hlen, st
 
 		if (args->eh) /* layer2, use orig hdr */
 			BPF_MTAP2(log_if, args->eh, ETHER_HDR_LEN, m);
-		else
+		else {
 			/* Add fake header. Later we will store
 			 * more info in the header.
 			 */
-			BPF_MTAP2(log_if, "DDDDDDSSSSSS\x08\x00", ETHER_HDR_LEN, m);
+			if (ip->ip_v == 4)
+				BPF_MTAP2(log_if, "DDDDDDSSSSSS\x08\x00", ETHER_HDR_LEN, m);
+			else if  (ip->ip_v == 6)
+				BPF_MTAP2(log_if, "DDDDDDSSSSSS\x86\xdd", ETHER_HDR_LEN, m);
+			else
+				/* Obviously bogus EtherType. */
+				BPF_MTAP2(log_if, "DDDDDDSSSSSS\xff\xff", ETHER_HDR_LEN, m);
+		}
 		LOGIF_RUNLOCK();
 #endif /* !WITHOUT_BPF */
 		return;