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

[dpl at FreeBSD.org]

Author: dpl
Date: Wed Jun 11 15:45:55 2014
New Revision: 269404
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269404

Log:
  Added rule_ip6_dst
  

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 15:43:19 2014	(r269403)
+++ soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_fw2.c	Wed Jun 11 15:45:55 2014	(r269404)
@@ -1607,10 +1607,9 @@
 				break;
 
 			case O_IP6_DST:
-				match = is_ipv6 &&
-				IN6_ARE_ADDR_EQUAL(&args->f_id.dst_ip6,
-				    &((ipfw_insn_ip6 *)cmd)->addr6);
+				rule_ip6_dst(&match, is_ipv6, args, cmd);
 				break;
+
 			case O_IP6_SRC_MASK:
 			case O_IP6_DST_MASK:
 				if (is_ipv6) {

Modified: soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h
==============================================================================
--- soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h	Wed Jun 11 15:43:19 2014	(r269403)
+++ soc2014/dpl/netmap-ipfw/sys/netpfil/ipfw/ip_rules.h	Wed Jun 11 15:45:55 2014	(r269404)
@@ -641,8 +641,11 @@
 }
 
 inline void
-rule_ip6_dst(int *match, int is_ipv6 dst_ip6, addr6)
+rule_ip6_dst(int *match, int is_ipv6, struct ip_fw_args *args, ipfw_insn *cmd)
 {
+	*match = is_ipv6 &&
+	IN6_ARE_ADDR_EQUAL(&args->f_id.dst_ip6,
+	    &((ipfw_insn_ip6 *)cmd)->addr6);
 }
 
 inline void