Add more nd_print_trunc() calls

Update the output of some tests accordingly.

diff --git a/print-juniper.c b/print-juniper.c
index 56cb14d411e9525ea1a67d6733371e5567636b6e..b059d6bbdadd6cb91a32f65317770457e74c7b2e 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -498,7 +498,7 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_services]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -576,7 +576,7 @@ juniper_es_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_services]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -616,7 +616,7 @@ juniper_monitor_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_services]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -658,7 +658,7 @@ juniper_services_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_services]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -788,7 +788,7 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_pppoe_atm]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -1003,7 +1003,7 @@ juniper_atm1_if_print(netdissect_options *ndo,
        return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_atm1]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -1067,7 +1067,7 @@ juniper_atm2_if_print(netdissect_options *ndo,
        return l2info.header_len;
 
 trunc:
-       ND_PRINT("[|juniper_atm2]");
+       nd_print_trunc(ndo);
        return l2info.header_len;
 }
 #endif
@@ -1514,7 +1514,7 @@ juniper_parse_header(netdissect_options *ndo,
         ND_PRINT("hlen %u, proto 0x%04x, ", l2info->header_len, l2info->proto);
 
     return 1; /* everything went ok so far. continue parsing */
- trunc:
-    ND_PRINT("[|juniper_hdr], length %u", h->len);
+trunc:
+    nd_print_trunc(ndo);
     return 0;
 }

diff --git a/tests/hoobr_juniper.out b/tests/hoobr_juniper.out
index 72ab682bf94c7e9828e94e12150ed2ab9ce7a9a3..0c838245bcb2a027512e17840a7d890fa2c7bc15 100644 (file)
--- a/tests/hoobr_juniper.out
+++ b/tests/hoobr_juniper.out
@@ -1 +1 @@
-[|juniper_hdr], length 262144
+ [|juniper_atm1_if]

diff --git a/tests/hoobr_juniper2.out b/tests/hoobr_juniper2.out
index 1f164cfbab61f1a272e04216a010ac59f7e847e8..0c838245bcb2a027512e17840a7d890fa2c7bc15 100644 (file)
--- a/tests/hoobr_juniper2.out
+++ b/tests/hoobr_juniper2.out
@@ -1 +1 @@
-[|juniper_atm1]
+ [|juniper_atm1_if]

diff --git a/tests/hoobr_juniper3.out b/tests/hoobr_juniper3.out
index 8062118b5dc3335f02b022e3d5a7d711210ca74a..f8bbb6f56a3a64217c5502314f577de264ef11da 100644 (file)
--- a/tests/hoobr_juniper3.out
+++ b/tests/hoobr_juniper3.out
@@ -1 +1 @@
-Unknown Juniper DLT_ type 132: [|juniper_services]
+Unknown Juniper DLT_ type 132:  [|juniper_es_if]

diff --git a/tests/hoobr_juniper4.out b/tests/hoobr_juniper4.out
index 72ab682bf94c7e9828e94e12150ed2ab9ce7a9a3..0c838245bcb2a027512e17840a7d890fa2c7bc15 100644 (file)
--- a/tests/hoobr_juniper4.out
+++ b/tests/hoobr_juniper4.out
@@ -1 +1 @@
-[|juniper_hdr], length 262144
+ [|juniper_atm1_if]

diff --git a/tests/juniper_atm1.out b/tests/juniper_atm1.out
index c5cd9e01a423212eb0575e16ce54f62152efbcb8..d63c735f0d1055eaf4b2c6c2f2c4ff22cc87289f 100644 (file)
--- a/tests/juniper_atm1.out
+++ b/tests/juniper_atm1.out
@@ -1,2 +1,2 @@
 Out 
-       Juniper PCAP Flags [none]ATM1-PIC, cookie-len 4, cookie 0x30303030: [|juniper_hdr], length 262144
+       Juniper PCAP Flags [none]ATM1-PIC, cookie-len 4, cookie 0x30303030:  [|juniper_atm1_if]

diff --git a/tests/juniper_es.out b/tests/juniper_es.out
index 9d241a47b4fe3bc824a76dda86ce95a506648877..73c73a8e12042db0cd4f9b72f02f5d1d577f3ce1 100644 (file)
--- a/tests/juniper_es.out
+++ b/tests/juniper_es.out
@@ -1,2 +1,2 @@
 Out 
-       Juniper PCAP Flags [none]ES-PIC, cookie-len 0: [|juniper_hdr], length 262144
+       Juniper PCAP Flags [none]ES-PIC, cookie-len 0:  [|juniper_es_if]

diff --git a/tests/juniper_header-heapoverflow.out b/tests/juniper_header-heapoverflow.out
index 72ab682bf94c7e9828e94e12150ed2ab9ce7a9a3..d268d66e90b81ffbb1ddcc15577271185dcf387f 100644 (file)
--- a/tests/juniper_header-heapoverflow.out
+++ b/tests/juniper_header-heapoverflow.out
@@ -1 +1 @@
-[|juniper_hdr], length 262144
+ [|juniper_ether_if]