X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e..a1c7dba18ef36983396c282fe85292db066e39db:/bsd/netinet/ip_fw2.c

diff --git a/bsd/netinet/ip_fw2.c b/bsd/netinet/ip_fw2.c
index 84f8f0c1a..d9520158e 100644
--- a/bsd/netinet/ip_fw2.c
+++ b/bsd/netinet/ip_fw2.c
@@ -1,3 +1,31 @@
+/*
+ * Copyright (c) 2004-2013 Apple Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ *
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ */
+
 /*
  * Copyright (c) 2002 Luigi Rizzo, Universita` di Pisa
  *
@@ -36,13 +64,14 @@
 #error IPFIREWALL requires INET.
 #endif /* INET */
 
-#ifdef IPFW2
+#if IPFW2
 #include <machine/spl.h>
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
+#include <sys/mcache.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
@@ -50,6 +79,9 @@
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <sys/ucred.h>
+#include <sys/kern_event.h>
+#include <sys/kauth.h>
+
 #include <net/if.h>
 #include <net/route.h>
 #include <netinet/in.h>
@@ -108,8 +140,7 @@ static u_int32_t set_disable;
 
 int fw_verbose;
 static int verbose_limit;
-
-#define	IPFW_DEFAULT_RULE	65535
+extern int fw_bypass;
 
 #define IPFW_RULE_INACTIVE 1
 
@@ -120,29 +151,68 @@ static struct ip_fw *layer3_chain;
 
 MALLOC_DEFINE(M_IPFW, "IpFw/IpAcct", "IpFw/IpAcct chain's");
 
-static int fw_debug = 1;
+static int fw_debug = 0;
 static int autoinc_step = 100; /* bounded to 1..1000 in add_rule() */
 
+static void ipfw_kev_post_msg(u_int32_t );
+
+static int Get32static_len(void);
+static int Get64static_len(void);
+
 #ifdef SYSCTL_NODE
-SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW, 0, "Firewall");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, enable,
-    CTLFLAG_RW,
-    &fw_enable, 0, "Enable ipfw");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, autoinc_step, CTLFLAG_RW,
+
+static int ipfw_sysctl SYSCTL_HANDLER_ARGS;
+
+SYSCTL_NODE(_net_inet_ip, OID_AUTO, fw, CTLFLAG_RW|CTLFLAG_LOCKED, 0, "Firewall");
+SYSCTL_PROC(_net_inet_ip_fw, OID_AUTO, enable,
+    CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_LOCKED,
+    &fw_enable, 0, ipfw_sysctl, "I", "Enable ipfw");
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, autoinc_step, CTLFLAG_RW | CTLFLAG_LOCKED,
     &autoinc_step, 0, "Rule number autincrement step");
 SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, one_pass,
-    CTLFLAG_RW,
+    CTLFLAG_RW | CTLFLAG_LOCKED,
     &fw_one_pass, 0,
     "Only do a single pass through ipfw when using dummynet(4)");
 SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, debug,
-    CTLFLAG_RW,
+    CTLFLAG_RW | CTLFLAG_LOCKED,
     &fw_debug, 0, "Enable printing of debug ip_fw statements");
 SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose,
-    CTLFLAG_RW,
+    CTLFLAG_RW | CTLFLAG_LOCKED,
     &fw_verbose, 0, "Log matches to ipfw rules");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose_limit, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, verbose_limit, CTLFLAG_RW | CTLFLAG_LOCKED,
     &verbose_limit, 0, "Set upper limit of matches of ipfw rules logged");
 
+/*
+ * IP FW Stealth Logging:
+ */
+typedef enum ipfw_stealth_stats_type {
+  IPFW_STEALTH_STATS_UDP,
+  IPFW_STEALTH_STATS_TCP,
+  IPFW_STEALTH_STATS_UDPv6,
+  IPFW_STEALTH_STATS_TCPv6,
+  IPFW_STEALTH_STATS_MAX,
+} ipfw_stealth_stats_type_t;
+
+#define IPFW_STEALTH_TIMEOUT_SEC 30
+
+#define	DYN_KEEPALIVE_LEEWAY	15
+
+// Piggybagging Stealth stats with ipfw_tick().
+#define IPFW_STEALTH_TIMEOUT_FREQUENCY (30 / dyn_keepalive_period)
+
+static const char* ipfw_stealth_stats_str [IPFW_STEALTH_STATS_MAX] = {
+  "UDP", "TCP", "UDP v6", "TCP v6",
+};
+
+static uint32_t ipfw_stealth_stats_needs_flush = FALSE;
+static uint32_t ipfw_stealth_stats[IPFW_STEALTH_STATS_MAX];
+
+static void ipfw_stealth_flush_stats(void);
+void ipfw_stealth_stats_incr_udp(void);
+void ipfw_stealth_stats_incr_tcp(void);
+void ipfw_stealth_stats_incr_udpv6(void);
+void ipfw_stealth_stats_incr_tcpv6(void);
+
 /*
  * Description of dynamic rules.
  *
@@ -201,40 +271,58 @@ static u_int32_t dyn_short_lifetime = 5;
  * than dyn_keepalive_period.
  */
 
-static u_int32_t dyn_keepalive_interval = 20;
+static u_int32_t dyn_keepalive_interval = 25;
 static u_int32_t dyn_keepalive_period = 5;
 static u_int32_t dyn_keepalive = 1;	/* do send keepalives */
 
 static u_int32_t static_count;	/* # of static rules */
 static u_int32_t static_len;	/* size in bytes of static rules */
+static u_int32_t static_len_32;	/* size in bytes of static rules for 32 bit client */
+static u_int32_t static_len_64;	/* size in bytes of static rules for 64 bit client */
 static u_int32_t dyn_count;		/* # of dynamic rules */
 static u_int32_t dyn_max = 4096;	/* max # of dynamic rules */
 
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_buckets, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_buckets, CTLFLAG_RW | CTLFLAG_LOCKED,
     &dyn_buckets, 0, "Number of dyn. buckets");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, curr_dyn_buckets, CTLFLAG_RD,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, curr_dyn_buckets, CTLFLAG_RD | CTLFLAG_LOCKED,
     &curr_dyn_buckets, 0, "Current Number of dyn. buckets");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_count, CTLFLAG_RD,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_count, CTLFLAG_RD | CTLFLAG_LOCKED,
     &dyn_count, 0, "Number of dyn. rules");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_max, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_max, CTLFLAG_RW | CTLFLAG_LOCKED,
     &dyn_max, 0, "Max number of dyn. rules");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, static_count, CTLFLAG_RD,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, static_count, CTLFLAG_RD | CTLFLAG_LOCKED,
     &static_count, 0, "Number of static rules");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_ack_lifetime, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_ack_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED,
     &dyn_ack_lifetime, 0, "Lifetime of dyn. rules for acks");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_syn_lifetime, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_syn_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED,
     &dyn_syn_lifetime, 0, "Lifetime of dyn. rules for syn");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_fin_lifetime, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_fin_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED,
     &dyn_fin_lifetime, 0, "Lifetime of dyn. rules for fin");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_rst_lifetime, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_rst_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED,
     &dyn_rst_lifetime, 0, "Lifetime of dyn. rules for rst");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_udp_lifetime, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_udp_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED,
     &dyn_udp_lifetime, 0, "Lifetime of dyn. rules for UDP");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_short_lifetime, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_short_lifetime, CTLFLAG_RW | CTLFLAG_LOCKED,
     &dyn_short_lifetime, 0, "Lifetime of dyn. rules for other situations");
-SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_keepalive, CTLFLAG_RW,
+SYSCTL_INT(_net_inet_ip_fw, OID_AUTO, dyn_keepalive, CTLFLAG_RW | CTLFLAG_LOCKED,
     &dyn_keepalive, 0, "Enable keepalives for dyn. rules");
 
+
+static int
+ipfw_sysctl SYSCTL_HANDLER_ARGS
+{
+#pragma unused(arg1, arg2)
+	int error;
+	
+	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
+	if (error || !req->newptr)
+		return (error);
+	
+	ipfw_kev_post_msg(KEV_IPFW_ENABLE);
+	
+	return error;
+}
+
 #endif /* SYSCTL_NODE */
 
 
@@ -244,13 +332,10 @@ static ip_fw_chk_t	ipfw_chk;
 lck_grp_t         *ipfw_mutex_grp;
 lck_grp_attr_t    *ipfw_mutex_grp_attr;
 lck_attr_t        *ipfw_mutex_attr;
-lck_mtx_t         *ipfw_mutex;
+decl_lck_mtx_data(,ipfw_mutex_data);
+lck_mtx_t         *ipfw_mutex = &ipfw_mutex_data;
 
-extern  void    ipfwsyslog( int level, char *format,...);
-
-#if DUMMYNET
-ip_dn_ruledel_t *ip_dn_ruledel_ptr = NULL;	/* hook into dummynet */
-#endif /* DUMMYNET */
+extern  void    ipfwsyslog( int level, const char *format,...);
 
 #define KEV_LOG_SUBCLASS 10
 #define IPFWLOGEVENT    0
@@ -260,11 +345,17 @@ static          size_t		ipfwstringlen;
 
 #define dolog( a ) {		\
 	if ( fw_verbose == 2 )  	/* Apple logging, log to ipfw.log */ \
-		ipfwsyslog a ; 	\ 
+		ipfwsyslog a ; 	\
 	else log a ;		\
 }
 
-void    ipfwsyslog( int level, char *format,...)
+#define RULESIZE64(rule)  (sizeof(struct ip_fw_64) + \
+							((struct ip_fw *)(rule))->cmd_len * 4 - 4)
+
+#define RULESIZE32(rule)  (sizeof(struct ip_fw_32) + \
+							((struct ip_fw *)(rule))->cmd_len * 4 - 4)
+
+void    ipfwsyslog( int level, const char *format,...)
 {
 #define		msgsize		100
 
@@ -275,6 +366,8 @@ void    ipfwsyslog( int level, char *format,...)
     unsigned char       pri;
     int			loglen;
 
+	bzero(msgBuf, msgsize);
+	bzero(&ev_msg, sizeof(struct kev_msg));
 	va_start( ap, format );
         loglen = vsnprintf(msgBuf, msgsize, format, ap);
         va_end( ap );
@@ -285,7 +378,10 @@ void    ipfwsyslog( int level, char *format,...)
         ev_msg.event_code         = IPFWLOGEVENT;
 
 	/* get rid of the trailing \n */
-	dptr[loglen-1] = 0;
+	if (loglen < msgsize)
+		dptr[loglen-1] = 0;
+	else
+		dptr[msgsize-1] = 0;
 
         pri = LOG_PRI(level);
 
@@ -303,6 +399,52 @@ void    ipfwsyslog( int level, char *format,...)
         kev_post_msg(&ev_msg);
 }
 
