Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/tcpdump/dist apply our changes and add the pfsy...
details: https://anonhg.NetBSD.org/src/rev/c5167e2ac239
branches: trunk
changeset: 759282:c5167e2ac239
user: christos <christos%NetBSD.org@localhost>
date: Sun Dec 05 05:11:30 2010 +0000
description:
apply our changes and add the pfsync stuff.
diffstat:
external/bsd/tcpdump/dist/addrtoname.c | 5 +
external/bsd/tcpdump/dist/af.c | 5 +
external/bsd/tcpdump/dist/ah.h | 2 +-
external/bsd/tcpdump/dist/atime.awk | 2 +-
external/bsd/tcpdump/dist/bpf_dump.c | 5 +
external/bsd/tcpdump/dist/checksum.c | 5 +
external/bsd/tcpdump/dist/configure | 2 +-
external/bsd/tcpdump/dist/configure.in | 4 +-
external/bsd/tcpdump/dist/cpack.c | 3 -
external/bsd/tcpdump/dist/cpack.h | 3 -
external/bsd/tcpdump/dist/esp.h | 2 +-
external/bsd/tcpdump/dist/ether.h | 7 +-
external/bsd/tcpdump/dist/gmpls.c | 5 +
external/bsd/tcpdump/dist/gmt2local.c | 5 +
external/bsd/tcpdump/dist/icmp6.h | 6 +-
external/bsd/tcpdump/dist/ieee802_11_radio.h | 3 -
external/bsd/tcpdump/dist/interface.h | 2 +
external/bsd/tcpdump/dist/ip.h | 6 +-
external/bsd/tcpdump/dist/ip6.h | 6 +-
external/bsd/tcpdump/dist/ipproto.c | 8 +-
external/bsd/tcpdump/dist/ipproto.h | 6 +-
external/bsd/tcpdump/dist/l2vpn.c | 7 +-
external/bsd/tcpdump/dist/machdep.c | 5 +
external/bsd/tcpdump/dist/nameser.h | 6 +-
external/bsd/tcpdump/dist/nfs.h | 6 +-
external/bsd/tcpdump/dist/nlpid.c | 7 +-
external/bsd/tcpdump/dist/oui.c | 7 +-
external/bsd/tcpdump/dist/parsenfsfh.c | 5 +
external/bsd/tcpdump/dist/pcap_dump_ftell.c | 5 +
external/bsd/tcpdump/dist/pf.h | 78 ++++++
external/bsd/tcpdump/dist/pf_print_state.c | 329 +++++++++++++++++++++++++++
external/bsd/tcpdump/dist/print-802_11.c | 5 +
external/bsd/tcpdump/dist/print-ah.c | 7 +-
external/bsd/tcpdump/dist/print-aodv.c | 5 +
external/bsd/tcpdump/dist/print-ap1394.c | 5 +
external/bsd/tcpdump/dist/print-arcnet.c | 5 +
external/bsd/tcpdump/dist/print-arp.c | 5 +
external/bsd/tcpdump/dist/print-ascii.c | 14 +-
external/bsd/tcpdump/dist/print-atalk.c | 5 +
external/bsd/tcpdump/dist/print-atm.c | 5 +
external/bsd/tcpdump/dist/print-beep.c | 5 +
external/bsd/tcpdump/dist/print-bfd.c | 5 +
external/bsd/tcpdump/dist/print-bgp.c | 5 +
external/bsd/tcpdump/dist/print-bootp.c | 5 +
external/bsd/tcpdump/dist/print-bt.c | 5 +
external/bsd/tcpdump/dist/print-cdp.c | 5 +
external/bsd/tcpdump/dist/print-cfm.c | 5 +
external/bsd/tcpdump/dist/print-chdlc.c | 5 +
external/bsd/tcpdump/dist/print-cip.c | 5 +
external/bsd/tcpdump/dist/print-cnfp.c | 10 +-
external/bsd/tcpdump/dist/print-dccp.c | 5 +
external/bsd/tcpdump/dist/print-decnet.c | 5 +
external/bsd/tcpdump/dist/print-dhcp6.c | 5 +
external/bsd/tcpdump/dist/print-domain.c | 5 +
external/bsd/tcpdump/dist/print-dvmrp.c | 5 +
external/bsd/tcpdump/dist/print-eap.c | 5 +
external/bsd/tcpdump/dist/print-egp.c | 5 +
external/bsd/tcpdump/dist/print-eigrp.c | 5 +
external/bsd/tcpdump/dist/print-enc.c | 5 +
external/bsd/tcpdump/dist/print-esp.c | 7 +-
external/bsd/tcpdump/dist/print-ether.c | 5 +
external/bsd/tcpdump/dist/print-fddi.c | 5 +
external/bsd/tcpdump/dist/print-fr.c | 5 +
external/bsd/tcpdump/dist/print-frag6.c | 5 +
external/bsd/tcpdump/dist/print-gre.c | 5 +
external/bsd/tcpdump/dist/print-hsrp.c | 5 +
external/bsd/tcpdump/dist/print-icmp.c | 5 +
external/bsd/tcpdump/dist/print-icmp6.c | 5 +
external/bsd/tcpdump/dist/print-igmp.c | 5 +
external/bsd/tcpdump/dist/print-igrp.c | 5 +
external/bsd/tcpdump/dist/print-ip.c | 9 +
external/bsd/tcpdump/dist/print-ip6.c | 5 +
external/bsd/tcpdump/dist/print-ip6opts.c | 5 +
external/bsd/tcpdump/dist/print-ipcomp.c | 5 +
external/bsd/tcpdump/dist/print-ipfc.c | 5 +
external/bsd/tcpdump/dist/print-ipx.c | 5 +
external/bsd/tcpdump/dist/print-isakmp.c | 5 +
external/bsd/tcpdump/dist/print-isoclns.c | 5 +
external/bsd/tcpdump/dist/print-juniper.c | 5 +-
external/bsd/tcpdump/dist/print-krb.c | 5 +
external/bsd/tcpdump/dist/print-l2tp.c | 5 +
external/bsd/tcpdump/dist/print-lane.c | 5 +
external/bsd/tcpdump/dist/print-ldp.c | 5 +
external/bsd/tcpdump/dist/print-llc.c | 5 +
external/bsd/tcpdump/dist/print-lldp.c | 5 +
external/bsd/tcpdump/dist/print-lmp.c | 5 +
external/bsd/tcpdump/dist/print-lspping.c | 5 +
external/bsd/tcpdump/dist/print-lwapp.c | 5 +
external/bsd/tcpdump/dist/print-lwres.c | 5 +
external/bsd/tcpdump/dist/print-mobile.c | 7 +-
external/bsd/tcpdump/dist/print-mobility.c | 5 +
external/bsd/tcpdump/dist/print-mpcp.c | 5 +
external/bsd/tcpdump/dist/print-mpls.c | 5 +
external/bsd/tcpdump/dist/print-msdp.c | 5 +
external/bsd/tcpdump/dist/print-netbios.c | 5 +
external/bsd/tcpdump/dist/print-nfs.c | 5 +
external/bsd/tcpdump/dist/print-ntp.c | 5 +
external/bsd/tcpdump/dist/print-null.c | 5 +
external/bsd/tcpdump/dist/print-ospf.c | 5 +
external/bsd/tcpdump/dist/print-ospf6.c | 5 +
external/bsd/tcpdump/dist/print-pflog.c | 5 +
external/bsd/tcpdump/dist/print-pfsync.c | 226 ++++++++++++++++++
external/bsd/tcpdump/dist/print-pgm.c | 5 +
external/bsd/tcpdump/dist/print-pim.c | 7 +-
external/bsd/tcpdump/dist/print-ppp.c | 5 +
external/bsd/tcpdump/dist/print-pppoe.c | 5 +
external/bsd/tcpdump/dist/print-pptp.c | 5 +
external/bsd/tcpdump/dist/print-radius.c | 5 +-
external/bsd/tcpdump/dist/print-raw.c | 5 +
external/bsd/tcpdump/dist/print-rip.c | 5 +
external/bsd/tcpdump/dist/print-ripng.c | 5 +
external/bsd/tcpdump/dist/print-rrcp.c | 5 +
external/bsd/tcpdump/dist/print-rsvp.c | 5 +
external/bsd/tcpdump/dist/print-rt6.c | 5 +
external/bsd/tcpdump/dist/print-rx.c | 5 +
external/bsd/tcpdump/dist/print-sctp.c | 7 +-
external/bsd/tcpdump/dist/print-sflow.c | 5 +
external/bsd/tcpdump/dist/print-sip.c | 5 +
external/bsd/tcpdump/dist/print-sl.c | 5 +
external/bsd/tcpdump/dist/print-sll.c | 5 +
external/bsd/tcpdump/dist/print-slow.c | 5 +
external/bsd/tcpdump/dist/print-smb.c | 8 +-
external/bsd/tcpdump/dist/print-snmp.c | 5 +
external/bsd/tcpdump/dist/print-stp.c | 5 +
external/bsd/tcpdump/dist/print-sunatm.c | 5 +
external/bsd/tcpdump/dist/print-sunrpc.c | 5 +
external/bsd/tcpdump/dist/print-symantec.c | 5 +
external/bsd/tcpdump/dist/print-syslog.c | 5 +
external/bsd/tcpdump/dist/print-tcp.c | 7 +-
external/bsd/tcpdump/dist/print-telnet.c | 14 +-
external/bsd/tcpdump/dist/print-tftp.c | 5 +
external/bsd/tcpdump/dist/print-timed.c | 5 +
external/bsd/tcpdump/dist/print-token.c | 5 +
external/bsd/tcpdump/dist/print-udp.c | 5 +
external/bsd/tcpdump/dist/print-vjc.c | 5 +
external/bsd/tcpdump/dist/print-vqp.c | 5 +
external/bsd/tcpdump/dist/print-vrrp.c | 5 +
external/bsd/tcpdump/dist/print-wb.c | 5 +
external/bsd/tcpdump/dist/print-zephyr.c | 7 +
external/bsd/tcpdump/dist/setsignal.c | 5 +
external/bsd/tcpdump/dist/signature.c | 5 +
external/bsd/tcpdump/dist/sll.h | 6 +-
external/bsd/tcpdump/dist/smbutil.c | 5 +
external/bsd/tcpdump/dist/strcasecmp.c | 5 +
external/bsd/tcpdump/dist/tcp.h | 6 +-
external/bsd/tcpdump/dist/tcpdump.1.in | 80 +++---
external/bsd/tcpdump/dist/tcpdump.c | 8 +
external/bsd/tcpdump/dist/telnet.h | 6 +-
external/bsd/tcpdump/dist/timed.h | 6 +-
external/bsd/tcpdump/dist/udp.h | 6 +-
external/bsd/tcpdump/dist/util.c | 5 +
external/bsd/tcpdump/dist/vfprintf.c | 5 +
152 files changed, 1351 insertions(+), 149 deletions(-)
diffs (truncated from 3563 to 300 lines):
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/addrtoname.c
--- a/external/bsd/tcpdump/dist/addrtoname.c Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/addrtoname.c Sun Dec 05 05:11:30 2010 +0000
@@ -21,9 +21,14 @@
* Internet, ethernet, port, and protocol string to address
* and address to string conversion routines
*/
+#include <sys/cdefs.h>
#ifndef lint
+#if 0
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/addrtoname.c,v 1.119 2007-08-08 14:06:34 hannes Exp (LBL)";
+#else
+__RCSID("$NetBSD: addrtoname.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+#endif
#endif
#ifdef HAVE_CONFIG_H
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/af.c
--- a/external/bsd/tcpdump/dist/af.c Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/af.c Sun Dec 05 05:11:30 2010 +0000
@@ -15,9 +15,14 @@
* Original code by Hannes Gredler (hannes%juniper.net@localhost)
*/
+#include <sys/cdefs.h>
#ifndef lint
+#if 0
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/af.c,v 1.3 2006-03-23 14:58:44 hannes Exp (LBL)";
+#else
+__RCSID("$NetBSD: af.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+#endif
#endif
#ifdef HAVE_CONFIG_H
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/ah.h
--- a/external/bsd/tcpdump/dist/ah.h Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/ah.h Sun Dec 05 05:11:30 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ah.h,v 1.1.1.1 2010/12/05 03:14:51 christos Exp $ */
+/* NetBSD: ah.h,v 1.12 2000/07/23 05:23:04 itojun Exp */
/* $KAME: ah.h,v 1.12 2000/07/20 17:41:01 itojun Exp $ */
/*
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/atime.awk
--- a/external/bsd/tcpdump/dist/atime.awk Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/atime.awk Sun Dec 05 05:11:30 2010 +0000
@@ -1,4 +1,4 @@
-$6 ~ /^ack/ && $5 !~ /[SFR]/ {
+$6 ~ /^ack/ && $5 !~ /[SFR]/ {
# given a tcpdump ftp trace, output one line for each ack
# in the form
# <ack time> <seq no>
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/bpf_dump.c
--- a/external/bsd/tcpdump/dist/bpf_dump.c Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/bpf_dump.c Sun Dec 05 05:11:30 2010 +0000
@@ -18,9 +18,14 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
#ifndef lint
+#if 0
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/bpf_dump.c,v 1.17 2008-02-14 20:53:49 guy Exp (LBL)";
+#else
+__RCSID("$NetBSD: bpf_dump.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+#endif
#endif
#ifdef HAVE_CONFIG_H
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/checksum.c
--- a/external/bsd/tcpdump/dist/checksum.c Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/checksum.c Sun Dec 05 05:11:30 2010 +0000
@@ -17,9 +17,14 @@
* Original code by Hannes Gredler (hannes%juniper.net@localhost)
*/
+#include <sys/cdefs.h>
#ifndef lint
+#if 0
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/checksum.c,v 1.4 2006-09-25 09:23:32 hannes Exp";
+#else
+__RCSID("$NetBSD: checksum.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+#endif
#endif
#ifdef HAVE_CONFIG_H
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/configure
--- a/external/bsd/tcpdump/dist/configure Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/configure Sun Dec 05 05:11:30 2010 +0000
@@ -11779,7 +11779,7 @@
;;
esac
-if test -f /dev/bpf0 ; then
+if test -f /dev/bpf0 -o -f /dev/bpf; then
V_GROUP=bpf
fi
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/configure.in
--- a/external/bsd/tcpdump/dist/configure.in Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/configure.in Sun Dec 05 05:11:30 2010 +0000
@@ -15,7 +15,7 @@
# config.sub.
#
-AC_REVISION($Revision: 1.1.1.1 $)
+AC_REVISION($Revision: 1.2 $)
AC_PREREQ(2.50)
AC_INIT(tcpdump.c)
@@ -845,7 +845,7 @@
;;
esac
-if test -f /dev/bpf0 ; then
+if test -f /dev/bpf -o -f /dev/bpf0; then
V_GROUP=bpf
fi
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/cpack.c
--- a/external/bsd/tcpdump/dist/cpack.c Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/cpack.c Sun Dec 05 05:11:30 2010 +0000
@@ -9,9 +9,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of David Young may not be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
*
* THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/cpack.h
--- a/external/bsd/tcpdump/dist/cpack.h Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/cpack.h Sun Dec 05 05:11:30 2010 +0000
@@ -9,9 +9,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of David Young may not be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
*
* THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/esp.h
--- a/external/bsd/tcpdump/dist/esp.h Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/esp.h Sun Dec 05 05:11:30 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.h,v 1.1.1.1 2010/12/05 03:15:01 christos Exp $ */
+/* NetBSD: esp.h,v 1.13 2000/09/26 08:37:38 itojun Exp */
/* $KAME: esp.h,v 1.15 2000/09/20 18:15:22 itojun Exp $ */
/*
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/ether.h
--- a/external/bsd/tcpdump/dist/ether.h Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/ether.h Sun Dec 05 05:11:30 2010 +0000
@@ -1,4 +1,3 @@
-/* @(#) Header: /tcpdump/master/tcpdump/ether.h,v 1.8 2002-12-11 07:13:51 guy Exp (LBL) */
/*
* Copyright (c) 1982, 1986, 1993
* The Regents of the University of California. All rights reserved.
@@ -11,11 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/gmpls.c
--- a/external/bsd/tcpdump/dist/gmpls.c Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/gmpls.c Sun Dec 05 05:11:30 2010 +0000
@@ -13,9 +13,14 @@
* Original code by Hannes Gredler (hannes%juniper.net@localhost)
*/
+#include <sys/cdefs.h>
#ifndef lint
+#if 0
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/gmpls.c,v 1.7 2006-04-14 07:11:59 hannes Exp (LBL)";
+#else
+__RCSID("$NetBSD: gmpls.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+#endif
#endif
#ifdef HAVE_CONFIG_H
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/gmt2local.c
--- a/external/bsd/tcpdump/dist/gmt2local.c Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/gmt2local.c Sun Dec 05 05:11:30 2010 +0000
@@ -19,9 +19,14 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <sys/cdefs.h>
#ifndef lint
+#if 0
static const char rcsid[] _U_ =
"@(#) Header: /tcpdump/master/tcpdump/gmt2local.c,v 1.9 2003-11-16 09:36:09 guy Exp (LBL)";
+#else
+__RCSID("$NetBSD: gmt2local.c,v 1.2 2010/12/05 05:11:30 christos Exp $");
+#endif
#endif
#ifdef HAVE_CONFIG_H
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/icmp6.h
--- a/external/bsd/tcpdump/dist/icmp6.h Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/icmp6.h Sun Dec 05 05:11:30 2010 +0000
@@ -43,11 +43,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/ieee802_11_radio.h
--- a/external/bsd/tcpdump/dist/ieee802_11_radio.h Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/ieee802_11_radio.h Sun Dec 05 05:11:30 2010 +0000
@@ -13,9 +13,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of David Young may not be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
*
* THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/interface.h
--- a/external/bsd/tcpdump/dist/interface.h Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/interface.h Sun Dec 05 05:11:30 2010 +0000
@@ -187,6 +187,8 @@
extern void egp_print(const u_char *, u_int);
extern u_int enc_if_print(const struct pcap_pkthdr *, const u_char *);
extern u_int pflog_if_print(const struct pcap_pkthdr *, const u_char *);
+extern u_int pfsync_if_print(const struct pcap_pkthdr *, const u_char *);
+extern void pfsync_ip_print(const u_char*, u_int, const u_char *);
extern u_int arcnet_if_print(const struct pcap_pkthdr *, const u_char *);
extern u_int arcnet_linux_if_print(const struct pcap_pkthdr *, const u_char *);
extern void ether_print(const u_char *, u_int, u_int,
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/ip.h
--- a/external/bsd/tcpdump/dist/ip.h Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/ip.h Sun Dec 05 05:11:30 2010 +0000
@@ -11,11 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/ip6.h
--- a/external/bsd/tcpdump/dist/ip6.h Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/ip6.h Sun Dec 05 05:11:30 2010 +0000
@@ -43,11 +43,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff -r b08d4dc38d01 -r c5167e2ac239 external/bsd/tcpdump/dist/ipproto.c
--- a/external/bsd/tcpdump/dist/ipproto.c Sun Dec 05 04:34:22 2010 +0000
+++ b/external/bsd/tcpdump/dist/ipproto.c Sun Dec 05 05:11:30 2010 +0000
@@ -1,4 +1,4 @@
-/*
+/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that: (1) source code
* distributions retain the above copyright notice and this paragraph
@@ -13,9 +13,14 @@
* Original code by Hannes Gredler (hannes%juniper.net@localhost)
*/
Home |
Main Index |
Thread Index |
Old Index