From: guy <guy>
Date: Sun, 25 Nov 2001 02:01:47 +0000 (+0000)
Subject: From Heinz-Ado Arnolds <Ado.Arnolds@dhm-systems.de>: mark IPX packets
X-Git-Tag: tcpdump-3.7.1~24
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/13ccad293fd49be3faa45bf31b587f7a3efbc77d

From Heinz-Ado Arnolds <Ado.Arnolds@dhm-systems.de>: mark IPX packets
according to whether they're Ethernet II, 802.3, or 802.2.
---

diff --git a/CREDITS b/CREDITS
index ffc572d1..91a25c55 100644
--- a/CREDITS
+++ b/CREDITS
@@ -31,6 +31,7 @@ Additional people who have contributed patches:
 	Gisle Vanem			<gvanem@eunet.no>
 	Hannes Gredler			<hannes@juniper.net>
 	Harry Raaymakers		<harryr@connect.com.au>
+	Heinz-Ado Arnolds		<Ado.Arnolds@dhm-systems.de>
 	Hendrik Scholz			<hendrik@scholz.net>
 	Jakob Schlyter			<jakob@openbsd.org>
 	Jan Oravec			<wsx@wsx6.net>
diff --git a/print-ether.c b/print-ether.c
index f0b82f92..0bcd82d5 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.65 2001-07-04 22:03:14 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.66 2001-11-25 02:01:47 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -194,6 +194,7 @@ ether_encap_print(u_short ethertype, const u_char *p,
 		return (1);
 
 	case ETHERTYPE_IPX:
+		printf("(NOV-ETHII) ");
 		ipx_print(p, length);
 		return (1);
 
diff --git a/print-llc.c b/print-llc.c
index e161405e..da8a5132 100644
--- a/print-llc.c
+++ b/print-llc.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.43 2001-10-08 21:25:22 fenner Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.44 2001-11-25 02:01:48 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -96,6 +96,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
 		 * such as an 802.11 network; this has appeared in at
 		 * least one capture file.)
 		 */
+		printf("(NOV-802.3) ");
 		ipx_print(p, length);
 		return (1);
 	}
@@ -114,6 +115,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
 		 *
 		 * Skip DSAP, LSAP, and control field.
 		 */
+		printf("(NOV-802.2) ");
 		p += 3;
 		length -= 3;
 		caplen -= 3;