From Heinz-Ado Arnolds <[email protected]>: mark IPX packets

according to whether they're Ethernet II, 802.3, or 802.2.

diff --git a/CREDITS b/CREDITS
index ffc572d1df766c797d2f51157847e4d1fdbc5a3c..91a25c55ed078918900a56bc2e62dfea9abed830 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -31,6 +31,7 @@ Additional people who have contributed patches:
        Gisle Vanem                     <[email protected]>
        Hannes Gredler                  <[email protected]>
        Harry Raaymakers                <[email protected]>
+       Heinz-Ado Arnolds               <[email protected]>
        Hendrik Scholz                  <[email protected]>
        Jakob Schlyter                  <[email protected]>
        Jan Oravec                      <[email protected]>

diff --git a/print-ether.c b/print-ether.c
index f0b82f92b3a5f80e72d0f678e9d52caa72567095..0bcd82d5f8ae77a1ddf154de3c7337c43bd137dc 100644 (file)
--- 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 e161405e961b28cd481acdf8760080271f29f1d5..da8a51324d596cc70a30058407b78e082fa044fd 100644 (file)
--- 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;