Add a nd_print_trunc() call

Update the output of some tests accordingly.

diff --git a/print-stp.c b/print-stp.c
index a59b22fba9efe535163da708dbca7d1e6a4f9dc5..0327ba49cf9f5b7120d5403dc35953b135f3afd4 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -509,5 +509,5 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
 
     return;
 trunc:
-    ND_PRINT("[|stp %u]", length);
+    nd_print_trunc(ndo);
 }

diff --git a/tests/stp-heapoverflow-1.out b/tests/stp-heapoverflow-1.out
index 4229c39edf21bf2d730d3f183c7b2eaf8fba771b..f7cd158a52319aaa5bea3eceb82a62e2eeccfb51 100644 (file)
--- a/tests/stp-heapoverflow-1.out
+++ b/tests/stp-heapoverflow-1.out
@@ -24,4 +24,4 @@
        0x0000:  3030 3030 30                             00000
 30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
        0x0000:  3030 3030 30                             00000
-[|stp 262127]
+ [|stp]

diff --git a/tests/stp-heapoverflow-2.out b/tests/stp-heapoverflow-2.out
index 2e2d5daa74a535eac941e2f767b9f2a5b422b49d..a9b3be41e7fbe0c1e68dd2d849535d17d8eb6529 100644 (file)
--- a/tests/stp-heapoverflow-2.out
+++ b/tests/stp-heapoverflow-2.out
@@ -24,4 +24,4 @@
        0x0000:  3030 3030 3030                           000000
 30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
        0x0000:  3030 3030 3030                           000000
-STP 802.1d[|stp 262127]
+STP 802.1d [|stp]

diff --git a/tests/stp-heapoverflow-3.out b/tests/stp-heapoverflow-3.out
index 08928e619801b26f60b715840e0d5babfcf9dca7..4f2c28c638d24effa7eb9ad47cf777fee3ee50c5 100644 (file)
--- a/tests/stp-heapoverflow-3.out
+++ b/tests/stp-heapoverflow-3.out
@@ -24,4 +24,4 @@
        0x0000:  3030 30                                  000
 30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
        0x0000:  3030 30                                  000
-[|stp 262127]
+ [|stp]

diff --git a/tests/stp-heapoverflow-4.out b/tests/stp-heapoverflow-4.out
index e9888425112487184b829c97f36d0e4efe7876b7..ffc3ce1f635bd9225274c2cb46a8520377e63848 100644 (file)
--- a/tests/stp-heapoverflow-4.out
+++ b/tests/stp-heapoverflow-4.out
@@ -24,4 +24,4 @@
        0x0000:  3030 3030 3030 3030                      00000000
 30:30:30:30:30:30 > 30:30:30:30:30:30, ethertype Unknown (0x3030), length 262144: 
        0x0000:  3030 3030 3030 3030                      00000000
-STP 802.1d, Config, Flags [Learn, Forward][|stp 262127]
+STP 802.1d, Config, Flags [Learn, Forward] [|stp]

diff --git a/tests/stp-v4-length-sigsegv.out b/tests/stp-v4-length-sigsegv.out
index fafddb0933a3b1b57ff922d1fb63aac4a84cea65..089f5f3e97b569fa0060574dcc5b9638fbce5e65 100644 (file)
--- a/tests/stp-v4-length-sigsegv.out
+++ b/tests/stp-v4-length-sigsegv.out
@@ -1 +1 @@
-STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 262127[|stp 262127]
+STP 802.1aq, Rapid STP, CIST Flags [Learn, Forward], length 262127 [|stp]