From From Carles Kishimoto <[email protected]>:

  add support for per-VLAN spanning tree and
                  per-VLAN rapid spanning tree

diff --git a/llc.h b/llc.h
index 882b80cea67f91cab9151eda1db2e9a52d93fa0f..faa72561c9a972ce9be2e42c3389132db5eb7bd8 100644 (file)
--- 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.22 2007-03-19 15:14:14 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/llc.h,v 1.23 2007-04-13 09:43:11 hannes Exp $ (LBL)
  */
 
 /*
@@ -105,6 +105,7 @@
 #define        PID_CISCO_VTP           0x2003  /* Cisco VLAN Trunk Protocol */
 #define        PID_CISCO_DTP           0x2004  /* Cisco Dynamic Trunk Protocol */
 #define        PID_CISCO_UDLD          0x0111  /* Unidirectional Link Detection */
+#define        PID_CISCO_PVST          0x010b  /* Per VLAN Spanning Tree+ and RPVST+ */
 
 /*
  * PIDs for use with OUI_RFC2684.

diff --git a/print-llc.c b/print-llc.c
index 8dc88b277fc20173691050ee0b30b44053089e83..0c8259fbb6b8a3b38ba1405cf28c515e33de8119 100644 (file)
--- 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.74 2007-03-23 08:12:00 hannes Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.75 2007-04-13 09:43:11 hannes Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -106,6 +106,7 @@ static const struct tok cisco_values[] = {
        { PID_CISCO_VTP, "VTP" },
        { PID_CISCO_DTP, "DTP" },
        { PID_CISCO_UDLD, "UDLD" },
+       { PID_CISCO_PVST, "PVST" },
        { 0,             NULL }
 };
 
@@ -455,6 +456,9 @@ snap_print(const u_char *p, u_int length, u_int caplen,
                 case PID_CISCO_VTP:
                         vtp_print(p, length);
                         return (1);
+                case PID_CISCO_PVST:
+                        stp_print(p, length);
+                        return (1);
                 default:
                         break;
                 }