add PPP to the ISO nlpid printer

diff --git a/nlpid.c b/nlpid.c
index a2d6d24519124aab7e23b188067a74d7dfcee3de..47ebb5350493fc2108995a4164e35f7b507cc2bc 100755 (executable)
--- a/nlpid.c
+++ b/nlpid.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/nlpid.c,v 1.3 2004-10-18 12:09:20 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/nlpid.c,v 1.4 2004-10-19 15:27:55 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -38,6 +38,7 @@ struct tok nlpid_values[] = {
     { NLPID_IDRP, "IDRP" },
     { NLPID_MFR, "FRF.15" },
     { NLPID_IP, "IPv4" },
     { NLPID_IDRP, "IDRP" },
     { NLPID_MFR, "FRF.15" },
     { NLPID_IP, "IPv4" },

+    { NLPID_PPP, "PPP" },

     { NLPID_X25_ESIS, "X25 ES-IS" },
     { NLPID_IP6, "IPv6" },
     { 0, NULL }
     { NLPID_X25_ESIS, "X25 ES-IS" },
     { NLPID_IP6, "IPv6" },
     { 0, NULL }

diff --git a/nlpid.h b/nlpid.h
index d5b353de267d27488a21b4638a11c5ffd67a5fc3..31f6b66da6ba0fdf5346184e80ba11d38eb971d0 100644 (file)
--- a/nlpid.h
+++ b/nlpid.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nlpid.h,v 1.3 2004-10-18 12:09:20 hannes Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/nlpid.h,v 1.4 2004-10-19 15:27:55 hannes Exp $ (LBL) */

 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code


@@ -27,5 +27,6 @@ extern struct tok nlpid_values[];
 #define NLPID_IDRP      0x85
 #define NLPID_MFR       0xb1 /* FRF.15 */
 #define NLPID_IP        0xcc
 #define NLPID_IDRP      0x85
 #define NLPID_MFR       0xb1 /* FRF.15 */
 #define NLPID_IP        0xcc

+#define NLPID_PPP       0xcf

 #define NLPID_X25_ESIS  0x8a
 #define NLPID_IP6       0x8e
 #define NLPID_X25_ESIS  0x8a
 #define NLPID_IP6       0x8e

diff --git a/print-isoclns.c b/print-isoclns.c
index c3eb44191f9f1b5af44968a61870485477c7d86e..f134ed7ab52dcac6ae28fc688e60ab448cc66410 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.123 2004-10-18 12:34:36 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isoclns.c,v 1.124 2004-10-19 15:27:55 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -528,6 +528,10 @@ void isoclns_print(const u_int8_t *p, u_int length, u_int caplen)
                 break;
 #endif
 
                 break;
 #endif
 

+        case NLPID_PPP:
+                ppp_print(p+1, length-1);
+                break;
+

        default:
                (void)printf(", length: %u", length);
                if (caplen > 1)
        default:
                (void)printf(", length: %u", length);
                if (caplen > 1)