+static inline void ipfw_stealth_stats_incr(uint32_t type)
+{
+    if (type >= IPFW_STEALTH_STATS_MAX)
+        return;
+
+    ipfw_stealth_stats[type]++;
+
+    if (!ipfw_stealth_stats_needs_flush) {
+        ipfw_stealth_stats_needs_flush = TRUE;
+    }
+}
+
+void ipfw_stealth_stats_incr_udp(void)
+{
+    ipfw_stealth_stats_incr(IPFW_STEALTH_STATS_UDP);
+}
+
+void ipfw_stealth_stats_incr_tcp(void)
+{
+    ipfw_stealth_stats_incr(IPFW_STEALTH_STATS_TCP);
+}
+
+void ipfw_stealth_stats_incr_udpv6(void)
+{
+    ipfw_stealth_stats_incr(IPFW_STEALTH_STATS_UDPv6);
+}
+
+void ipfw_stealth_stats_incr_tcpv6(void)
+{
+    ipfw_stealth_stats_incr(IPFW_STEALTH_STATS_TCPv6);
+}
+
+static void ipfw_stealth_flush_stats(void)
+{
+    int i;
+
+    for (i = 0; i < IPFW_STEALTH_STATS_MAX; i++) {
+        if (ipfw_stealth_stats[i]) {
+           ipfwsyslog (LOG_INFO, "Stealth Mode connection attempt to %s %d times",
+                       ipfw_stealth_stats_str[i], ipfw_stealth_stats[i]);
+           ipfw_stealth_stats[i] = 0;
+       }
+    }
+    ipfw_stealth_stats_needs_flush = FALSE;
+}
+
 /*
  * This macro maps an ip pointer into a layer3 header pointer of type T
  */
@@ -327,6 +469,454 @@ is_icmp_query(struct ip *ip)
 }
 #undef TT
 
