From: guy <guy>
Date: Wed, 17 Mar 2004 19:47:47 +0000 (+0000)
Subject: Add support for Apple's IP-over-IEEE 1394 encapsulation.
X-Git-Tag: tcpdump-3.8.2~28
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/233f4c20af017634d373bd3cdbd5b1139469ced6

Add support for Apple's IP-over-IEEE 1394 encapsulation.
---

diff --git a/FILES b/FILES
index c9e10f12..0b868170 100644
--- a/FILES
+++ b/FILES
@@ -92,6 +92,7 @@ parsenfsfh.c
 pcap-missing.h
 ppp.h
 print-802_11.c
+print-ap1394.c
 print-ah.c
 print-aodv.c
 print-arcnet.c
diff --git a/INSTALL b/INSTALL
index 17a458c0..0e24e347 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-@(#) $Header: /tcpdump/master/tcpdump/Attic/INSTALL,v 1.56.2.2 2003-12-15 02:44:06 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/tcpdump/Attic/INSTALL,v 1.56.2.3 2004-03-17 19:47:47 guy Exp $ (LBL)
 
 If you have not built libpcap, do so first.  See the README
 file in this directory for the ftp location.
@@ -114,6 +114,7 @@ parsenfsfh.c	- Network File System file parser routines
 pcap-missing.h	- declarations of functions possibly missing from libpcap
 ppp.h		- Point to Point Protocol definitions
 print-802_11.c	- IEEE 802.11 printer routines
+print-ap1394.c	- Apple IP-over-IEEE 1394 printer routines
 print-ah.c	- IPSEC Authentication Header printer routines
 print-aodv.c	- AODV printer routines
 print-arcnet.c	- ARCNET printer routines
diff --git a/Makefile.in b/Makefile.in
index 0fbcc03c..384b17e9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
-# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.276.2.2 2004-02-06 14:38:52 hannes Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.276.2.3 2004-03-17 19:47:47 guy Exp $ (LBL)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
@@ -66,8 +66,8 @@ INSTALL_DATA = @INSTALL_DATA@
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
 
 CSRC =	addrtoname.c gmpls.c gmt2local.c machdep.c oui.c parsenfsfh.c \
-	print-802_11.c print-ah.c print-arcnet.c print-aodv.c \
-	print-arp.c print-ascii.c print-atalk.c print-atm.c \
+	print-802_11.c print-ap1394.c print-ah.c print-arcnet.c \
+	print-aodv.c print-arp.c print-ascii.c print-atalk.c print-atm.c \
 	print-beep.c print-bfd.c print-bgp.c print-bootp.c print-cdp.c \
 	print-chdlc.c print-cip.c print-cnfp.c print-decnet.c \
 	print-domain.c print-dvmrp.c print-enc.c print-egp.c \
diff --git a/interface.h b/interface.h
index d04d1032..8b338143 100644
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.217.2.4 2003-12-29 22:42:21 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.217.2.5 2004-03-17 19:47:48 guy Exp $ (LBL)
  */
 
 #ifndef tcpdump_interface_h
@@ -222,8 +222,7 @@ extern u_int pflog_if_print(const struct pcap_pkthdr *, 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);
-extern u_int ether_if_print(const struct pcap_pkthdr *,
-	const u_char *);
+extern u_int ether_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int token_print(const u_char *, u_int, u_int);
 extern u_int token_if_print(const struct pcap_pkthdr *, const u_char *);
 extern void fddi_print(const u_char *, u_int, u_int);
@@ -232,6 +231,7 @@ extern u_int fr_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int ieee802_11_if_print(const struct pcap_pkthdr *, const u_char *);
 extern u_int ieee802_11_radio_if_print(const struct pcap_pkthdr *,
 	const u_char *);
+extern u_int ap1394_if_print(const struct pcap_pkthdr *, const u_char *);
 extern void gre_print(const u_char *, u_int);
 extern void icmp_print(const u_char *, u_int, const u_char *, int);
 extern void igmp_print(const u_char *, u_int);
diff --git a/tcpdump.c b/tcpdump.c
index 9d265353..1cb51300 100644
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] _U_ =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.216.2.9 2004-01-26 01:59:45 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.216.2.10 2004-03-17 19:47:48 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -205,6 +205,9 @@ static struct printer printers[] = {
 #endif
 #ifdef DLT_ENC
 	{ enc_if_print, 	DLT_ENC },
+#endif
+#ifdef DLT_APPLE_IP_OVER_IEEE1394
+	{ ap1394_if_print,	DLT_APPLE_IP_OVER_IEEE1394 },
 #endif
 	{ NULL,			0 },
 };