From owner-svn-soc-all@FreeBSD.ORG  Wed Jun 11 18:38:51 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-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 ESMTPS id 9C07D15A
 for <svn-soc-all@FreeBSD.org>; Wed, 11 Jun 2014 18:38:51 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 88898268E
 for <svn-soc-all@FreeBSD.org>; Wed, 11 Jun 2014 18:38:51 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5BIcpkK022487
 for <svn-soc-all@FreeBSD.org>; Wed, 11 Jun 2014 18:38:51 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5BIco3K022483
 for svn-soc-all@FreeBSD.org; Wed, 11 Jun 2014 18:38:50 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Wed, 11 Jun 2014 18:38:50 GMT
Message-Id: <201406111838.s5BIco3K022483@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r269413 - soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jun 2014 18:38:51 -0000

Author: dpl
Date: Wed Jun 11 18:38:50 2014
New Revision: 269413
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269413

Log:
  Added function for O_EXT_HDR, and corrected rule_flow6id, since it didn't dereference match.
  

Modified:
  soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c
  soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h

Modified: soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c
==============================================================================
--- soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c	Wed Jun 11 18:32:38 2014	(r269412)
+++ soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c	Wed Jun 11 18:38:50 2014	(r269413)
@@ -1613,8 +1613,7 @@
 				break;
 
 			case O_EXT_HDR:
-				match = is_ipv6 &&
-				    (ext_hd & ((ipfw_insn *) cmd)->arg1);
+				rule_ext_hdr(&match, is_ipv6, ext_hd, cmd);
 				break;
 
 			case O_IP6:

Modified: soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h
==============================================================================
--- soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h	Wed Jun 11 18:32:38 2014	(r269412)
+++ soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h	Wed Jun 11 18:38:50 2014	(r269413)
@@ -664,7 +664,7 @@
 inline void
 rule_flow6id(int *match, struct ip_fw_args *args, ipfw_insn *cmd)
 {
-	match = is_ipv6 &&
+	*match = is_ipv6 &&
 	    flow6id_match(args->f_id.flow_id6,
 	    (ipfw_insn_u32 *) cmd);
 }
@@ -672,6 +672,8 @@
 inline void
 rule_ext_hdr(int *match, int is_ipv6, uint16_t ext_hd, ipfw_insn *cmd)
 {
+	*match = is_ipv6 &&
+	    (ext_hd & ((ipfw_insn *) cmd)->arg1);
 }
 
 inline void