+static int
+Get32static_len()
+{
+	int	diff;
+	int len = static_len_32;
+	struct ip_fw *rule;
+	char		 *useraction;
+
+	for (rule = layer3_chain; rule ; rule = rule->next) {
+		if (rule->reserved_1 == IPFW_RULE_INACTIVE) {
+			continue;
+		}
+		if ( rule->act_ofs ){
+			useraction =  (char*)ACTION_PTR( rule ); 
+			if ( ((ipfw_insn*)useraction)->opcode == O_QUEUE || ((ipfw_insn*)useraction)->opcode == O_PIPE){
+				diff = sizeof(ipfw_insn_pipe) - sizeof(ipfw_insn_pipe_32);
+				if (diff)
+					len -= diff;
+			}
+		}
+	}
+	return len;
+}
+
+static int
+Get64static_len()
+{
+	int	diff;
+	int len = static_len_64;
+	struct ip_fw *rule;
+	char		 *useraction;
+
+	for (rule = layer3_chain; rule ; rule = rule->next) {
+		if (rule->reserved_1 == IPFW_RULE_INACTIVE) {
+			continue;
+		}
+		if ( rule->act_ofs ){
+			useraction =  (char *)ACTION_PTR( rule ); 
+			if ( ((ipfw_insn*)useraction)->opcode == O_QUEUE || ((ipfw_insn*)useraction)->opcode == O_PIPE){
+				diff = sizeof(ipfw_insn_pipe_64) - sizeof(ipfw_insn_pipe);
+				if (diff)
+					len += diff;
+			}
+		}
+	}
+	return len;
+}
+
+static void 
+copyto32fw_insn( struct ip_fw_32 *fw32 , struct ip_fw *user_ip_fw, int cmdsize)
+{
+	char		*end;
+	char		*fw32action;
+	char		*useraction;
+	int			justcmdsize;
+	int			diff=0;
+	int			actioncopysize;
+
+	end = ((char*)user_ip_fw->cmd) + cmdsize;
+	useraction = (char*)ACTION_PTR( user_ip_fw );
+	fw32action = (char*)fw32->cmd + (user_ip_fw->act_ofs * sizeof(uint32_t));
+	if ( ( justcmdsize = ( fw32action - (char*)fw32->cmd)))
+		bcopy( user_ip_fw->cmd, fw32->cmd, justcmdsize); 
+	while ( useraction < end ){
+		if ( ((ipfw_insn*)useraction)->opcode == O_QUEUE || ((ipfw_insn*)useraction)->opcode == O_PIPE){
+			actioncopysize = sizeof(ipfw_insn_pipe_32);
+			((ipfw_insn*)fw32action)->opcode = ((ipfw_insn*)useraction)->opcode;
+			((ipfw_insn*)fw32action)->arg1 = ((ipfw_insn*)useraction)->arg1;
+			((ipfw_insn*)fw32action)->len = F_INSN_SIZE(ipfw_insn_pipe_32);
+			diff = ((ipfw_insn*)useraction)->len - ((ipfw_insn*)fw32action)->len;
+			if ( diff ){
+				fw32->cmd_len -= diff;
+			}
+		} else{
+			actioncopysize =  (F_LEN((ipfw_insn*)useraction) ? (F_LEN((ipfw_insn*)useraction)) : 1 ) * sizeof(uint32_t);
+			bcopy( useraction, fw32action, actioncopysize );
+		}
+		useraction += (F_LEN((ipfw_insn*)useraction) ? (F_LEN((ipfw_insn*)useraction)) : 1 ) * sizeof(uint32_t);
+		fw32action += actioncopysize;
+	}
+}
+
+static void
+copyto64fw_insn( struct ip_fw_64 *fw64 , struct ip_fw *user_ip_fw, int cmdsize)
+{
+	char		*end;
+	char		*fw64action;
+	char		*useraction;
+	int			justcmdsize;
+	int			diff;
+	int			actioncopysize;
+
+	end = ((char *)user_ip_fw->cmd) + cmdsize;
+	useraction = (char*)ACTION_PTR( user_ip_fw );
+	if ( (justcmdsize = (useraction - (char*)user_ip_fw->cmd)))
+		bcopy( user_ip_fw->cmd, fw64->cmd, justcmdsize); 
+	fw64action = (char*)fw64->cmd + justcmdsize;
+	while ( useraction < end ){
+		if ( ((ipfw_insn*)user_ip_fw)->opcode == O_QUEUE || ((ipfw_insn*)user_ip_fw)->opcode == O_PIPE){
+			actioncopysize = sizeof(ipfw_insn_pipe_64);
+			((ipfw_insn*)fw64action)->opcode = ((ipfw_insn*)useraction)->opcode;
+			((ipfw_insn*)fw64action)->arg1 = ((ipfw_insn*)useraction)->arg1;
+			((ipfw_insn*)fw64action)->len = F_INSN_SIZE(ipfw_insn_pipe_64);
+			diff = ((ipfw_insn*)fw64action)->len - ((ipfw_insn*)useraction)->len;
+			if (diff)
+				fw64->cmd_len += diff;
+			
+		} else{
+			actioncopysize = (F_LEN((ipfw_insn*)useraction) ? (F_LEN((ipfw_insn*)useraction)) : 1 ) * sizeof(uint32_t);
+			bcopy( useraction, fw64action, actioncopysize );
+		}
+		useraction += (F_LEN((ipfw_insn*)useraction) ? (F_LEN((ipfw_insn*)useraction)) : 1 ) * sizeof(uint32_t);
+		fw64action += actioncopysize;
+	}
+}
+
+static void 
+copyto32fw( struct ip_fw *user_ip_fw, struct ip_fw_32 *fw32 , __unused size_t copysize)
+{
+	size_t	rulesize, cmdsize;
+	
+	fw32->version = user_ip_fw->version;
+	fw32->context = CAST_DOWN_EXPLICIT( user32_addr_t, user_ip_fw->context);
+	fw32->next = CAST_DOWN_EXPLICIT(user32_addr_t, user_ip_fw->next);
+	fw32->next_rule = CAST_DOWN_EXPLICIT(user32_addr_t, user_ip_fw->next_rule);
+	fw32->act_ofs = user_ip_fw->act_ofs;
+	fw32->cmd_len = user_ip_fw->cmd_len;
+	fw32->rulenum = user_ip_fw->rulenum;
+	fw32->set = user_ip_fw->set;
+	fw32->set_masks[0] = user_ip_fw->set_masks[0];
+	fw32->set_masks[1] = user_ip_fw->set_masks[1];
+	fw32->pcnt = user_ip_fw->pcnt;
+	fw32->bcnt = user_ip_fw->bcnt;
+	fw32->timestamp = user_ip_fw->timestamp;
+	fw32->reserved_1 = user_ip_fw->reserved_1;
+	fw32->reserved_2 = user_ip_fw->reserved_2;
+	rulesize = sizeof(struct ip_fw_32) + (user_ip_fw->cmd_len * sizeof(ipfw_insn) - 4);
+	cmdsize = user_ip_fw->cmd_len * sizeof(u_int32_t);
+	copyto32fw_insn( fw32, user_ip_fw, cmdsize );
+}
+
+static void
+copyto64fw( struct ip_fw *user_ip_fw, struct ip_fw_64	*fw64, size_t copysize)
+{
+	size_t	rulesize, cmdsize;
+
+	fw64->version = user_ip_fw->version;
+	fw64->context = CAST_DOWN_EXPLICIT(__uint64_t, user_ip_fw->context);
+	fw64->next = CAST_DOWN_EXPLICIT(user64_addr_t, user_ip_fw->next);
+	fw64->next_rule = CAST_DOWN_EXPLICIT(user64_addr_t, user_ip_fw->next_rule);
+	fw64->act_ofs = user_ip_fw->act_ofs;
+	fw64->cmd_len = user_ip_fw->cmd_len;
+	fw64->rulenum = user_ip_fw->rulenum;
+	fw64->set = user_ip_fw->set;
+	fw64->set_masks[0] = user_ip_fw->set_masks[0];
+	fw64->set_masks[1] = user_ip_fw->set_masks[1];
+	fw64->pcnt = user_ip_fw->pcnt;
+	fw64->bcnt = user_ip_fw->bcnt;
+	fw64->timestamp = user_ip_fw->timestamp;
+	fw64->reserved_1 = user_ip_fw->reserved_1;
+	fw64->reserved_2 = user_ip_fw->reserved_2;
+	rulesize = sizeof(struct ip_fw_64) + (user_ip_fw->cmd_len * sizeof(ipfw_insn) - 4);
+	if (rulesize > copysize)
+		cmdsize = copysize - sizeof(struct ip_fw_64) + 4;
+	else
+		cmdsize = user_ip_fw->cmd_len * sizeof(u_int32_t);
+	copyto64fw_insn( fw64, user_ip_fw, cmdsize);
+}
+
+static int
+copyfrom32fw_insn( struct ip_fw_32 *fw32 , struct ip_fw *user_ip_fw, int cmdsize)
+{
+	char		*end;
+	char		*fw32action;
+	char		*useraction;
+	int			justcmdsize;
+	int			diff;
+	int			actioncopysize;
+
+	end = ((char*)fw32->cmd) + cmdsize;
+	fw32action = (char*)ACTION_PTR( fw32 );
+	if ((justcmdsize = (fw32action - (char*)fw32->cmd)))
+		bcopy( fw32->cmd, user_ip_fw->cmd, justcmdsize); 
+	useraction = (char*)user_ip_fw->cmd + justcmdsize;
+	while ( fw32action < end ){
+		if ( ((ipfw_insn*)fw32action)->opcode == O_QUEUE || ((ipfw_insn*)fw32action)->opcode == O_PIPE){
+			actioncopysize = sizeof(ipfw_insn_pipe);
+			((ipfw_insn*)useraction)->opcode = ((ipfw_insn*)fw32action)->opcode;
+			((ipfw_insn*)useraction)->arg1 = ((ipfw_insn*)fw32action)->arg1;
+			((ipfw_insn*)useraction)->len = F_INSN_SIZE(ipfw_insn_pipe);
+			diff = ((ipfw_insn*)useraction)->len - ((ipfw_insn*)fw32action)->len;
+			if (diff){
+				/* readjust the cmd_len */
+				user_ip_fw->cmd_len += diff;
+			}
+		} else{
+			actioncopysize = (F_LEN((ipfw_insn*)fw32action) ? (F_LEN((ipfw_insn*)fw32action)) : 1 ) * sizeof(uint32_t);
+			bcopy( fw32action, useraction, actioncopysize );
+		}
+		fw32action += (F_LEN((ipfw_insn*)fw32action) ? (F_LEN((ipfw_insn*)fw32action)) : 1 ) * sizeof(uint32_t);
+		useraction += actioncopysize;
+	}
+
+	return( useraction - (char*)user_ip_fw->cmd );
+}
+
+static int
+copyfrom64fw_insn( struct ip_fw_64 *fw64 , struct ip_fw *user_ip_fw, int cmdsize)
+{
+	char		*end;
+	char		*fw64action;
+	char		*useraction;
+	int			justcmdsize;
+	int			diff;
+	int			actioncopysize;
+
+	end = ((char *)fw64->cmd) + cmdsize ;
+	fw64action = (char*)ACTION_PTR( fw64 );
+	if ( (justcmdsize = (fw64action - (char*)fw64->cmd)))
+		bcopy( fw64->cmd, user_ip_fw->cmd, justcmdsize); 
+	useraction = (char*)user_ip_fw->cmd + justcmdsize;
+	while ( fw64action < end ){
+		if ( ((ipfw_insn*)fw64action)->opcode == O_QUEUE || ((ipfw_insn*)fw64action)->opcode == O_PIPE){
+			actioncopysize = sizeof(ipfw_insn_pipe);
+			((ipfw_insn*)useraction)->opcode = ((ipfw_insn*)fw64action)->opcode;
+			((ipfw_insn*)useraction)->arg1 = ((ipfw_insn*)fw64action)->arg1;
+			((ipfw_insn*)useraction)->len = F_INSN_SIZE(ipfw_insn_pipe);
+			diff = ((ipfw_insn*)fw64action)->len - ((ipfw_insn*)useraction)->len; 
+			if (diff) {
+				/* readjust the cmd_len */
+				user_ip_fw->cmd_len -= diff;
+			}
+		} else{
+			actioncopysize = (F_LEN((ipfw_insn*)fw64action) ? (F_LEN((ipfw_insn*)fw64action)) : 1 ) * sizeof(uint32_t);
+			bcopy( fw64action, useraction, actioncopysize );
+		}
+		fw64action += (F_LEN((ipfw_insn*)fw64action) ? (F_LEN((ipfw_insn*)fw64action)) : 1 ) * sizeof(uint32_t); 
+		useraction += actioncopysize;
+	}
+	return( useraction - (char*)user_ip_fw->cmd );
+}
+
+static size_t 
+copyfrom32fw( struct ip_fw_32	*fw32, struct ip_fw *user_ip_fw, size_t copysize)
+{
+	size_t rulesize, cmdsize;
+	 
+	user_ip_fw->version = fw32->version;
+	user_ip_fw->context = CAST_DOWN(void *, fw32->context);
+	user_ip_fw->next = CAST_DOWN(struct ip_fw*, fw32->next);
+	user_ip_fw->next_rule = CAST_DOWN_EXPLICIT(struct ip_fw*, fw32->next_rule);
+	user_ip_fw->act_ofs = fw32->act_ofs;
+	user_ip_fw->cmd_len = fw32->cmd_len;
+	user_ip_fw->rulenum = fw32->rulenum;
+	user_ip_fw->set = fw32->set;
+	user_ip_fw->set_masks[0] = fw32->set_masks[0];
+	user_ip_fw->set_masks[1] = fw32->set_masks[1];
+	user_ip_fw->pcnt = fw32->pcnt;
+	user_ip_fw->bcnt = fw32->bcnt;
+	user_ip_fw->timestamp = fw32->timestamp;
+	user_ip_fw->reserved_1 = fw32->reserved_1;
+	user_ip_fw->reserved_2 = fw32->reserved_2;
+	rulesize = sizeof(struct ip_fw_32) + (fw32->cmd_len * sizeof(ipfw_insn) - 4);
+	if ( rulesize > copysize )
+		cmdsize = copysize - sizeof(struct ip_fw_32)-4;
+	else
+		cmdsize = fw32->cmd_len * sizeof(ipfw_insn);
+	cmdsize = copyfrom32fw_insn( fw32, user_ip_fw, cmdsize);
+	return( sizeof(struct ip_fw) + cmdsize - 4);
+}
+
+static size_t 
+copyfrom64fw( struct ip_fw_64 *fw64, struct ip_fw *user_ip_fw, size_t copysize)
+{
+	size_t rulesize, cmdsize;
+	
+	user_ip_fw->version = fw64->version;
+	user_ip_fw->context = CAST_DOWN_EXPLICIT( void *, fw64->context);
+	user_ip_fw->next = CAST_DOWN_EXPLICIT(struct ip_fw*, fw64->next);
+	user_ip_fw->next_rule = CAST_DOWN_EXPLICIT(struct ip_fw*, fw64->next_rule);
+	user_ip_fw->act_ofs = fw64->act_ofs;
+	user_ip_fw->cmd_len = fw64->cmd_len;
+	user_ip_fw->rulenum = fw64->rulenum;
+	user_ip_fw->set = fw64->set;
+	user_ip_fw->set_masks[0] = fw64->set_masks[0];
+	user_ip_fw->set_masks[1] = fw64->set_masks[1];
+	user_ip_fw->pcnt = fw64->pcnt;
+	user_ip_fw->bcnt = fw64->bcnt;
+	user_ip_fw->timestamp = fw64->timestamp;
+	user_ip_fw->reserved_1 = fw64->reserved_1;
+	user_ip_fw->reserved_2 = fw64->reserved_2;
+	//bcopy( fw64->cmd, user_ip_fw->cmd, fw64->cmd_len * sizeof(ipfw_insn));
+	rulesize = sizeof(struct ip_fw_64) + (fw64->cmd_len * sizeof(ipfw_insn) - 4);
+	if ( rulesize > copysize )
+		cmdsize = copysize - sizeof(struct ip_fw_64)-4;
+	else
+		cmdsize = fw64->cmd_len * sizeof(ipfw_insn);
+	cmdsize = copyfrom64fw_insn( fw64, user_ip_fw, cmdsize);
+	return( sizeof(struct ip_fw) + cmdsize - 4);
+}
+
+void
+externalize_flow_id(struct ipfw_flow_id *dst, struct ip_flow_id *src);
+void
+externalize_flow_id(struct ipfw_flow_id *dst, struct ip_flow_id *src)
+{
+	dst->dst_ip = src->dst_ip;
+	dst->src_ip = src->src_ip;
+	dst->dst_port = src->dst_port;
+	dst->src_port = src->src_port;
+	dst->proto = src->proto;
+	dst->flags = src->flags;
+}
+
+static
+void cp_dyn_to_comp_32( struct ipfw_dyn_rule_compat_32 *dyn_rule_vers1, int *len)
+{
+	struct ipfw_dyn_rule_compat_32 *dyn_last=NULL;
+	ipfw_dyn_rule 	*p;
+	int i;
+
+	if (ipfw_dyn_v) {
+		for (i = 0; i < curr_dyn_buckets; i++) {
+			for ( p = ipfw_dyn_v[i] ; p != NULL ; p = p->next) {
+				dyn_rule_vers1->chain = (user32_addr_t)(p->rule->rulenum);
+				externalize_flow_id(&dyn_rule_vers1->id, &p->id);
+				externalize_flow_id(&dyn_rule_vers1->mask, &p->id);
+				dyn_rule_vers1->type = p->dyn_type;
+				dyn_rule_vers1->expire = p->expire;
+				dyn_rule_vers1->pcnt = p->pcnt;
+				dyn_rule_vers1->bcnt = p->bcnt;
+				dyn_rule_vers1->bucket = p->bucket;
+				dyn_rule_vers1->state = p->state;
+				
+				dyn_rule_vers1->next = CAST_DOWN_EXPLICIT( user32_addr_t, p->next);
+				dyn_last = dyn_rule_vers1;
+				
+				*len += sizeof(*dyn_rule_vers1);
+				dyn_rule_vers1++;
+			}
+		}
+		
+		if (dyn_last != NULL) {
+			dyn_last->next = ((user32_addr_t)0);
+		}
+	}
+}
+
+
+static
+void cp_dyn_to_comp_64( struct ipfw_dyn_rule_compat_64 *dyn_rule_vers1, int *len)
+{
+	struct ipfw_dyn_rule_compat_64 *dyn_last=NULL;
+	ipfw_dyn_rule 	*p;
+	int i;
+
+	if (ipfw_dyn_v) {
+		for (i = 0; i < curr_dyn_buckets; i++) {
+			for ( p = ipfw_dyn_v[i] ; p != NULL ; p = p->next) {
+				dyn_rule_vers1->chain = (user64_addr_t) p->rule->rulenum;
+				externalize_flow_id(&dyn_rule_vers1->id, &p->id);
+				externalize_flow_id(&dyn_rule_vers1->mask, &p->id);
+				dyn_rule_vers1->type = p->dyn_type;
+				dyn_rule_vers1->expire = p->expire;
+				dyn_rule_vers1->pcnt = p->pcnt;
+				dyn_rule_vers1->bcnt = p->bcnt;
+				dyn_rule_vers1->bucket = p->bucket;
+				dyn_rule_vers1->state = p->state;
+				
+				dyn_rule_vers1->next = CAST_DOWN(user64_addr_t, p->next);
+				dyn_last = dyn_rule_vers1;
+				
+				*len += sizeof(*dyn_rule_vers1);
+				dyn_rule_vers1++;
+			}
+		}
+		
+		if (dyn_last != NULL) {
+			dyn_last->next = CAST_DOWN(user64_addr_t, NULL);
+		}
+	}
+}
+
+static int
+sooptcopyin_fw( struct sockopt *sopt, struct ip_fw *user_ip_fw, size_t *size )
+{
+	size_t	valsize, copyinsize = 0;
+	int	error = 0;
+
+	valsize = sopt->sopt_valsize;	
+	if ( size )
+		copyinsize = *size;
+	if (proc_is64bit(sopt->sopt_p)) {
+		struct ip_fw_64	*fw64=NULL;
+		
+		if ( valsize < sizeof(struct ip_fw_64) ) {
+			return(EINVAL);
+		}
+		if ( !copyinsize )
+			copyinsize = sizeof(struct ip_fw_64);
+		if ( valsize > copyinsize )
+			sopt->sopt_valsize = valsize = copyinsize;
+			
+		if ( sopt->sopt_p != 0) {
+			fw64 = _MALLOC(copyinsize, M_TEMP, M_WAITOK);
+			if ( fw64 == NULL )
+				return(ENOBUFS);
+			if ((error = copyin(sopt->sopt_val, fw64, valsize)) != 0){
+				_FREE(fw64, M_TEMP);
+				return error;
+			}
+		}
+		else {
+			bcopy(CAST_DOWN(caddr_t, sopt->sopt_val), fw64, valsize);
+		}
+		valsize = copyfrom64fw( fw64, user_ip_fw, valsize );
+		_FREE( fw64, M_TEMP);
+	}else {
+		struct ip_fw_32 *fw32=NULL;
+	
+		if ( valsize < sizeof(struct ip_fw_32) ) {
+			return(EINVAL);
+		}
+		if ( !copyinsize)
+			copyinsize = sizeof(struct ip_fw_32);
+		if ( valsize > copyinsize)
+			sopt->sopt_valsize = valsize = copyinsize;
+			
+		if ( sopt->sopt_p != 0) {
+			fw32 = _MALLOC(copyinsize, M_TEMP, M_WAITOK);
+			if ( fw32 == NULL )
+				return(ENOBUFS);
+			if ( (error = copyin(sopt->sopt_val, fw32, valsize)) != 0){
+				_FREE( fw32, M_TEMP);
+				return( error );
+			}
+		}
+		else {
+			bcopy(CAST_DOWN(caddr_t, sopt->sopt_val), fw32, valsize);
+		}
+		valsize = copyfrom32fw( fw32, user_ip_fw, valsize);
+		_FREE( fw32, M_TEMP);
+	}
+	if ( size )
+		*size = valsize;
+	return error;
+}
+
 /*
  * The following checks use two arrays of 8 or 16 bits to store the
  * bits that we want set or clear, respectively. They are in the
@@ -467,15 +1057,18 @@ iface_match(struct ifnet *ifp, ipfw_insn_if *cmd)
 
 		ifnet_lock_shared(ifp);
 		TAILQ_FOREACH(ia, &ifp->if_addrhead, ifa_link) {
-			if (ia->ifa_addr == NULL)
-				continue;
-			if (ia->ifa_addr->sa_family != AF_INET)
+			IFA_LOCK(ia);
+			if (ia->ifa_addr->sa_family != AF_INET) {
+				IFA_UNLOCK(ia);
 				continue;
+			}
 			if (cmd->p.ip.s_addr == ((struct sockaddr_in *)
 			    (ia->ifa_addr))->sin_addr.s_addr) {
+				IFA_UNLOCK(ia);
 				ifnet_lock_done(ifp);
 				return(1);	/* match */
 			}
