From: guy <guy>
Date: Thu, 8 Feb 2007 07:07:51 +0000 (+0000)
Subject: From Steinar Haug: print basic info about a few more Cisco LAN
X-Git-Tag: tcpdump-3.9.7~34
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/819c6562fe9128af77d5e732607b53e8d84f4de3

From Steinar Haug: print basic info about a few more Cisco LAN
protocols.
---

diff --git a/llc.h b/llc.h
index 688fed74..ffb38460 100644
--- a/llc.h
+++ b/llc.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.17.2.3 2005-12-01 17:48:25 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.17.2.4 2007-02-08 07:07:51 guy Exp $ (LBL)
  */
 
 /*
@@ -102,6 +102,8 @@
  * PIDs for use with OUI_CISCO.
  */
 #define	PID_CISCO_CDP		0x2000	/* Cisco Discovery Protocol */
+#define	PID_CISCO_VTP		0x2003	/* Cisco VLAN Trunk Protocol */
+#define	PID_CISCO_DTP		0x2004	/* Cisco Dynamic Trunk Protocol */
 
 /*
  * PIDs for use with OUI_RFC2684.
diff --git a/print-llc.c b/print-llc.c
index 3df4ba87..5186dd1a 100644
--- a/print-llc.c
+++ b/print-llc.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.61.2.9 2006-01-17 17:44:46 hannes Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.61.2.10 2007-02-08 07:07:51 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -103,6 +103,8 @@ static const struct tok llc_supervisory_values[] = {
 
 static const struct tok cisco_values[] = { 
 	{ PID_CISCO_CDP, "CDP" },
+	{ PID_CISCO_VTP, "VTP" },
+	{ PID_CISCO_DTP, "DTP" },
 	{ 0,             NULL }
 };