Sync with the new ipfw3 version.

[ipfw.git] / dummynet2 / ip_fw_log.c

diff --git a/dummynet2/ip_fw_log.c b/dummynet2/ip_fw_log.c
index 1bc1216..2babbcb 100644 (file)
--- a/dummynet2/ip_fw_log.c
+++ b/dummynet2/ip_fw_log.c
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD: head/sys/netinet/ipfw/ip_fw_log.c 200601 2009-12-16 10:48:40
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
+#include <netinet/ip_var.h>
 #include <netinet/ip_fw.h>
 #include <netinet/ipfw/ip_fw_private.h>
 #include <netinet/tcp_var.h>
@@ -394,7 +395,7 @@ ipfw_log(struct ip_fw *f, u_int hlen, struct ip_fw_args *args,
                        if (offset & (IP6F_OFF_MASK | IP6F_MORE_FRAG))
                                snprintf(SNPARGS(fragment, 0),
                                    " (frag %08x:%d@%d%s)",
-                                   args->f_id.frag_id6,
+                                   args->f_id.extra,
                                    ntohs(ip6->ip6_plen) - hlen,
                                    ntohs(offset & IP6F_OFF_MASK) << 3,
                                    (offset & IP6F_MORE_FRAG) ? "+" : "");
@@ -412,7 +413,7 @@ ipfw_log(struct ip_fw *f, u_int hlen, struct ip_fw_args *args,
                                    (ipoff & IP_MF) ? "+" : "");
                }
        }
-#ifndef __linux__
+#ifdef __FreeBSD__
        if (oif || m->m_pkthdr.rcvif)
                log(LOG_SECURITY | LOG_INFO,
                    "ipfw: %d %s %s %s via %s%s\n",