xnu-2422.1.72.tar.gz

[apple/xnu.git] / bsd / netinet / ip_fw2_compat.c

diff --git a/bsd/netinet/ip_fw2_compat.c b/bsd/netinet/ip_fw2_compat.c
index 766fa8fc860a924fa2432563fa0f472db17870ce..1022e03f1921c4fb453ad9338c586f8d547767f7 100644 (file)
--- a/bsd/netinet/ip_fw2_compat.c
+++ b/bsd/netinet/ip_fw2_compat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -1515,7 +1515,7 @@ ipfw_version_latest_to_one_32(struct ip_fw_32 *curr_rule, struct ip_fw_compat_32
        if (!rule_vers1)
                return;
                
-       bzero(rule_vers1, sizeof(struct ip_fw_compat));
+       bzero(rule_vers1, sizeof(struct ip_fw_compat_32));
        
        rule_vers1->version = IP_FW_VERSION_1;
        rule_vers1->context = CAST_DOWN_EXPLICIT(user32_addr_t,curr_rule->context);
@@ -1541,7 +1541,7 @@ ipfw_version_latest_to_one_64(struct ip_fw_64 *curr_rule, struct ip_fw_compat_64
        if (!rule_vers1)
                return;
                
-       bzero(rule_vers1, sizeof(struct ip_fw_compat));
+       bzero(rule_vers1, sizeof(struct ip_fw_compat_64));
        
        rule_vers1->version = IP_FW_VERSION_1;
        rule_vers1->context = CAST_DOWN_EXPLICIT(__uint64_t, curr_rule->context);
@@ -1592,7 +1592,7 @@ ipfw_version_latest_to_zero(struct ip_fw *curr_rule, struct ip_old_fw *rule_vers
                rule_vers0->pipe_ptr      = CAST_DOWN_EXPLICIT(void*, rule_vers1.pipe_ptr);
                rule_vers0->next_rule_ptr = CAST_DOWN_EXPLICIT(void*, rule_vers1.next_rule_ptr);
 
-               if (rule_vers1.fw_ipflg && IP_FW_IF_TCPEST_COMPAT) rule_vers0->fw_tcpf |= IP_OLD_FW_TCPF_ESTAB;
+               if (rule_vers1.fw_ipflg & IP_FW_IF_TCPEST_COMPAT) rule_vers0->fw_tcpf |= IP_OLD_FW_TCPF_ESTAB;
        }
        else {
                struct ip_fw_compat_32  rule_vers1;
@@ -1620,7 +1620,7 @@ ipfw_version_latest_to_zero(struct ip_fw *curr_rule, struct ip_old_fw *rule_vers
                rule_vers0->pipe_ptr      = CAST_DOWN_EXPLICIT(void*, rule_vers1.pipe_ptr);
                rule_vers0->next_rule_ptr = CAST_DOWN_EXPLICIT(void*, rule_vers1.next_rule_ptr);
 
-               if (rule_vers1.fw_ipflg && IP_FW_IF_TCPEST_COMPAT) rule_vers0->fw_tcpf |= IP_OLD_FW_TCPF_ESTAB;
+               if (rule_vers1.fw_ipflg & IP_FW_IF_TCPEST_COMPAT) rule_vers0->fw_tcpf |= IP_OLD_FW_TCPF_ESTAB;
        }
 
 }