+			IFA_UNLOCK(ia);
 		}
 		ifnet_lock_done(ifp);
 	}
@@ -502,24 +1095,31 @@ verify_rev_path(struct in_addr src, struct ifnet *ifp)
 	static struct route ro;
 	struct sockaddr_in *dst;
 
+	bzero(&ro, sizeof (ro));
 	dst = (struct sockaddr_in *)&(ro.ro_dst);
 
 	/* Check if we've cached the route from the previous call. */
 	if (src.s_addr != dst->sin_addr.s_addr) {
-		ro.ro_rt = NULL;
-
-		bzero(dst, sizeof(*dst));
 		dst->sin_family = AF_INET;
 		dst->sin_len = sizeof(*dst);
 		dst->sin_addr = src;
 
 		rtalloc_ign(&ro, RTF_CLONING|RTF_PRCLONING);
 	}
-
-	if ((ro.ro_rt == NULL) || (ifp == NULL) ||
-	    (ro.ro_rt->rt_ifp->if_index != ifp->if_index))
+	if (ro.ro_rt != NULL) {
+		RT_LOCK_SPIN(ro.ro_rt);
+	} else {
+		ROUTE_RELEASE(&ro);
+		return 0;	/* No route */
+	}
+	if ((ifp == NULL) ||
+	    (ro.ro_rt->rt_ifp->if_index != ifp->if_index)) {
+		RT_UNLOCK(ro.ro_rt);
+		ROUTE_RELEASE(&ro);
 		return 0;
-
+        }
+	RT_UNLOCK(ro.ro_rt);
+	ROUTE_RELEASE(&ro);
 	return 1;
 }
 
