Added-bpduv4-test-files

diff --git a/print-stp.c b/print-stp.c
index c44bf000ed292e042bfdc17c11708fe8c9a74d72..db0f210e250196f9209218e06099868fc04e9a8e 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -210,7 +210,6 @@ stp_print_mstp_bpdu(const struct stp_bpdu_ *stp_bpdu, u_int length)
 {
     const u_char    *ptr;
     u_int16_t      v3len;
-    u_int16_t      v4len;
     u_int16_t      len;
     u_int16_t      msti;
     u_int16_t      offset;
@@ -290,7 +289,7 @@ stp_print_mstp_bpdu(const struct stp_bpdu_ *stp_bpdu, u_int length)
         }
     }
 
-    if (length != offset)
+    if ((length-offset) == SPB_BPDU_MIN_LEN)
     {
       printf("\n\tv4len: %d AUXMCID Name %s, Rev: %u, \n\t\tdigest %08x%08x%08x%08x",
               EXTRACT_16BITS (ptr + offset),

diff --git a/tests/TESTLIST b/tests/TESTLIST
index aedaade8b24e5fdc31799cab9fc6786456a90204..8d638ae81d4660a204f3608440cb36d90fc34b21 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -71,6 +71,9 @@ icmpv6          icmpv6.pcap             icmpv6.out      -t -vv -c1
 # SPB tests
 spb                spb.pcap                spb.out -t
 
+# SPB BPDUv4 tests
+spb_bpduv4      spb_bpduv4.pcap       spb_bpduv4.out -t
+
 # RIP tests
 ripv1v2         ripv1v2.pcap            ripv1v2.out     -t -v
 ripv2_auth      ripv2_auth.pcap         ripv2_auth.out  -t -v

diff --git a/tests/spb_bpduv4.out b/tests/spb_bpduv4.out
new file mode 100644 (file)
index 0000000..adc519f
--- /dev/null
+++ b/tests/spb_bpduv4.out
@@ -0,0 +1,25 @@
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward]

diff --git a/tests/spb_bpduv4.pcap b/tests/spb_bpduv4.pcap
new file mode 100644 (file)
index 0000000..b12d4c1
Binary files /dev/null and b/tests/spb_bpduv4.pcap differ