From: hannes <hannes>
Date: Tue, 19 Oct 2004 15:27:55 +0000 (+0000)
Subject: add PPP to the ISO nlpid printer
X-Git-Tag: tcpdump-3.9.1~257
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/6a0627fbadb35cce3cfb7800bd3f5177cd51e8f3

add PPP to the ISO nlpid printer
---

diff --git a/nlpid.c b/nlpid.c
index a2d6d245..47ebb535 100755
--- a/nlpid.c
+++ b/nlpid.c
@@ -15,7 +15,7 @@
 
 #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
@@ -38,6 +38,7 @@ struct tok nlpid_values[] = {
     { NLPID_IDRP, "IDRP" },
     { NLPID_MFR, "FRF.15" },
     { NLPID_IP, "IPv4" },
+    { NLPID_PPP, "PPP" },
     { NLPID_X25_ESIS, "X25 ES-IS" },
     { NLPID_IP6, "IPv6" },
     { 0, NULL }
diff --git a/nlpid.h b/nlpid.h
index d5b353de..31f6b66d 100644
--- 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
@@ -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_PPP       0xcf
 #define NLPID_X25_ESIS  0x8a
 #define NLPID_IP6       0x8e
diff --git a/print-isoclns.c b/print-isoclns.c
index c3eb4419..f134ed7a 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -26,7 +26,7 @@
 
 #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
@@ -528,6 +528,10 @@ void isoclns_print(const u_int8_t *p, u_int length, u_int caplen)
                 break;
 #endif
 
+        case NLPID_PPP:
+                ppp_print(p+1, length-1);
+                break;
+
 	default:
 		(void)printf(", length: %u", length);
 		if (caplen > 1)