add boundary, infinite loop checks

[tcpdump] / print-stp.c

diff --git a/print-stp.c b/print-stp.c
index 19e5c82da156044172b8c6765995fa9a8b3ab133..6ec2c097ce445a10c35564d03109593b782400f4 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -9,6 +9,10 @@
  * Contributed by Lennert Buytenhek <[email protected]>
  */
 
+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.14 2005-04-26 07:26:34 guy Exp $";
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -24,10 +28,6 @@
 #include "addrtoname.h"
 #include "extract.h"
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-stp.c,v 1.12 2003-11-15 00:39:41 guy Exp $";
-#endif
 static void
 stp_print_bridge_id(const u_char *p)
 {
@@ -39,23 +39,23 @@ static void
 stp_print_config_bpdu(const u_char *p)
 {
        printf("config ");
-       if (p[7] & 1)
+       if (p[4] & 1)
                printf("TOP_CHANGE ");
-       if (p[7] & 0x80)
+       if (p[4] & 0x80)
                printf("TOP_CHANGE_ACK ");
 
-       stp_print_bridge_id(p+20);
-       printf(".%.2x%.2x ", p[28], p[29]);
+       stp_print_bridge_id(p+17);
+       printf(".%.2x%.2x ", p[25], p[26]);
 
        printf("root ");
-       stp_print_bridge_id(p+8);
+       stp_print_bridge_id(p+5);
 
-       printf(" pathcost %i ", (p[16] << 24) | (p[17] << 16) | (p[18] << 8) | p[19]);
+       printf(" pathcost %i ", (p[13] << 24) | (p[14] << 16) | (p[15] << 8) | p[16]);
 
-       printf("age %i ", p[30]);
-       printf("max %i ", p[32]);
-       printf("hello %i ", p[34]);
-       printf("fdelay %i ", p[36]);
+       printf("age %i ", p[27]);
+       printf("max %i ", p[29]);
+       printf("hello %i ", p[31]);
+       printf("fdelay %i ", p[33]);
 }
 
 static void
@@ -70,16 +70,16 @@ stp_print_tcn_bpdu(void)
 void
 stp_print(const u_char *p, u_int length)
 {
-       if (length < 7)
+       if (length < 4)
                goto trunc;
 
        printf("802.1d ");
-       if (p[2] != 0x03 || p[3] || p[4] || p[5]) {
+       if (p[0] || p[1] || p[2]) {
                printf("unknown version");
                return;
        }
 
-       switch (p[6])
+       switch (p[3])
        {
        case 0x00:
                if (length < 10)
@@ -92,7 +92,7 @@ stp_print(const u_char *p, u_int length)
                break;
 
        default:
-               printf("unknown type %i", p[6]);
+               printf("unknown type %i", p[3]);
                break;
        }