More EXTRACT_8BITS(), more ND_TCHECK_nBITS(), other cleanups.

[tcpdump] / print-juniper.c

diff --git a/print-juniper.c b/print-juniper.c
index d9c45200dffd5a52e9170647411b1b989b08e68e..cb08dc0f86cdcf19aac40633cc92053d46f2fa52 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -1234,8 +1234,10 @@ juniper_parse_header(netdissect_options *ndo,
 
         ND_TCHECK2(tptr[0], jnx_ext_len);
         while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) {
-            tlv_type = *(tptr++);
-            tlv_len = *(tptr++);
+            tlv_type = EXTRACT_8BITS(tptr);
+            tptr++;
+            tlv_len = EXTRACT_8BITS(tptr);
+            tptr++;
             tlv_value = 0;
 
             /* sanity checks */