socsvn commit: r269412 - soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw

[dpl at FreeBSD.org]

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

Log:
  Added function for O_FLOW6ID

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 17:48:07 2014	(r269411)
+++ soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c	Wed Jun 11 18:32:38 2014	(r269412)
@@ -1609,9 +1609,7 @@
 				break;
 
 			case O_FLOW6ID:
-				match = is_ipv6 &&
-				    flow6id_match(args->f_id.flow_id6,
-				    (ipfw_insn_u32 *) cmd);
+				rule_flow6id(&match, args, cmd);
 				break;
 
 			case O_EXT_HDR:

Modified: soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h
==============================================================================
--- soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h	Wed Jun 11 17:48:07 2014	(r269411)
+++ soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h	Wed Jun 11 18:32:38 2014	(r269412)
@@ -664,6 +664,9 @@
 inline void
 rule_flow6id(int *match, struct ip_fw_args *args, ipfw_insn *cmd)
 {
+	match = is_ipv6 &&
+	    flow6id_match(args->f_id.flow_id6,
+	    (ipfw_insn_u32 *) cmd);
 }
 
 inline void