xnu-1228.9.59.tar.gz

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

diff --git a/bsd/netinet/ip_output.c b/bsd/netinet/ip_output.c
index c065797e73441f6bc823ffbbb070fb48abb4a16e..db39fe174d3ca7277baad8bd55a0b98a89bb8c62 100644 (file)
--- a/bsd/netinet/ip_output.c
+++ b/bsd/netinet/ip_output.c
@@ -249,7 +249,9 @@ ip_output_list(
 #if IPFIREWALL_FORWARD
        int fwd_rewrite_src = 0;
 #endif
+#if IPFIREWALL
        struct ip_fw_args args;
+#endif
        int didfilter = 0;
        ipfilter_t inject_filter_ref = 0;
        struct m_tag    *tag;
@@ -261,8 +263,8 @@ ip_output_list(
        KERNEL_DEBUG(DBG_FNC_IP_OUTPUT | DBG_FUNC_START, 0,0,0,0,0);
 
        packetlist = m0;
-       args.next_hop = NULL;
 #if IPFIREWALL
+       args.next_hop = NULL;
        args.eh = NULL;
        args.rule = NULL;
        args.divert_rule = 0;                   /* divert cookie */
@@ -297,7 +299,6 @@ ip_output_list(
                m_tag_delete(m0, tag);
        }
 #endif /* IPDIVERT */
-#endif /* IPFIREWALL */
 
        if ((tag = m_tag_locate(m0, KERNEL_MODULE_TAG_ID, KERNEL_TAG_TYPE_IPFORWARD, NULL)) != NULL) {
                struct ip_fwd_tag       *ipfwd_tag;
@@ -307,6 +308,7 @@ ip_output_list(
                
                m_tag_delete(m0, tag);
        }
+#endif /* IPFIREWALL */
 
        m = m0;
        
@@ -356,7 +358,11 @@ loopit:
                hlen = len;
        }
        ip = mtod(m, struct ip *);
+#if IPFIREWALL
        pkt_dst = args.next_hop ? args.next_hop->sin_addr : ip->ip_dst;
+#else
+       pkt_dst = ip->ip_dst;
+#endif
 
        /*
         * Fill in IP header.