@@ -537,7 +1137,7 @@ static void
 ipfw_log(struct ip_fw *f, u_int hlen, struct ether_header *eh,
 	struct mbuf *m, struct ifnet *oif)
 {
-	char *action;
+	const char *action;
 	int limit_reached = 0;
 	char ipv4str[MAX_IPv4_STR_LEN];
 	char action2[40], proto[48], fragment[28];
@@ -731,7 +1331,7 @@ ipfw_log(struct ip_fw *f, u_int hlen, struct ether_header *eh,
  * and we want to find both in the same bucket.
  */
 static __inline int
-hash_packet(struct ipfw_flow_id *id)
+hash_packet(struct ip_flow_id *id)
 {
 	u_int32_t i;
 
@@ -847,7 +1447,7 @@ next:
  * lookup a dynamic rule.
  */
 static ipfw_dyn_rule *
-lookup_dyn_rule(struct ipfw_flow_id *pkt, int *match_direction,
+lookup_dyn_rule(struct ip_flow_id *pkt, int *match_direction,
 	struct tcphdr *tcp)
 {
 	/*
@@ -1019,7 +1619,7 @@ realloc_dynamic_table(void)
  * - "parent" rules for the above (O_LIMIT_PARENT).
  */
 static ipfw_dyn_rule *
-add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule)
+add_dyn_rule(struct ip_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule)
 {
 	ipfw_dyn_rule *r;
 	int i;
@@ -1077,7 +1677,7 @@ add_dyn_rule(struct ipfw_flow_id *id, u_int8_t dyn_type, struct ip_fw *rule)
  * If the lookup fails, then install one.
  */
 static ipfw_dyn_rule *
-lookup_dyn_parent(struct ipfw_flow_id *pkt, struct ip_fw *rule)
+lookup_dyn_parent(struct ip_flow_id *pkt, struct ip_fw *rule)
 {
 	ipfw_dyn_rule *q;
 	int i;
@@ -1096,7 +1696,8 @@ lookup_dyn_parent(struct ipfw_flow_id *pkt, struct ip_fw *rule)
 			    pkt->src_port == q->id.src_port &&
 			    pkt->dst_port == q->id.dst_port) {
 				q->expire = timenow.tv_sec + dyn_short_lifetime;
-				DEB(printf("ipfw: lookup_dyn_parent found 0x%p\n",q);)
+				DEB(printf("ipfw: lookup_dyn_parent found "
+				    "0x%llx\n", (uint64_t)VM_KERNEL_ADDRPERM(q));)
 				return q;
 			}
 	}
@@ -1121,10 +1722,10 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
 
 	DEB(printf("ipfw: install state type %d 0x%08x %u -> 0x%08x %u\n",
 	    cmd->o.opcode,
-	    (args->f_id.src_ip), (args->f_id.src_port),
-	    (args->f_id.dst_ip), (args->f_id.dst_port) );)
+	    (args->fwa_id.src_ip), (args->fwa_id.src_port),
+	    (args->fwa_id.dst_ip), (args->fwa_id.dst_port) );)
 
-	q = lookup_dyn_rule(&args->f_id, NULL, NULL);
+	q = lookup_dyn_rule(&args->fwa_id, NULL, NULL);
 
 	if (q != NULL) { /* should never occur */
 		if (last_log != timenow.tv_sec) {
@@ -1150,13 +1751,13 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
 
 	switch (cmd->o.opcode) {
 	case O_KEEP_STATE: /* bidir rule */
-		add_dyn_rule(&args->f_id, O_KEEP_STATE, rule);
+		add_dyn_rule(&args->fwa_id, O_KEEP_STATE, rule);
 		break;
 
 	case O_LIMIT: /* limit number of sessions */
 	    {
 		u_int16_t limit_mask = cmd->limit_mask;
-		struct ipfw_flow_id id;
+		struct ip_flow_id id;
 		ipfw_dyn_rule *parent;
 
 		DEB(printf("ipfw: installing dyn-limit rule %d\n",
@@ -1164,16 +1765,16 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
 
 		id.dst_ip = id.src_ip = 0;
 		id.dst_port = id.src_port = 0;
-		id.proto = args->f_id.proto;
+		id.proto = args->fwa_id.proto;
 
 		if (limit_mask & DYN_SRC_ADDR)
-			id.src_ip = args->f_id.src_ip;
+			id.src_ip = args->fwa_id.src_ip;
 		if (limit_mask & DYN_DST_ADDR)
-			id.dst_ip = args->f_id.dst_ip;
+			id.dst_ip = args->fwa_id.dst_ip;
 		if (limit_mask & DYN_SRC_PORT)
-			id.src_port = args->f_id.src_port;
+			id.src_port = args->fwa_id.src_port;
 		if (limit_mask & DYN_DST_PORT)
-			id.dst_port = args->f_id.dst_port;
+			id.dst_port = args->fwa_id.dst_port;
 		parent = lookup_dyn_parent(&id, rule);
 		if (parent == NULL) {
 			printf("ipfw: add parent failed\n");
@@ -1193,34 +1794,33 @@ install_state(struct ip_fw *rule, ipfw_insn_limit *cmd,
 				return 1;
 			}
 		}
-		add_dyn_rule(&args->f_id, O_LIMIT, (struct ip_fw *)parent);
+		add_dyn_rule(&args->fwa_id, O_LIMIT, (struct ip_fw *)parent);
 	    }
 		break;
 	default:
 		printf("ipfw: unknown dynamic rule type %u\n", cmd->o.opcode);
 		return 1;
 	}
-	lookup_dyn_rule(&args->f_id, NULL, NULL); /* XXX just set lifetime */
+	lookup_dyn_rule(&args->fwa_id, NULL, NULL); /* XXX just set lifetime */
 	return 0;
 }
 
 /*
- * Transmit a TCP packet, containing either a RST or a keepalive.
+ * Generate a TCP packet, containing either a RST or a keepalive.
  * When flags & TH_RST, we are sending a RST packet, because of a
  * "reset" action matched the packet.
  * Otherwise we are sending a keepalive, and flags & TH_
  */
-static void
-send_pkt(struct ipfw_flow_id *id, u_int32_t seq, u_int32_t ack, int flags)
+static struct mbuf *
+send_pkt(struct ip_flow_id *id, u_int32_t seq, u_int32_t ack, int flags)
 {
 	struct mbuf *m;
 	struct ip *ip;
 	struct tcphdr *tcp;
-	struct route sro;	/* fake route */
 
-	MGETHDR(m, M_DONTWAIT, MT_HEADER);
+	MGETHDR(m, M_DONTWAIT, MT_HEADER);	/* MAC-OK */
 	if (m == 0)
-		return;
+		return NULL;
 	m->m_pkthdr.rcvif = (struct ifnet *)0;
 	m->m_pkthdr.len = m->m_len = sizeof(struct ip) + sizeof(struct tcphdr);
 	m->m_data += max_linkhdr;
@@ -1282,42 +1882,48 @@ send_pkt(struct ipfw_flow_id *id, u_int32_t seq, u_int32_t ack, int flags)
 	 */
 	ip->ip_ttl = ip_defttl;
 	ip->ip_len = m->m_pkthdr.len;
-	bzero (&sro, sizeof (sro));
-	ip_rtaddr(ip->ip_dst, &sro);
 	m->m_flags |= M_SKIP_FIREWALL;
-	ip_output_list(m, 0, NULL, &sro, 0, NULL);
-	if (sro.ro_rt)
-		RTFREE(sro.ro_rt);
+	
+	return m;
 }
 
 /*
  * sends a reject message, consuming the mbuf passed as an argument.
  */
 static void
-send_reject(struct ip_fw_args *args, int code, int offset, int ip_len)
+send_reject(struct ip_fw_args *args, int code, int offset, __unused int ip_len)
 {
 
 	if (code != ICMP_REJECT_RST) { /* Send an ICMP unreach */
 		/* We need the IP header in host order for icmp_error(). */
-		if (args->eh != NULL) {
-			struct ip *ip = mtod(args->m, struct ip *);
+		if (args->fwa_eh != NULL) {
+			struct ip *ip = mtod(args->fwa_m, struct ip *);
 			ip->ip_len = ntohs(ip->ip_len);
 			ip->ip_off = ntohs(ip->ip_off);
 		}
-                args->m->m_flags |= M_SKIP_FIREWALL;
-		icmp_error(args->m, ICMP_UNREACH, code, 0L, 0);
-	} else if (offset == 0 && args->f_id.proto == IPPROTO_TCP) {
+		args->fwa_m->m_flags |= M_SKIP_FIREWALL;
+		icmp_error(args->fwa_m, ICMP_UNREACH, code, 0L, 0);
+	} else if (offset == 0 && args->fwa_id.proto == IPPROTO_TCP) {
 		struct tcphdr *const tcp =
-		    L3HDR(struct tcphdr, mtod(args->m, struct ip *));
+		    L3HDR(struct tcphdr, mtod(args->fwa_m, struct ip *));
 		if ( (tcp->th_flags & TH_RST) == 0) {
-			send_pkt(&(args->f_id), ntohl(tcp->th_seq),
+			struct mbuf *m;
+
+			m = send_pkt(&(args->fwa_id), ntohl(tcp->th_seq),
 				ntohl(tcp->th_ack),
 				tcp->th_flags | TH_RST);
+			if (m != NULL) {
+				struct route sro;	/* fake route */
+
+				bzero (&sro, sizeof (sro));
+				ip_output(m, NULL, &sro, 0, NULL, NULL);
+				ROUTE_RELEASE(&sro);
+			}
 		}
-		m_freem(args->m);
+		m_freem(args->fwa_m);
 	} else
-		m_freem(args->m);
-	args->m = NULL;
+		m_freem(args->fwa_m);
+	args->fwa_m = NULL;
 }
 
 /**
@@ -1363,18 +1969,18 @@ lookup_next_rule(struct ip_fw *me)
  *
  * Parameters:
  *
- *	args->m	(in/out) The packet; we set to NULL when/if we nuke it.
+ *	args->fwa_m	(in/out) The packet; we set to NULL when/if we nuke it.
  *		Starts with the IP header.
- *	args->eh (in)	Mac header if present, or NULL for layer3 packet.
- *	args->oif	Outgoing interface, or NULL if packet is incoming.
+ *	args->fwa_eh (in)	Mac header if present, or NULL for layer3 packet.
+ *	args->fwa_oif	Outgoing interface, or NULL if packet is incoming.
  *		The incoming interface is in the mbuf. (in)
- *	args->divert_rule (in/out)
+ *	args->fwa_divert_rule (in/out)
  *		Skip up to the first rule past this rule number;
  *		upon return, non-zero port number for divert or tee.
  *
- *	args->rule	Pointer to the last matching rule (in/out)
- *	args->next_hop	Socket we are forwarding to (out).
- *	args->f_id	Addresses grabbed from the packet (out)
+ *	args->fwa_ipfw_rule	Pointer to the last matching rule (in/out)
+ *	args->fwa_next_hop	Socket we are forwarding to (out).
+ *	args->fwa_id	Addresses grabbed from the packet (out)
  *
  * Return value:
  *
@@ -1403,10 +2009,10 @@ ipfw_chk(struct ip_fw_args *args)
 	 * the implementation of the various instructions to make sure
 	 * that they still work.
 	 *
-	 * args->eh	The MAC header. It is non-null for a layer2
+	 * args->fwa_eh	The MAC header. It is non-null for a layer2
 	 *	packet, it is NULL for a layer-3 packet.
 	 *
-	 * m | args->m	Pointer to the mbuf, as received from the caller.
+	 * m | args->fwa_m	Pointer to the mbuf, as received from the caller.
 	 *	It may change if ipfw_chk() does an m_pullup, or if it
 	 *	consumes the packet because it calls send_reject().
 	 *	XXX This has to change, so that ipfw_chk() never modifies
@@ -1415,16 +2021,16 @@ ipfw_chk(struct ip_fw_args *args)
 	 *	in sync with it (the packet is	supposed to start with
 	 *	the ip header).
 	 */
-	struct mbuf *m = args->m;
+	struct mbuf *m = args->fwa_m;
 	struct ip *ip = mtod(m, struct ip *);
 
 	/*
-	 * oif | args->oif	If NULL, ipfw_chk has been called on the
+	 * oif | args->fwa_oif	If NULL, ipfw_chk has been called on the
 	 *	inbound path (ether_input, bdg_forward, ip_input).
 	 *	If non-NULL, ipfw_chk has been called on the outbound path
 	 *	(ether_output, ip_output).
 	 */
-	struct ifnet *oif = args->oif;
+	struct ifnet *oif = args->fwa_oif;
 
 	struct ip_fw *f = NULL;		/* matching rule */
 	int retval = 0;
@@ -1459,17 +2065,26 @@ ipfw_chk(struct ip_fw_args *args)
 	 */
 	u_int8_t proto;
 	u_int16_t src_port = 0, dst_port = 0;	/* NOTE: host format	*/
-	struct in_addr src_ip, dst_ip;		/* NOTE: network format	*/
+	struct in_addr src_ip = { 0 } , dst_ip = { 0 };		/* NOTE: network format	*/
 	u_int16_t ip_len=0;
 	int pktlen;
 	int dyn_dir = MATCH_UNKNOWN;
 	ipfw_dyn_rule *q = NULL;
 	struct timeval timenow;
 
-	if (m->m_flags & M_SKIP_FIREWALL) {
+	if (m->m_flags & M_SKIP_FIREWALL || fw_bypass) {
 		return 0;	/* accept */
 	}
 
+	/* 
+	 * Clear packet chain if we find one here.
+	 */
+	
+	if (m->m_nextpkt != NULL) {
+		m_freem_list(m->m_nextpkt);
+		m->m_nextpkt = NULL;
+	}
+	
 	lck_mtx_lock(ipfw_mutex);
 
 	getmicrotime(&timenow);
@@ -1480,23 +2095,23 @@ ipfw_chk(struct ip_fw_args *args)
 	 */
 
 	pktlen = m->m_pkthdr.len;
-	if (args->eh == NULL ||		/* layer 3 packet */
+	if (args->fwa_eh == NULL ||		/* layer 3 packet */
 		( m->m_pkthdr.len >= sizeof(struct ip) &&
-		    ntohs(args->eh->ether_type) == ETHERTYPE_IP))
+		    ntohs(args->fwa_eh->ether_type) == ETHERTYPE_IP))
 			hlen = ip->ip_hl << 2;
 
 	/*
 	 * Collect parameters into local variables for faster matching.
 	 */
 	if (hlen == 0) {	/* do not grab addresses for non-ip pkts */
-		proto = args->f_id.proto = 0;	/* mark f_id invalid */
+		proto = args->fwa_id.proto = 0;	/* mark f_id invalid */
 		goto after_ip_checks;
 	}
 
-	proto = args->f_id.proto = ip->ip_p;
+	proto = args->fwa_id.proto = ip->ip_p;
 	src_ip = ip->ip_src;
 	dst_ip = ip->ip_dst;
-	if (args->eh != NULL) { /* layer 2 packets are as on the wire */
+	if (args->fwa_eh != NULL) { /* layer 2 packets are as on the wire */
 		offset = ntohs(ip->ip_off) & IP_OFFMASK;
 		ip_len = ntohs(ip->ip_len);
 	} else {
@@ -1508,7 +2123,7 @@ ipfw_chk(struct ip_fw_args *args)
 #define PULLUP_TO(len)						\
 		do {						\
 			if ((m)->m_len < (len)) {		\
-			    args->m = m = m_pullup(m, (len));	\
+			    args->fwa_m = m = m_pullup(m, (len));	\
 			    if (m == 0)				\
 				goto pullup_failed;		\
 			    ip = mtod(m, struct ip *);		\
@@ -1525,7 +2140,7 @@ ipfw_chk(struct ip_fw_args *args)
 			tcp = L3HDR(struct tcphdr, ip);
 			dst_port = tcp->th_dport;
 			src_port = tcp->th_sport;
-			args->f_id.flags = tcp->th_flags;
+			args->fwa_id.flags = tcp->th_flags;
 			}
 			break;
 
@@ -1542,7 +2157,7 @@ ipfw_chk(struct ip_fw_args *args)
 
 		case IPPROTO_ICMP:
 			PULLUP_TO(hlen + 4);	/* type, code and checksum. */
-			args->f_id.flags = L3HDR(struct icmp, ip)->icmp_type;
+			args->fwa_id.flags = L3HDR(struct icmp, ip)->icmp_type;
 			break;
 
 		default:
@@ -1551,13 +2166,13 @@ ipfw_chk(struct ip_fw_args *args)
 #undef PULLUP_TO
 	}
 
-	args->f_id.src_ip = ntohl(src_ip.s_addr);
-	args->f_id.dst_ip = ntohl(dst_ip.s_addr);
-	args->f_id.src_port = src_port = ntohs(src_port);
-	args->f_id.dst_port = dst_port = ntohs(dst_port);
+	args->fwa_id.src_ip = ntohl(src_ip.s_addr);
+	args->fwa_id.dst_ip = ntohl(dst_ip.s_addr);
+	args->fwa_id.src_port = src_port = ntohs(src_port);
+	args->fwa_id.dst_port = dst_port = ntohs(dst_port);
 
 after_ip_checks:
-	if (args->rule) {
+	if (args->fwa_ipfw_rule) {
 		/*
 		 * Packet has already been tagged. Look for the next rule
 		 * to restart processing.
@@ -1571,18 +2186,18 @@ after_ip_checks:
 			return 0;
 		}
 
-		f = args->rule->next_rule;
+		f = args->fwa_ipfw_rule->next_rule;
 		if (f == NULL)
-			f = lookup_next_rule(args->rule);
+			f = lookup_next_rule(args->fwa_ipfw_rule);
 	} else {
 		/*
 		 * Find the starting rule. It can be either the first
 		 * one, or the one after divert_rule if asked so.
 		 */
-		int skipto = args->divert_rule;
+		int skipto = args->fwa_divert_rule;
 
 		f = layer3_chain;
-		if (args->eh == NULL && skipto != 0) {
+		if (args->fwa_eh == NULL && skipto != 0) {
 			if (skipto >= IPFW_DEFAULT_RULE) {
 				lck_mtx_unlock(ipfw_mutex);
 				return(IP_FW_PORT_DENY_FLAG); /* invalid */
@@ -1595,7 +2210,7 @@ after_ip_checks:
 			}
 		}
 	}
-	args->divert_rule = 0;	/* reset to avoid confusion later */
+	args->fwa_divert_rule = 0;	/* reset to avoid confusion later */
 
 	/*
 	 * Now scan the rules, and parse microinstructions for each rule.
@@ -1693,7 +2308,7 @@ check_body:
 					    dst_ip, htons(dst_port),
 					    wildcard, NULL);
 
-				if (pcb == NULL || pcb->inp_socket == NULL)
+				if (pcb == NULL || pcb->inp_socket == NULL) 
 					break;
 #if __FreeBSD_version < 500034
 #define socheckuid(a,b)	(kauth_cred_getuid((a)->so_cred) != (b))
@@ -1701,7 +2316,7 @@ check_body:
 				if (cmd->opcode == O_UID) {
 					match = 
 #ifdef __APPLE__
-						(pcb->inp_socket->so_uid == (uid_t)((ipfw_insn_u32 *)cmd)->d[0]);
+						(kauth_cred_getuid(pcb->inp_socket->so_cred) == (uid_t)((ipfw_insn_u32 *)cmd)->d[0]);
 #else
 						!socheckuid(pcb->inp_socket,
 						   (uid_t)((ipfw_insn_u32 *)cmd)->d[0]);
@@ -1714,6 +2329,8 @@ check_body:
 						(gid_t)((ipfw_insn_u32 *)cmd)->d[0], &match);
 				}
 #endif
+				/* release reference on pcb */
+				in_pcb_checkstate(pcb, WNT_RELEASE, 0);
 				}
 
 			break;
@@ -1733,12 +2350,12 @@ check_body:
 				break;
 
 			case O_MACADDR2:
-				if (args->eh != NULL) {	/* have MAC header */
+				if (args->fwa_eh != NULL) {	/* have MAC header */
 					u_int32_t *want = (u_int32_t *)
 						((ipfw_insn_mac *)cmd)->addr;
 					u_int32_t *mask = (u_int32_t *)
 						((ipfw_insn_mac *)cmd)->mask;
-					u_int32_t *hdr = (u_int32_t *)args->eh;
+					u_int32_t *hdr = (u_int32_t *)args->fwa_eh;
 
 					match =
 					    ( want[0] == (hdr[0] & mask[0]) &&
@@ -1748,9 +2365,9 @@ check_body:
 				break;
 
 			case O_MAC_TYPE:
-				if (args->eh != NULL) {
+				if (args->fwa_eh != NULL) {
 					u_int16_t t =
-					    ntohs(args->eh->ether_type);
+					    ntohs(args->fwa_eh->ether_type);
 					u_int16_t *p =
 					    ((ipfw_insn_u16 *)cmd)->ports;
 					int i;
@@ -1770,7 +2387,7 @@ check_body:
 				break;
 
 			case O_LAYER2:
-				match = (args->eh != NULL);
+				match = (args->fwa_eh != NULL);
 				break;
 
 			case O_PROTO:
@@ -1816,8 +2433,8 @@ check_body:
 					u_int32_t *d = (u_int32_t *)(cmd+1);
 					u_int32_t addr =
 					    cmd->opcode == O_IP_DST_SET ?
-						args->f_id.dst_ip :
-						args->f_id.src_ip;
+						args->fwa_id.dst_ip :
+						args->fwa_id.src_ip;
 
 					    if (addr < d[0])
 						    break;
@@ -1953,7 +2570,7 @@ check_body:
 
 			case O_LOG:
 				if (fw_verbose)
-					ipfw_log(f, hlen, args->eh, m, oif);
+					ipfw_log(f, hlen, args->fwa_eh, m, oif);
 				match = 1;
 				break;
 
@@ -2039,7 +2656,7 @@ check_body:
 				 * to be run first).
 				 */
 				if (dyn_dir == MATCH_UNKNOWN &&
-				    (q = lookup_dyn_rule(&args->f_id,
+				    (q = lookup_dyn_rule(&args->fwa_id,
 				     &dyn_dir, proto == IPPROTO_TCP ?
 					L3HDR(struct tcphdr, ip) : NULL))
 					!= NULL) {
@@ -2071,15 +2688,15 @@ check_body:
 
 			case O_PIPE:
 			case O_QUEUE:
-				args->rule = f; /* report matching rule */
+				args->fwa_ipfw_rule = f; /* report matching rule */
 				retval = cmd->arg1 | IP_FW_PORT_DYNT_FLAG;
 				goto done;
 
 			case O_DIVERT:
 			case O_TEE:
-				if (args->eh) /* not on layer 2 */
+				if (args->fwa_eh) /* not on layer 2 */
 					break;
-				args->divert_rule = f->rulenum;
+				args->fwa_divert_rule = f->rulenum;
 				retval = (cmd->opcode == O_DIVERT) ?
 				    cmd->arg1 :
 				    cmd->arg1 | IP_FW_PORT_TEE_FLAG;
@@ -2104,14 +2721,14 @@ check_body:
 				 * if the packet is not ICMP (or is an ICMP
 				 * query), and it is not multicast/broadcast.
 				 */
-				if (hlen > 0 &&
+				if (hlen > 0 && offset == 0 &&
 				    (proto != IPPROTO_ICMP ||
 				     is_icmp_query(ip)) &&
 				    !(m->m_flags & (M_BCAST|M_MCAST)) &&
 				    !IN_MULTICAST(dst_ip.s_addr)) {
 					send_reject(args, cmd->arg1,
 					    offset,ip_len);
-					m = args->m;
+					m = args->fwa_m;
 				}
 				/* FALLTHROUGH */
 			case O_DENY:
@@ -2119,10 +2736,10 @@ check_body:
 				goto done;
 
 			case O_FORWARD_IP:
-				if (args->eh)	/* not valid on layer2 pkts */
+				if (args->fwa_eh)	/* not valid on layer2 pkts */
 					break;
 				if (!q || dyn_dir == MATCH_FORWARD)
-					args->next_hop =
+					args->fwa_next_hop =
 					    &((ipfw_insn_sa *)cmd)->sa;
 				retval = 0;
 				goto done;
@@ -2216,7 +2833,6 @@ static int
 add_rule(struct ip_fw **head, struct ip_fw *input_rule)
 {
 	struct ip_fw *rule, *f, *prev;
-	int s;
 	int l = RULESIZE(input_rule);
 
 	if (*head == NULL && input_rule->rulenum != IPFW_DEFAULT_RULE)
@@ -2284,6 +2900,8 @@ add_rule(struct ip_fw **head, struct ip_fw *input_rule)
 done:
 	static_count++;
 	static_len += l;
+	static_len_32 += RULESIZE32(input_rule);
+	static_len_64 += RULESIZE64(input_rule);
 	DEB(printf("ipfw: installed rule %d, static count now %d\n",
 		rule->rulenum, static_count);)
 	return (0);
@@ -2312,10 +2930,12 @@ delete_rule(struct ip_fw **head, struct ip_fw *prev, struct ip_fw *rule)
 		prev->next = n;
 	static_count--;
 	static_len -= l;
+	static_len_32 -= RULESIZE32(rule);
+	static_len_64 -= RULESIZE64(rule);
 
 #if DUMMYNET
 	if (DUMMYNET_LOADED)
-		ip_dn_ruledel_ptr(rule);
+		dn_ipfw_rule_delete(rule);
 #endif /* DUMMYNET */
 	_FREE(rule, M_IPFW);
 	return n;
@@ -2421,6 +3041,8 @@ mark_inactive(struct ip_fw **prev, struct ip_fw **rule)
 		(*rule)->reserved_1 = IPFW_RULE_INACTIVE;
 		static_count--;
 		static_len -= l;
+		static_len_32 -= RULESIZE32(*rule);
+		static_len_64 -= RULESIZE64(*rule);
 		
 		timeout(flush_inactive, *rule, 30*hz); /* 30 sec. */
 	}
@@ -2477,7 +3099,6 @@ static int
 del_entry(struct ip_fw **chain, u_int32_t arg)
 {
 	struct ip_fw *prev = NULL, *rule = *chain;
-	int s;
 	u_int16_t rulenum;	/* rule or old_set */
 	u_int8_t cmd, new_set;
 
@@ -2513,12 +3134,12 @@ del_entry(struct ip_fw **chain, u_int32_t arg)
 		 */
 		flush_rule_ptrs();
 		while (rule->rulenum == rulenum) {
-			ipfw_insn	*cmd = ACTION_PTR(rule);
+			ipfw_insn	*insn = ACTION_PTR(rule);
 			
 			/* keep forwarding rules around so struct isn't 
 			 * deleted while pointer is still in use elsewhere
 			 */
-			if (cmd->opcode == O_FORWARD_IP) {
+			if (insn->opcode == O_FORWARD_IP) {
 				mark_inactive(&prev, &rule);
 			}
 			else {
@@ -2531,12 +3152,12 @@ del_entry(struct ip_fw **chain, u_int32_t arg)
 		flush_rule_ptrs();
 		while (rule->rulenum < IPFW_DEFAULT_RULE) {
 			if (rule->set == rulenum) {
-				ipfw_insn	*cmd = ACTION_PTR(rule);
+				ipfw_insn	*insn = ACTION_PTR(rule);
 				
 				/* keep forwarding rules around so struct isn't 
 				 * deleted while pointer is still in use elsewhere
 				 */
-				if (cmd->opcode == O_FORWARD_IP) {
+				if (insn->opcode == O_FORWARD_IP) {
 					mark_inactive(&prev, &rule);
 				}
 				else {
@@ -2599,8 +3220,7 @@ static int
 zero_entry(int rulenum, int log_only)
 {
 	struct ip_fw *rule;
-	int s;
-	char *msg;
+	const char *msg;
 
 	if (rulenum == 0) {
 		norule_counter = 0;
@@ -2827,6 +3447,22 @@ bad_size:
 }
 
 
+static void
+ipfw_kev_post_msg(u_int32_t event_code)
+{
+	struct kev_msg		ev_msg;
+
+	bzero(&ev_msg, sizeof(struct kev_msg));
+	
+	ev_msg.vendor_code = KEV_VENDOR_APPLE;
+	ev_msg.kev_class = KEV_FIREWALL_CLASS;
+	ev_msg.kev_subclass = KEV_IPFW_SUBCLASS;
+	ev_msg.event_code = event_code;
+
+	kev_post_msg(&ev_msg);
+
+}
+
 /**
  * {set|get}sockopt parser.
  */
@@ -2836,9 +3472,11 @@ ipfw_ctl(struct sockopt *sopt)
 #define	RULE_MAXSIZE	(256*sizeof(u_int32_t))
 	u_int32_t api_version;
 	int command;
-	int error, s;
+	int error;
 	size_t size;
+	size_t	rulesize = RULE_MAXSIZE;
 	struct ip_fw *bp , *buf, *rule;
+	int	is64user = 0;
 	
 	/* copy of orig sopt to send to ipfw_get_command_and_version() */
 	struct sockopt tmp_sopt = *sopt; 
@@ -2864,14 +3502,18 @@ ipfw_ctl(struct sockopt *sopt)
 
 	/* first get the command and version, then do conversion as necessary */
 	error = ipfw_get_command_and_version(&tmp_sopt, &command, &api_version);
-	
 	if (error) {
 		/* error getting the version */
 		return error;
 	}
 	
+	if (proc_is64bit(sopt->sopt_p))
+		is64user = 1;
+
 	switch (command) {
 	case IP_FW_GET:
+	{
+		size_t	dynrulesize;
 		/*
 		 * pass up a copy of the current rules. Static rules
 		 * come first (the last of which has number IPFW_DEFAULT_RULE),
@@ -2879,9 +3521,18 @@ ipfw_ctl(struct sockopt *sopt)
 		 * The last dynamic rule has NULL in the "next" field.
 		 */
 		lck_mtx_lock(ipfw_mutex);
-		size = static_len;	/* size of static rules */
-		if (ipfw_dyn_v)		/* add size of dyn.rules */
-			size += (dyn_count * sizeof(ipfw_dyn_rule));
+						
+		if (is64user){
+			size = Get64static_len();
+			dynrulesize = sizeof(ipfw_dyn_rule_64);
+			if (ipfw_dyn_v)
+				size += (dyn_count * dynrulesize);
+		}else {
+			size = Get32static_len();
+			dynrulesize = sizeof(ipfw_dyn_rule_32);
+			if (ipfw_dyn_v)
+				size += (dyn_count * dynrulesize);
+		}
 
 		/*
 		 * XXX todo: if the user passes a short length just to know
@@ -2899,41 +3550,94 @@ ipfw_ctl(struct sockopt *sopt)
 
 		bp = buf;
 		for (rule = layer3_chain; rule ; rule = rule->next) {
-			int i = RULESIZE(rule);
-			
+	
 			if (rule->reserved_1 == IPFW_RULE_INACTIVE) {
 				continue;
 			}
-			bcopy(rule, bp, i);
-			bcopy(&set_disable, &(bp->next_rule),
-			    sizeof(set_disable));
-			bp = (struct ip_fw *)((char *)bp + i);
+			
+			if (is64user){
+				int rulesize_64;
+
+				copyto64fw( rule, (struct ip_fw_64 *)bp, size);
+				bcopy(&set_disable, &(( (struct ip_fw_64*)bp)->next_rule), sizeof(set_disable));
+				/* do not use macro RULESIZE64 since we want RULESIZE for ip_fw_64 */
+				rulesize_64 = sizeof(struct ip_fw_64) + ((struct ip_fw_64 *)(bp))->cmd_len * 4 - 4;
+				bp = (struct ip_fw *)((char *)bp + rulesize_64);
+			}else{
+				int rulesize_32;
+
+				copyto32fw( rule, (struct ip_fw_32*)bp, size);
+				bcopy(&set_disable, &(( (struct ip_fw_32*)bp)->next_rule), sizeof(set_disable));
+				/* do not use macro RULESIZE32 since we want RULESIZE for ip_fw_32 */
+				rulesize_32 = sizeof(struct ip_fw_32) + ((struct ip_fw_32 *)(bp))->cmd_len * 4 - 4;
+				bp = (struct ip_fw *)((char *)bp + rulesize_32);
+			}
 		}
 		if (ipfw_dyn_v) {
 			int i;
-			ipfw_dyn_rule *p, *dst, *last = NULL;
-
-			dst = (ipfw_dyn_rule *)bp;
+			ipfw_dyn_rule *p;
+			char *dst, *last = NULL;
+			
+			dst = (char *)bp;
 			for (i = 0 ; i < curr_dyn_buckets ; i++ )
 				for ( p = ipfw_dyn_v[i] ; p != NULL ;
-				    p = p->next, dst++ ) {
-					bcopy(p, dst, sizeof *p);
-					bcopy(&(p->rule->rulenum), &(dst->rule),
-					    sizeof(p->rule->rulenum));
-					/*
-					 * store a non-null value in "next".
-					 * The userland code will interpret a
-					 * NULL here as a marker
-					 * for the last dynamic rule.
-					 */
-					bcopy(&dst, &dst->next, sizeof(dst));
-					last = dst ;
-					dst->expire =
-					    TIME_LEQ(dst->expire, timenow.tv_sec) ?
-						0 : dst->expire - timenow.tv_sec ;
+				    p = p->next, dst += dynrulesize ) {
+					if ( is64user ){
+						ipfw_dyn_rule_64	*ipfw_dyn_dst;
+						
+						ipfw_dyn_dst = (ipfw_dyn_rule_64 *)dst;
+						/*
+						 * store a non-null value in "next".
+						 * The userland code will interpret a
+						 * NULL here as a marker
+						 * for the last dynamic rule.
+						 */
+						ipfw_dyn_dst->next = CAST_DOWN_EXPLICIT(user64_addr_t, dst);
+						ipfw_dyn_dst->rule = p->rule->rulenum;
+						ipfw_dyn_dst->parent = CAST_DOWN(user64_addr_t, p->parent);
+						ipfw_dyn_dst->pcnt = p->pcnt;
+						ipfw_dyn_dst->bcnt = p->bcnt;
+						externalize_flow_id(&ipfw_dyn_dst->id, &p->id);
+						ipfw_dyn_dst->expire =
+							TIME_LEQ(p->expire, timenow.tv_sec) ?
+							0 : p->expire - timenow.tv_sec;
+						ipfw_dyn_dst->bucket = p->bucket;
+						ipfw_dyn_dst->state = p->state;
+						ipfw_dyn_dst->ack_fwd = p->ack_fwd;
+						ipfw_dyn_dst->ack_rev = p->ack_rev;
+						ipfw_dyn_dst->dyn_type = p->dyn_type;
+						ipfw_dyn_dst->count = p->count;
+						last = (char*)&ipfw_dyn_dst->next;
+					} else {
+						ipfw_dyn_rule_32	*ipfw_dyn_dst;
+						
+						ipfw_dyn_dst = (ipfw_dyn_rule_32 *)dst;
+						/*
+						 * store a non-null value in "next".
+						 * The userland code will interpret a
+						 * NULL here as a marker
+						 * for the last dynamic rule.
+						 */
+						ipfw_dyn_dst->next = CAST_DOWN_EXPLICIT(user32_addr_t, dst);
+						ipfw_dyn_dst->rule = p->rule->rulenum;
+						ipfw_dyn_dst->parent = CAST_DOWN_EXPLICIT(user32_addr_t, p->parent);
+						ipfw_dyn_dst->pcnt = p->pcnt;
+						ipfw_dyn_dst->bcnt = p->bcnt;
+						externalize_flow_id(&ipfw_dyn_dst->id, &p->id);
+						ipfw_dyn_dst->expire =
+							TIME_LEQ(p->expire, timenow.tv_sec) ?
+							0 : p->expire - timenow.tv_sec;
+						ipfw_dyn_dst->bucket = p->bucket;
+						ipfw_dyn_dst->state = p->state;
+						ipfw_dyn_dst->ack_fwd = p->ack_fwd;
+						ipfw_dyn_dst->ack_rev = p->ack_rev;
+						ipfw_dyn_dst->dyn_type = p->dyn_type;
+						ipfw_dyn_dst->count = p->count;
+						last = (char*)&ipfw_dyn_dst->next;
+					}
 				}
 			if (last != NULL) /* mark last dynamic rule */
-				bzero(&last->next, sizeof(last));
+				bzero(last, sizeof(last));
 		}
 		lck_mtx_unlock(ipfw_mutex);
 
@@ -2956,7 +3660,7 @@ ipfw_ctl(struct sockopt *sopt)
 				for (i = 0; i < static_count; i++) {
 					/* static rules have different sizes */
 					int j = RULESIZE(bp);
-					ipfw_convert_from_latest(bp, rule_vers0, api_version);
+					ipfw_convert_from_latest(bp, rule_vers0, api_version, is64user);
 					bp = (struct ip_fw *)((char *)bp + j);
 					len += sizeof(*rule_vers0);
 					rule_vers0++;
@@ -2967,63 +3671,56 @@ ipfw_ctl(struct sockopt *sopt)
 			}
 		} else if (api_version == IP_FW_VERSION_1) {
 			int	i, len = 0, buf_size;
-			struct ip_fw_compat	*buf2, *rule_vers1;
-			struct ipfw_dyn_rule_compat	*dyn_rule_vers1, *dyn_last = NULL;
-			ipfw_dyn_rule 	*p;
+			struct ip_fw_compat	*buf2;
+			size_t	ipfwcompsize;
+			size_t	ipfwdyncompsize;
+			char	*rule_vers1;
 
 			lck_mtx_lock(ipfw_mutex);
-			buf_size = static_count * sizeof(struct ip_fw_compat) +
-						dyn_count * sizeof(struct ipfw_dyn_rule_compat);
+			if ( is64user ){
+				ipfwcompsize = sizeof(struct ip_fw_compat_64);
+				ipfwdyncompsize = sizeof(struct ipfw_dyn_rule_compat_64);
+			} else {
+				ipfwcompsize = sizeof(struct ip_fw_compat_32);
+				ipfwdyncompsize = sizeof(struct ipfw_dyn_rule_compat_32);
+			}
+				
+			buf_size = static_count * ipfwcompsize + 
+						dyn_count * ipfwdyncompsize;
 						
 			buf2 = _MALLOC(buf_size, M_TEMP, M_WAITOK);
 			if (buf2 == 0) {
 				lck_mtx_unlock(ipfw_mutex);
 				error = ENOBUFS;
 			}
-			
 			if (!error) {
 				bp = buf;
-				rule_vers1 = buf2;
+				rule_vers1 = (char*)buf2;
 				
 				/* first do static rules */
 				for (i = 0; i < static_count; i++) {
 					/* static rules have different sizes */
-					int j = RULESIZE(bp);
-					ipfw_convert_from_latest(bp, rule_vers1, api_version);
-					bp = (struct ip_fw *)((char *)bp + j);
-					len += sizeof(*rule_vers1);
-					rule_vers1++;
-				}
-			
-				/* now do dynamic rules */
-				dyn_rule_vers1 = (struct ipfw_dyn_rule_compat *)rule_vers1;
-				if (ipfw_dyn_v) {
-					for (i = 0; i < curr_dyn_buckets; i++) {
-						for ( p = ipfw_dyn_v[i] ; p != NULL ; p = p->next) {
-							(int) dyn_rule_vers1->chain = p->rule->rulenum;
-							dyn_rule_vers1->id = p->id;
-							dyn_rule_vers1->mask = p->id;
-							dyn_rule_vers1->type = p->dyn_type;
-							dyn_rule_vers1->expire = p->expire;
-							dyn_rule_vers1->pcnt = p->pcnt;
-							dyn_rule_vers1->bcnt = p->bcnt;
-							dyn_rule_vers1->bucket = p->bucket;
-							dyn_rule_vers1->state = p->state;
-							
-							dyn_rule_vers1->next = dyn_rule_vers1;
-							dyn_last = dyn_rule_vers1;
-							
-							len += sizeof(*dyn_rule_vers1);
-							dyn_rule_vers1++;
-						}
-					}
-					
-					if (dyn_last != NULL) {
-						dyn_last->next = NULL;
+					if ( is64user ){
+						int rulesize_64;
+						ipfw_convert_from_latest(bp, (void *)rule_vers1, api_version, is64user);
+						rulesize_64 = sizeof(struct ip_fw_64) + ((struct ip_fw_64 *)(bp))->cmd_len * 4 - 4;
+						bp = (struct ip_fw *)((char *)bp + rulesize_64);
+					}else {
+						int rulesize_32;
+						ipfw_convert_from_latest(bp, (void *)rule_vers1, api_version, is64user);
+						rulesize_32 = sizeof(struct ip_fw_32) + ((struct ip_fw_32 *)(bp))->cmd_len * 4 - 4;
+						bp = (struct ip_fw *)((char *)bp + rulesize_32);
 					}
+					len += ipfwcompsize;
+					rule_vers1 += ipfwcompsize;
 				}
+				/* now do dynamic rules */
+				if ( is64user )
+					cp_dyn_to_comp_64( (struct ipfw_dyn_rule_compat_64 *)rule_vers1, &len);
+				else 
+					cp_dyn_to_comp_32( (struct ipfw_dyn_rule_compat_32 *)rule_vers1, &len);
+
 				lck_mtx_unlock(ipfw_mutex);
-				
 				error = sooptcopyout(sopt, buf2, len);
 				_FREE(buf2, M_TEMP);
 			}
@@ -3033,7 +3730,8 @@ ipfw_ctl(struct sockopt *sopt)
 		
 		_FREE(buf, M_TEMP);
 		break;
-
+	}
+	
 	case IP_FW_FLUSH:
 		/*
 		 * Normally we cannot release the lock on each iteration.
@@ -3050,6 +3748,7 @@ ipfw_ctl(struct sockopt *sopt)
 
 		lck_mtx_lock(ipfw_mutex);
 		free_chain(&layer3_chain, 0 /* keep default rule */);
+		fw_bypass = 1;
 #if DEBUG_INACTIVE_RULES
 			print_chain(&layer3_chain);
 #endif
@@ -3057,6 +3756,8 @@ ipfw_ctl(struct sockopt *sopt)
 		break;
 
 	case IP_FW_ADD:
+	{
+		size_t savedsopt_valsize=0;
 		rule = _MALLOC(RULE_MAXSIZE, M_TEMP, M_WAITOK);
 		if (rule == 0) {
 			error = ENOBUFS;
@@ -3066,11 +3767,12 @@ ipfw_ctl(struct sockopt *sopt)
 		bzero(rule, RULE_MAXSIZE);
 
 		if (api_version != IP_FW_CURRENT_API_VERSION) {
-			error = ipfw_convert_to_latest(sopt, rule, api_version);
+			error = ipfw_convert_to_latest(sopt, rule, api_version, is64user);
 		}
 		else {
-			error = sooptcopyin(sopt, rule, RULE_MAXSIZE,
-				sizeof(struct ip_fw) );
+			savedsopt_valsize = sopt->sopt_valsize;   /* it might get modified in sooptcopyin_fw */
+			error = sooptcopyin_fw( sopt, rule, &rulesize); 
+
 		}
 		
 		if (!error) {
@@ -3079,11 +3781,14 @@ ipfw_ctl(struct sockopt *sopt)
 				 * adjust sopt_valsize to match what would be expected.
 				 */
 				sopt->sopt_valsize = RULESIZE(rule);
+				rulesize = RULESIZE(rule);
 			}
-			error = check_ipfw_struct(rule, sopt->sopt_valsize);
+			error = check_ipfw_struct(rule, rulesize);
 			if (!error) {
 				lck_mtx_lock(ipfw_mutex);
 				error = add_rule(&layer3_chain, rule);
+				if (!error && fw_bypass)
+					fw_bypass = 0;
 				lck_mtx_unlock(ipfw_mutex);
 				
 				size = RULESIZE(rule);
@@ -3092,19 +3797,30 @@ ipfw_ctl(struct sockopt *sopt)
 					if (api_version == IP_FW_VERSION_0) {
 						struct ip_old_fw	rule_vers0;
 						
-						ipfw_convert_from_latest(rule, &rule_vers0, api_version);
+						ipfw_convert_from_latest(rule, &rule_vers0, api_version, is64user);
 						sopt->sopt_valsize = sizeof(struct ip_old_fw);
 						
 						error = sooptcopyout(sopt, &rule_vers0, sizeof(struct ip_old_fw));
 					} else if (api_version == IP_FW_VERSION_1) {
 						struct ip_fw_compat	rule_vers1;
-		
-						ipfw_convert_from_latest(rule, &rule_vers1, api_version);
+						ipfw_convert_from_latest(rule, &rule_vers1, api_version, is64user);
 						sopt->sopt_valsize = sizeof(struct ip_fw_compat);
 						
 						error = sooptcopyout(sopt, &rule_vers1, sizeof(struct ip_fw_compat));
 					} else {
-						error = sooptcopyout(sopt, rule, size);
+						char *userrule;
+						userrule = _MALLOC(savedsopt_valsize, M_TEMP, M_WAITOK);
+						if ( userrule == NULL )
+							userrule = (char*)rule;
+						if (proc_is64bit(sopt->sopt_p)){
+							copyto64fw( rule, (struct ip_fw_64*)userrule, savedsopt_valsize);
+						}
+						else {
+								copyto32fw( rule, (struct ip_fw_32*)userrule, savedsopt_valsize);
+						}
+						error = sooptcopyout(sopt, userrule, savedsopt_valsize);
+						if ( userrule )
+							_FREE(userrule, M_TEMP);
 					}
 				}
 			}
@@ -3112,7 +3828,7 @@ ipfw_ctl(struct sockopt *sopt)
 		
 		_FREE(rule, M_TEMP);
 		break;
-
+	}
 	case IP_FW_DEL:
 	{
 		/*
@@ -3134,11 +3850,10 @@ ipfw_ctl(struct sockopt *sopt)
 		
 		bzero(&temp_rule, sizeof(struct ip_fw));
 		if (api_version != IP_FW_CURRENT_API_VERSION) {
-			error = ipfw_convert_to_latest(sopt, &temp_rule, api_version);
+			error = ipfw_convert_to_latest(sopt, &temp_rule, api_version, is64user);
 		}
 		else {
-			error = sooptcopyin(sopt, &temp_rule, sizeof(struct ip_fw),
-				sizeof(struct ip_fw) );
+			error = sooptcopyin_fw(sopt, &temp_rule, 0 );
 		}
 
 		if (!error) {
@@ -3171,7 +3886,9 @@ ipfw_ctl(struct sockopt *sopt)
 					(set_disable | temp_rule.set_masks[0]) & ~temp_rule.set_masks[1] &
 					~(1<<RESVD_SET); /* set RESVD_SET always enabled */
 			}
-						
+			
+			if (!layer3_chain->next)
+				fw_bypass = 1;
 			lck_mtx_unlock(ipfw_mutex);
 		}
 		break;
@@ -3182,15 +3899,16 @@ ipfw_ctl(struct sockopt *sopt)
 		/* there is only a simple rule passed in
 		 * (no cmds), so use a temp struct to copy
 		 */
-		struct ip_fw	temp_rule = { 0 };
+		struct ip_fw temp_rule;
+		
+		bzero(&temp_rule, sizeof(struct ip_fw));
 		
 		if (api_version != IP_FW_CURRENT_API_VERSION) {
-			error = ipfw_convert_to_latest(sopt, &temp_rule, api_version);
+			error = ipfw_convert_to_latest(sopt, &temp_rule, api_version, is64user);
 		}
 		else {
 			if (sopt->sopt_val != 0) {
-				error = sooptcopyin(sopt, &temp_rule, sizeof(struct ip_fw),
-					sizeof(struct ip_fw) );
+				error = sooptcopyin_fw( sopt, &temp_rule, 0); 
 			}
 		}
 
@@ -3206,6 +3924,26 @@ ipfw_ctl(struct sockopt *sopt)
 		error = EINVAL;
 	}
 
+	if (error != EINVAL) {
+		switch (command) {
+			case IP_FW_ADD:
+			case IP_OLD_FW_ADD:
+				ipfw_kev_post_msg(KEV_IPFW_ADD);
+				break;
+			case IP_OLD_FW_DEL:
+			case IP_FW_DEL:
+				ipfw_kev_post_msg(KEV_IPFW_DEL);
+				break;
+			case IP_FW_FLUSH:
+			case IP_OLD_FW_FLUSH:
+				ipfw_kev_post_msg(KEV_IPFW_FLUSH);
+				break;
+
+			default:
+				break;
+		}
+	}
+
 	return (error);
 }
 
@@ -3223,19 +3961,35 @@ struct ip_fw *ip_fw_default_rule;
  * every dyn_keepalive_period
  */
 static void
-ipfw_tick(void * __unused unused)
+ipfw_tick(__unused void * unused)
 {
+	struct mbuf *m0, *m, *mnext, **mtailp;
 	int i;
-	int s;
 	ipfw_dyn_rule *q;
 	struct timeval timenow;
+	static int stealth_cnt = 0;
 
+	if (ipfw_stealth_stats_needs_flush) {
+	    stealth_cnt++;
+	    if (!(stealth_cnt % IPFW_STEALTH_TIMEOUT_FREQUENCY)) {
+	        ipfw_stealth_flush_stats();
+	    }
+	}
 
 	if (dyn_keepalive == 0 || ipfw_dyn_v == NULL || dyn_count == 0)
 		goto done;
 
 	getmicrotime(&timenow);
 
+	/*
+	 * We make a chain of packets to go out here -- not deferring
+	 * until after we drop the ipfw lock would result
+	 * in a lock order reversal with the normal packet input -> ipfw
+	 * call stack.
+	 */
+	m0 = NULL;
+	mtailp = &m0;
+	
 	lck_mtx_lock(ipfw_mutex);
 	for (i = 0 ; i < curr_dyn_buckets ; i++) {
 		for (q = ipfw_dyn_v[i] ; q ; q = q->next ) {
@@ -3251,13 +4005,29 @@ ipfw_tick(void * __unused unused)
 			if (TIME_LEQ(q->expire, timenow.tv_sec))
 				continue;	/* too late, rule expired */
 
-			send_pkt(&(q->id), q->ack_rev - 1, q->ack_fwd, TH_SYN);
-			send_pkt(&(q->id), q->ack_fwd - 1, q->ack_rev, 0);
+			*mtailp = send_pkt(&(q->id), q->ack_rev - 1, q->ack_fwd, TH_SYN);
+			if (*mtailp != NULL)
+				mtailp = &(*mtailp)->m_nextpkt;
+
+			*mtailp = send_pkt(&(q->id), q->ack_fwd - 1, q->ack_rev, 0);
+			if (*mtailp != NULL)
+				mtailp = &(*mtailp)->m_nextpkt;
 		}
 	}
 	lck_mtx_unlock(ipfw_mutex);
+
+	for (m = mnext = m0; m != NULL; m = mnext) {
+		struct route sro;	/* fake route */
+
+		mnext = m->m_nextpkt;
+		m->m_nextpkt = NULL;
+		bzero (&sro, sizeof (sro));
+		ip_output(m, NULL, &sro, 0, NULL, NULL);
+		ROUTE_RELEASE(&sro);
+	}
 done:
-	timeout(ipfw_tick, NULL, dyn_keepalive_period*hz);
+	timeout_with_leeway(ipfw_tick, NULL, dyn_keepalive_period*hz,
+	    DYN_KEEPALIVE_LEEWAY*hz);
 }
 
 void
@@ -3269,11 +4039,7 @@ ipfw_init(void)
 	ipfw_mutex_grp_attr = lck_grp_attr_alloc_init();
 	ipfw_mutex_grp = lck_grp_alloc_init("ipfw", ipfw_mutex_grp_attr);
 	ipfw_mutex_attr = lck_attr_alloc_init();
-
-	if ((ipfw_mutex = lck_mtx_alloc_init(ipfw_mutex_grp, ipfw_mutex_attr)) == NULL) {
-		printf("ipfw_init: can't alloc ipfw_mutex\n");
-		return;
-	}
+	lck_mtx_init(ipfw_mutex, ipfw_mutex_grp, ipfw_mutex_attr);
 
 	layer3_chain = NULL;
 
@@ -3287,7 +4053,7 @@ ipfw_init(void)
 	default_rule.cmd[0].len = 1;
 	default_rule.cmd[0].opcode =
 #ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
-				1 ? O_ACCEPT :
+				(1) ? O_ACCEPT :
 #endif
 				O_DENY;
 
@@ -3298,17 +4064,6 @@ ipfw_init(void)
 	}
 	else {
 		ip_fw_default_rule = layer3_chain;
-#if 0
-		/* Radar 3920649, don't print unncessary messages to the log */
-		printf("ipfw2 initialized, divert %s, "
-			"rule-based forwarding enabled, default to %s, logging ",
-	#ifdef IPDIVERT
-			"enabled",
-	#else
-			"disabled",
-	#endif
-			default_rule.cmd[0].opcode == O_ACCEPT ? "accept" : "deny");
-#endif
 	
 	#ifdef IPFIREWALL_VERBOSE
 		fw_verbose = 1;
@@ -3316,13 +4071,13 @@ ipfw_init(void)
 	#ifdef IPFIREWALL_VERBOSE_LIMIT
 		verbose_limit = IPFIREWALL_VERBOSE_LIMIT;
 	#endif
-		if (fw_verbose == 0)
-			printf("disabled\n");
-		else if (verbose_limit == 0)
-			printf("unlimited\n");
-		else
-			printf("limited to %d packets/entry by default\n",
-				verbose_limit);
+		if (fw_verbose) {
+			if (!verbose_limit)
+				printf("ipfw2 verbose logging enabled: unlimited logging by default\n");
+			else
+				printf("ipfw2 verbose logging enabled: limited to %d packets/entry by default\n",
+					verbose_limit);
+		}
 	}
 
 	ip_fw_chk_ptr = ipfw_chk;
@@ -3334,3 +4089,4 @@ ipfw_init(void)
 }
 
 #endif /* IPFW2 */
+