support for decoding IS-IS inside Cisco HDLC Frames

diff --git a/ethertype.h b/ethertype.h
index fcfd3ec40a5bc991a14c0dd29d84403adfc9194b..f8deb31a6339233167138565c6aefc50c3b16e61 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.16 2001-06-21 17:56:02 itojun Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/ethertype.h,v 1.17 2002-09-11 22:15:16 hannes Exp $ (LBL)
  */
 
 /*
@@ -120,3 +120,6 @@
 #ifndef        ETHERTYPE_LOOPBACK
 #define        ETHERTYPE_LOOPBACK      0x9000
 #endif
+#ifndef        ETHERTYPE_ISO
+#define        ETHERTYPE_ISO           0xfefe  /* nonstandard - used in Cisco HDLC encapsulation */
+#endif

diff --git a/print-chdlc.c b/print-chdlc.c
index 7695b759df14a2b359cfcbfca43fa20f4b3c42c7..b8e7304869244bedcf77f1f9048fad4f91054312 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.15 2002-09-05 21:25:38 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-chdlc.c,v 1.16 2002-09-11 22:18:03 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -116,6 +116,9 @@ chdlc_print(register const u_char *p, u_int length, u_int caplen)
                chdlc_cdp_print((const u_char *)ip, length);
                break;
 #endif
+        case ETHERTYPE_ISO:
+                isoclns_print(p, length, length, NULL, NULL);
+                break;
        }
        if (xflag)
                default_print((const u_char *)ip, caplen - CHDLC_HDRLEN);