X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=dummynet2%2Fip_fw_log.c;fp=dummynet2%2Fip_fw_log.c;h=2babbcbcba3c5e205ae79618079fca5f1f0883a8;hb=40445faa1db58b90083115bc315d095e7eb2fe51;hp=1bc1216e0b528a09d92e1c08049748e988b6c0ff;hpb=fccf30d4bf6b00b317756a9ff9d2135b361d2599;p=ipfw.git

diff --git a/dummynet2/ip_fw_log.c b/dummynet2/ip_fw_log.c
index 1bc1216..2babbcb 100644
--- 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",