IS-IS: Fix some loops for undefined behavior at runtime

[tcpdump] / print-isoclns.c

diff --git a/print-isoclns.c b/print-isoclns.c
index c208690e19514fd8e8378da17f5c47e849dfacbf..361497ae4b18823ac7acd574df43c207b6d98b3e 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -72,10 +72,10 @@
 #define ISIS_PDU_L1_LAN_IIH    15
 #define ISIS_PDU_L2_LAN_IIH    16
 #define ISIS_PDU_PTP_IIH       17
 #define ISIS_PDU_L1_LAN_IIH    15
 #define ISIS_PDU_L2_LAN_IIH    16
 #define ISIS_PDU_PTP_IIH       17

-#define ISIS_PDU_L1_LSP        18
-#define ISIS_PDU_L2_LSP        20
-#define ISIS_PDU_L1_CSNP       24
-#define ISIS_PDU_L2_CSNP       25
+#define ISIS_PDU_L1_LSP                18
+#define ISIS_PDU_L2_LSP                20
+#define ISIS_PDU_L1_CSNP       24
+#define ISIS_PDU_L2_CSNP       25

 #define ISIS_PDU_L1_PSNP        26
 #define ISIS_PDU_L2_PSNP        27
 
 #define ISIS_PDU_L1_PSNP        26
 #define ISIS_PDU_L2_PSNP        27
 


@@ -487,14 +487,14 @@ static const struct tok clnp_flag_values[] = {
     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

-#define ISIS_MASK_LSP_OL_BIT(x)            (EXTRACT_U_1(x)&0x4)
-#define ISIS_MASK_LSP_ISTYPE_BITS(x)       (EXTRACT_U_1(x)&0x3)
-#define ISIS_MASK_LSP_PARTITION_BIT(x)     (EXTRACT_U_1(x)&0x80)
-#define ISIS_MASK_LSP_ATT_BITS(x)          (EXTRACT_U_1(x)&0x78)
-#define ISIS_MASK_LSP_ATT_ERROR_BIT(x)     (EXTRACT_U_1(x)&0x40)
-#define ISIS_MASK_LSP_ATT_EXPENSE_BIT(x)   (EXTRACT_U_1(x)&0x20)
-#define ISIS_MASK_LSP_ATT_DELAY_BIT(x)     (EXTRACT_U_1(x)&0x10)
-#define ISIS_MASK_LSP_ATT_DEFAULT_BIT(x)   (EXTRACT_U_1(x)&0x8)
+#define ISIS_MASK_LSP_OL_BIT(x)            (GET_U_1(x)&0x4)
+#define ISIS_MASK_LSP_ISTYPE_BITS(x)       (GET_U_1(x)&0x3)
+#define ISIS_MASK_LSP_PARTITION_BIT(x)     (GET_U_1(x)&0x80)
+#define ISIS_MASK_LSP_ATT_BITS(x)          (GET_U_1(x)&0x78)
+#define ISIS_MASK_LSP_ATT_ERROR_BIT(x)     (GET_U_1(x)&0x40)
+#define ISIS_MASK_LSP_ATT_EXPENSE_BIT(x)   (GET_U_1(x)&0x20)
+#define ISIS_MASK_LSP_ATT_DELAY_BIT(x)     (GET_U_1(x)&0x10)
+#define ISIS_MASK_LSP_ATT_DEFAULT_BIT(x)   (GET_U_1(x)&0x8)

 
 #define ISIS_MASK_MTID(x)                  ((x)&0x0fff)
 #define ISIS_MASK_MTFLAGS(x)               ((x)&0xf000)
 
 #define ISIS_MASK_MTID(x)                  ((x)&0x0fff)
 #define ISIS_MASK_MTFLAGS(x)               ((x)&0xf000)


@@ -511,10 +511,10 @@ static const struct tok isis_mt_flag_values[] = {
 #define ISIS_MASK_TLV_EXTD_IP6_IE(x)        ((x)&0x40)
 #define ISIS_MASK_TLV_EXTD_IP6_SUBTLV(x)    ((x)&0x20)
 
 #define ISIS_MASK_TLV_EXTD_IP6_IE(x)        ((x)&0x40)
 #define ISIS_MASK_TLV_EXTD_IP6_SUBTLV(x)    ((x)&0x20)
 

-#define ISIS_LSP_TLV_METRIC_SUPPORTED(x)   (EXTRACT_U_1(x)&0x80)
-#define ISIS_LSP_TLV_METRIC_IE(x)          (EXTRACT_U_1(x)&0x40)
-#define ISIS_LSP_TLV_METRIC_UPDOWN(x)      (EXTRACT_U_1(x)&0x80)
-#define ISIS_LSP_TLV_METRIC_VALUE(x)      (EXTRACT_U_1(x)&0x3f)
+#define ISIS_LSP_TLV_METRIC_SUPPORTED(x)   (GET_U_1(x)&0x80)
+#define ISIS_LSP_TLV_METRIC_IE(x)          (GET_U_1(x)&0x40)
+#define ISIS_LSP_TLV_METRIC_UPDOWN(x)      (GET_U_1(x)&0x80)
+#define ISIS_LSP_TLV_METRIC_VALUE(x)      (GET_U_1(x)&0x3f)

 
 #define ISIS_MASK_TLV_SHARED_RISK_GROUP(x) ((x)&0x1)
 
 
 #define ISIS_MASK_TLV_SHARED_RISK_GROUP(x) ((x)&0x1)
 


@@ -682,9 +682,11 @@ isoclns_print(netdissect_options *ndo, const u_char *p, u_int length)
        ND_TCHECK_1(p); /* enough bytes on the wire ? */
 
        if (ndo->ndo_eflag)
        ND_TCHECK_1(p); /* enough bytes on the wire ? */
 
        if (ndo->ndo_eflag)

-               ND_PRINT("OSI NLPID %s (0x%02x): ", tok2str(nlpid_values, "Unknown", EXTRACT_U_1(p)), EXTRACT_U_1(p));
+               ND_PRINT("OSI NLPID %s (0x%02x): ",
+                        tok2str(nlpid_values, "Unknown", GET_U_1(p)),
+                        GET_U_1(p));

 
 

-       switch (EXTRACT_U_1(p)) {
+       switch (GET_U_1(p)) {

 
        case NLPID_CLNP:
                if (!clnp_print(ndo, p, length))
 
        case NLPID_CLNP:
                if (!clnp_print(ndo, p, length))


@@ -722,7 +724,7 @@ isoclns_print(netdissect_options *ndo, const u_char *p, u_int length)
 
        default:
                if (!ndo->ndo_eflag)
 
        default:
                if (!ndo->ndo_eflag)

-                       ND_PRINT("OSI NLPID 0x%02x unknown", EXTRACT_U_1(p));
+                       ND_PRINT("OSI NLPID 0x%02x unknown", GET_U_1(p));

                ND_PRINT("%slength: %u", ndo->ndo_eflag ? "" : ", ", length);
                if (length > 1)
                        print_unknown_data(ndo, p, "\n\t", length);
                ND_PRINT("%slength: %u", ndo->ndo_eflag ? "" : ", ", length);
                if (length > 1)
                        print_unknown_data(ndo, p, "\n\t", length);


@@ -783,7 +785,7 @@ clnp_print(netdissect_options *ndo,
        clnp_header = (const struct clnp_header_t *) pptr;
         ND_TCHECK_SIZE(clnp_header);
 
        clnp_header = (const struct clnp_header_t *) pptr;
         ND_TCHECK_SIZE(clnp_header);
 

-        li = EXTRACT_U_1(clnp_header->length_indicator);
+        li = GET_U_1(clnp_header->length_indicator);

         li_remaining = li;
         optr = pptr;
 
         li_remaining = li;
         optr = pptr;
 


@@ -794,8 +796,9 @@ clnp_print(netdissect_options *ndo,
          * Sanity checking of the header.
          */
 
          * Sanity checking of the header.
          */
 

-        if (EXTRACT_U_1(clnp_header->version) != CLNP_VERSION) {
-            ND_PRINT("version %u packet not supported", EXTRACT_U_1(clnp_header->version));
+        if (GET_U_1(clnp_header->version) != CLNP_VERSION) {
+            ND_PRINT("version %u packet not supported",
+                     GET_U_1(clnp_header->version));

             return (0);
         }
 
             return (0);
         }
 


@@ -807,7 +810,7 @@ clnp_print(netdissect_options *ndo,
         if (li < sizeof(struct clnp_header_t)) {
             ND_PRINT(" length indicator %u < min PDU size:", li);
             while (pptr < ndo->ndo_snapend) {
         if (li < sizeof(struct clnp_header_t)) {
             ND_PRINT(" length indicator %u < min PDU size:", li);
             while (pptr < ndo->ndo_snapend) {

-                ND_PRINT("%02X", EXTRACT_U_1(pptr));
+                ND_PRINT("%02X", GET_U_1(pptr));

                 pptr++;
             }
             return (0);
                 pptr++;
             }
             return (0);


@@ -815,8 +818,8 @@ clnp_print(netdissect_options *ndo,
 
         /* FIXME further header sanity checking */
 
 
         /* FIXME further header sanity checking */
 

-        clnp_pdu_type = EXTRACT_U_1(clnp_header->type) & CLNP_PDU_TYPE_MASK;
-        clnp_flags = EXTRACT_U_1(clnp_header->type) & CLNP_FLAG_MASK;
+        clnp_pdu_type = GET_U_1(clnp_header->type) & CLNP_PDU_TYPE_MASK;
+        clnp_flags = GET_U_1(clnp_header->type) & CLNP_FLAG_MASK;

 
         pptr += sizeof(struct clnp_header_t);
         li_remaining -= sizeof(struct clnp_header_t);
 
         pptr += sizeof(struct clnp_header_t);
         li_remaining -= sizeof(struct clnp_header_t);


@@ -826,7 +829,7 @@ clnp_print(netdissect_options *ndo,
             return (0);
         }
        ND_TCHECK_1(pptr);
             return (0);
         }
        ND_TCHECK_1(pptr);

-        dest_address_length = EXTRACT_U_1(pptr);
+        dest_address_length = GET_U_1(pptr);

         pptr += 1;
         li_remaining -= 1;
         if (li_remaining < dest_address_length) {
         pptr += 1;
         li_remaining -= 1;
         if (li_remaining < dest_address_length) {


@@ -843,7 +846,7 @@ clnp_print(netdissect_options *ndo,
             return (0);
         }
        ND_TCHECK_1(pptr);
             return (0);
         }
        ND_TCHECK_1(pptr);

-        source_address_length = EXTRACT_U_1(pptr);
+        source_address_length = GET_U_1(pptr);

         pptr += 1;
         li_remaining -= 1;
         if (li_remaining < source_address_length) {
         pptr += 1;
         li_remaining -= 1;
         if (li_remaining < source_address_length) {


@@ -868,15 +871,15 @@ clnp_print(netdissect_options *ndo,
 
         ND_PRINT("\n\t%s PDU, hlen: %u, v: %u, lifetime: %u.%us, Segment PDU length: %u, checksum: 0x%04x",
                tok2str(clnp_pdu_values, "unknown (%u)",clnp_pdu_type),
 
         ND_PRINT("\n\t%s PDU, hlen: %u, v: %u, lifetime: %u.%us, Segment PDU length: %u, checksum: 0x%04x",
                tok2str(clnp_pdu_values, "unknown (%u)",clnp_pdu_type),

-               EXTRACT_U_1(clnp_header->length_indicator),
-               EXTRACT_U_1(clnp_header->version),
-               EXTRACT_U_1(clnp_header->lifetime)/2,
-               (EXTRACT_U_1(clnp_header->lifetime)%2)*5,
-               EXTRACT_BE_U_2(clnp_header->segment_length),
-               EXTRACT_BE_U_2(clnp_header->cksum));
+               GET_U_1(clnp_header->length_indicator),
+               GET_U_1(clnp_header->version),
+               GET_U_1(clnp_header->lifetime)/2,
+               (GET_U_1(clnp_header->lifetime)%2)*5,
+               GET_BE_U_2(clnp_header->segment_length),
+               GET_BE_U_2(clnp_header->cksum));

 
 

-        osi_print_cksum(ndo, optr, EXTRACT_BE_U_2(clnp_header->cksum), 7,
-                        EXTRACT_U_1(clnp_header->length_indicator));
+        osi_print_cksum(ndo, optr, GET_BE_U_2(clnp_header->cksum), 7,
+                        GET_U_1(clnp_header->length_indicator));

 
         ND_PRINT("\n\tFlags [%s]",
                bittok2str(clnp_flag_values, "none", clnp_flags));
 
         ND_PRINT("\n\tFlags [%s]",
                bittok2str(clnp_flag_values, "none", clnp_flags));


@@ -892,12 +895,12 @@ clnp_print(netdissect_options *ndo,
                     ND_PRINT("li < size of fixed part of CLNP header, addresses, and segment part");
                     return (0);
                 }
                     ND_PRINT("li < size of fixed part of CLNP header, addresses, and segment part");
                     return (0);
                 }

-               clnp_segment_header = (const struct clnp_segment_header_t *) pptr;
+               clnp_segment_header = (const struct clnp_segment_header_t *) pptr;

                 ND_TCHECK_SIZE(clnp_segment_header);
                 ND_PRINT("\n\tData Unit ID: 0x%04x, Segment Offset: %u, Total PDU Length: %u",
                 ND_TCHECK_SIZE(clnp_segment_header);
                 ND_PRINT("\n\tData Unit ID: 0x%04x, Segment Offset: %u, Total PDU Length: %u",

-                       EXTRACT_BE_U_2(clnp_segment_header->data_unit_id),
-                       EXTRACT_BE_U_2(clnp_segment_header->segment_offset),
-                       EXTRACT_BE_U_2(clnp_segment_header->total_length));
+                       GET_BE_U_2(clnp_segment_header->data_unit_id),
+                       GET_BE_U_2(clnp_segment_header->segment_offset),
+                       GET_BE_U_2(clnp_segment_header->total_length));

                 pptr+=sizeof(struct clnp_segment_header_t);
                 li_remaining-=sizeof(struct clnp_segment_header_t);
         }
                 pptr+=sizeof(struct clnp_segment_header_t);
                 li_remaining-=sizeof(struct clnp_segment_header_t);
         }


@@ -912,8 +915,8 @@ clnp_print(netdissect_options *ndo,
                 return (0);
             }
             ND_TCHECK_2(pptr);
                 return (0);
             }
             ND_TCHECK_2(pptr);

-            op = EXTRACT_U_1(pptr);
-            opli = EXTRACT_U_1(pptr + 1);
+            op = GET_U_1(pptr);
+            opli = GET_U_1(pptr + 1);

             pptr += 2;
             li_remaining -= 2;
             if (opli > li_remaining) {
             pptr += 2;
             li_remaining -= 2;
             if (opli > li_remaining) {


@@ -948,9 +951,9 @@ clnp_print(netdissect_options *ndo,
                             return (0);
                     }
                     ND_PRINT("%s %s",
                             return (0);
                     }
                     ND_PRINT("%s %s",

-                           tok2str(clnp_option_sr_rr_values,"Unknown",EXTRACT_U_1(tptr)),
+                           tok2str(clnp_option_sr_rr_values,"Unknown",GET_U_1(tptr)),

                            tok2str(clnp_option_sr_rr_string_values, "Unknown Option %u", op));
                            tok2str(clnp_option_sr_rr_string_values, "Unknown Option %u", op));

-                    nsap_offset=EXTRACT_U_1(tptr + 1);
+                    nsap_offset=GET_U_1(tptr + 1);

                     if (nsap_offset == 0) {
                             ND_PRINT(" Bad NSAP offset (0)");
                             break;
                     if (nsap_offset == 0) {
                             ND_PRINT(" Bad NSAP offset (0)");
                             break;


@@ -963,7 +966,7 @@ clnp_print(netdissect_options *ndo,
                     tptr+=nsap_offset;
                     tlen-=nsap_offset;
                     while (tlen > 0) {
                     tptr+=nsap_offset;
                     tlen-=nsap_offset;
                     while (tlen > 0) {

-                            source_address_length=EXTRACT_U_1(tptr);
+                            source_address_length=GET_U_1(tptr);

                             if (tlen < source_address_length+1) {
                                     ND_PRINT("\n\t    NSAP address goes past end of option");
                                     break;
                             if (tlen < source_address_length+1) {
                                     ND_PRINT("\n\t    NSAP address goes past end of option");
                                     break;


@@ -985,7 +988,7 @@ clnp_print(netdissect_options *ndo,
                             ND_PRINT(", bad opt len");
                             return (0);
                     }
                             ND_PRINT(", bad opt len");
                             return (0);
                     }

-                    ND_PRINT("0x%1x", EXTRACT_U_1(tptr)&0x0f);
+                    ND_PRINT("0x%1x", GET_U_1(tptr)&0x0f);

                     break;
 
             case CLNP_OPTION_QOS_MAINTENANCE:
                     break;
 
             case CLNP_OPTION_QOS_MAINTENANCE:


@@ -994,13 +997,13 @@ clnp_print(netdissect_options *ndo,
                             return (0);
                     }
                     ND_PRINT("\n\t    Format Code: %s",
                             return (0);
                     }
                     ND_PRINT("\n\t    Format Code: %s",

-                           tok2str(clnp_option_scope_values, "Reserved", EXTRACT_U_1(tptr) & CLNP_OPTION_SCOPE_MASK));
+                           tok2str(clnp_option_scope_values, "Reserved", GET_U_1(tptr) & CLNP_OPTION_SCOPE_MASK));

 
 

-                    if ((EXTRACT_U_1(tptr)&CLNP_OPTION_SCOPE_MASK) == CLNP_OPTION_SCOPE_GLOBAL)
+                    if ((GET_U_1(tptr)&CLNP_OPTION_SCOPE_MASK) == CLNP_OPTION_SCOPE_GLOBAL)

                             ND_PRINT("\n\t    QoS Flags [%s]",
                                    bittok2str(clnp_option_qos_global_values,
                                               "none",
                             ND_PRINT("\n\t    QoS Flags [%s]",
                                    bittok2str(clnp_option_qos_global_values,
                                               "none",

-                                              EXTRACT_U_1(tptr)&CLNP_OPTION_OPTION_QOS_MASK));
+                                              GET_U_1(tptr)&CLNP_OPTION_OPTION_QOS_MASK));

                     break;
 
             case CLNP_OPTION_SECURITY:
                     break;
 
             case CLNP_OPTION_SECURITY:


@@ -1009,8 +1012,8 @@ clnp_print(netdissect_options *ndo,
                             return (0);
                     }
                     ND_PRINT("\n\t    Format Code: %s, Security-Level %u",
                             return (0);
                     }
                     ND_PRINT("\n\t    Format Code: %s, Security-Level %u",

-                           tok2str(clnp_option_scope_values,"Reserved",EXTRACT_U_1(tptr)&CLNP_OPTION_SCOPE_MASK),
-                           EXTRACT_U_1(tptr + 1));
+                           tok2str(clnp_option_scope_values,"Reserved",GET_U_1(tptr)&CLNP_OPTION_SCOPE_MASK),
+                           GET_U_1(tptr + 1));

                     break;
 
             case CLNP_OPTION_DISCARD_REASON:
                     break;
 
             case CLNP_OPTION_DISCARD_REASON:


@@ -1018,7 +1021,7 @@ clnp_print(netdissect_options *ndo,
                         ND_PRINT(", bad opt len");
                         return (0);
                 }
                         ND_PRINT(", bad opt len");
                         return (0);
                 }

-                rfd_error = EXTRACT_U_1(tptr);
+                rfd_error = GET_U_1(tptr);

                 rfd_error_major = (rfd_error&0xf0) >> 4;
                 rfd_error_minor = rfd_error&0x0f;
                 ND_PRINT("\n\t    Class: %s Error (0x%01x), %s (0x%01x)",
                 rfd_error_major = (rfd_error&0xf0) >> 4;
                 rfd_error_minor = rfd_error&0x0f;
                 ND_PRINT("\n\t    Class: %s Error (0x%01x), %s (0x%01x)",


@@ -1049,9 +1052,9 @@ clnp_print(netdissect_options *ndo,
         switch (clnp_pdu_type) {
 
         case    CLNP_PDU_ER: /* fall through */
         switch (clnp_pdu_type) {
 
         case    CLNP_PDU_ER: /* fall through */

-        case   CLNP_PDU_ERP:
+        case   CLNP_PDU_ERP:

             ND_TCHECK_1(pptr);
             ND_TCHECK_1(pptr);

-            if (EXTRACT_U_1(pptr) == NLPID_CLNP) {
+            if (GET_U_1(pptr) == NLPID_CLNP) {

                 ND_PRINT("\n\t-----original packet-----\n\t");
                 /* FIXME recursion protection */
                 clnp_print(ndo, pptr, length - li);
                 ND_PRINT("\n\t-----original packet-----\n\t");
                 /* FIXME recursion protection */
                 clnp_print(ndo, pptr, length - li);


@@ -1070,9 +1073,9 @@ clnp_print(netdissect_options *ndo,
          */
         ND_FALL_THROUGH;
 
          */
         ND_FALL_THROUGH;
 

-        case   CLNP_PDU_DT:
-        case   CLNP_PDU_MD:
-        case   CLNP_PDU_ERQ:
+        case   CLNP_PDU_DT:
+        case   CLNP_PDU_MD:
+        case   CLNP_PDU_ERQ:

 
         default:
             /* dump the PDU specific data */
 
         default:
             /* dump the PDU specific data */


@@ -1131,19 +1134,20 @@ esis_print(netdissect_options *ndo,
 
        esis_header = (const struct esis_header_t *) pptr;
         ND_TCHECK_SIZE(esis_header);
 
        esis_header = (const struct esis_header_t *) pptr;
         ND_TCHECK_SIZE(esis_header);

-        li = EXTRACT_U_1(esis_header->length_indicator);
+        li = GET_U_1(esis_header->length_indicator);

         optr = pptr;
 
         /*
          * Sanity checking of the header.
          */
 
         optr = pptr;
 
         /*
          * Sanity checking of the header.
          */
 

-        if (EXTRACT_U_1(esis_header->nlpid) != NLPID_ESIS) {
-            ND_PRINT(" nlpid 0x%02x packet not supported", EXTRACT_U_1(esis_header->nlpid));
+        if (GET_U_1(esis_header->nlpid) != NLPID_ESIS) {
+            ND_PRINT(" nlpid 0x%02x packet not supported",
+                    GET_U_1(esis_header->nlpid));

             return;
         }
 
             return;
         }
 

-        version = EXTRACT_U_1(esis_header->version);
+        version = GET_U_1(esis_header->version);

         if (version != ESIS_VERSION) {
             ND_PRINT(" version %u packet not supported", version);
             return;
         if (version != ESIS_VERSION) {
             ND_PRINT(" version %u packet not supported", version);
             return;


@@ -1157,13 +1161,13 @@ esis_print(netdissect_options *ndo,
        if (li < sizeof(struct esis_header_t) + 2) {
             ND_PRINT(" length indicator %u < min PDU size:", li);
             while (pptr < ndo->ndo_snapend) {
        if (li < sizeof(struct esis_header_t) + 2) {
             ND_PRINT(" length indicator %u < min PDU size:", li);
             while (pptr < ndo->ndo_snapend) {

-                ND_PRINT("%02X", EXTRACT_U_1(pptr));
+                ND_PRINT("%02X", GET_U_1(pptr));

                 pptr++;
             }
             return;
        }
 
                 pptr++;
             }
             return;
        }
 

-        esis_pdu_type = EXTRACT_U_1(esis_header->type) & ESIS_PDU_TYPE_MASK;
+        esis_pdu_type = GET_U_1(esis_header->type) & ESIS_PDU_TYPE_MASK;

 
         if (ndo->ndo_vflag < 1) {
             ND_PRINT("%s%s, length %u",
 
         if (ndo->ndo_vflag < 1) {
             ND_PRINT("%s%s, length %u",


@@ -1179,13 +1183,13 @@ esis_print(netdissect_options *ndo,
                    esis_pdu_type);
 
         ND_PRINT(", v: %u%s", version, version == ESIS_VERSION ? "" : "unsupported" );
                    esis_pdu_type);
 
         ND_PRINT(", v: %u%s", version, version == ESIS_VERSION ? "" : "unsupported" );

-        ND_PRINT(", checksum: 0x%04x", EXTRACT_BE_U_2(esis_header->cksum));
+        ND_PRINT(", checksum: 0x%04x", GET_BE_U_2(esis_header->cksum));

 
 

-        osi_print_cksum(ndo, pptr, EXTRACT_BE_U_2(esis_header->cksum), 7,
+        osi_print_cksum(ndo, pptr, GET_BE_U_2(esis_header->cksum), 7,

                         li);
 
         ND_PRINT(", holding time: %us, length indicator: %u",
                         li);
 
         ND_PRINT(", holding time: %us, length indicator: %u",

-                  EXTRACT_BE_U_2(esis_header->holdtime), li);
+                  GET_BE_U_2(esis_header->holdtime), li);

 
         if (ndo->ndo_vflag > 1)
             print_unknown_data(ndo, optr, "\n\t", sizeof(struct esis_header_t));
 
         if (ndo->ndo_vflag > 1)
             print_unknown_data(ndo, optr, "\n\t", sizeof(struct esis_header_t));


@@ -1203,7 +1207,7 @@ esis_print(netdissect_options *ndo,
                        ND_PRINT(", bad redirect/li");
                        return;
                }
                        ND_PRINT(", bad redirect/li");
                        return;
                }

-               dstl = EXTRACT_U_1(pptr);
+               dstl = GET_U_1(pptr);

                pptr++;
                li--;
                ND_TCHECK_LEN(pptr, dstl);
                pptr++;
                li--;
                ND_TCHECK_LEN(pptr, dstl);


@@ -1221,7 +1225,7 @@ esis_print(netdissect_options *ndo,
                        ND_PRINT(", bad redirect/li");
                        return;
                }
                        ND_PRINT(", bad redirect/li");
                        return;
                }

-               snpal = EXTRACT_U_1(pptr);
+               snpal = GET_U_1(pptr);

                pptr++;
                li--;
                ND_TCHECK_LEN(pptr, snpal);
                pptr++;
                li--;
                ND_TCHECK_LEN(pptr, snpal);


@@ -1237,7 +1241,7 @@ esis_print(netdissect_options *ndo,
                        ND_PRINT(", bad redirect/li");
                        return;
                }
                        ND_PRINT(", bad redirect/li");
                        return;
                }

-               netal = EXTRACT_U_1(pptr);
+               netal = GET_U_1(pptr);

                pptr++;
                ND_TCHECK_LEN(pptr, netal);
                if (li < netal) {
                pptr++;
                ND_TCHECK_LEN(pptr, netal);
                if (li < netal) {


@@ -1269,7 +1273,7 @@ esis_print(netdissect_options *ndo,
                 ND_PRINT(", bad esh/li");
                 return;
             }
                 ND_PRINT(", bad esh/li");
                 return;
             }

-            source_address_number = EXTRACT_U_1(pptr);
+            source_address_number = GET_U_1(pptr);

             pptr++;
             li--;
 
             pptr++;
             li--;
 


@@ -1277,19 +1281,19 @@ esis_print(netdissect_options *ndo,
 
             while (source_address_number > 0) {
                 ND_TCHECK_1(pptr);
 
             while (source_address_number > 0) {
                 ND_TCHECK_1(pptr);

-               if (li < 1) {
+               if (li < 1) {

                     ND_PRINT(", bad esh/li");
                     ND_PRINT(", bad esh/li");

-                   return;
-               }
-                source_address_length = EXTRACT_U_1(pptr);
+                   return;
+               }
+                source_address_length = GET_U_1(pptr);

                 pptr++;
                 pptr++;

-               li--;
+               li--;

 
                 ND_TCHECK_LEN(pptr, source_address_length);
 
                 ND_TCHECK_LEN(pptr, source_address_length);

-               if (li < source_address_length) {
+               if (li < source_address_length) {

                     ND_PRINT(", bad esh/li");
                     ND_PRINT(", bad esh/li");

-                   return;
-               }
+                   return;
+               }

                 ND_PRINT("\n\t  NET (length: %u): %s",
                        source_address_length,
                        isonsap_string(ndo, pptr, source_address_length));
                 ND_PRINT("\n\t  NET (length: %u): %s",
                        source_address_length,
                        isonsap_string(ndo, pptr, source_address_length));


@@ -1306,7 +1310,7 @@ esis_print(netdissect_options *ndo,
                 ND_PRINT(", bad ish/li");
                 return;
             }
                 ND_PRINT(", bad ish/li");
                 return;
             }

-            source_address_length = EXTRACT_U_1(pptr);
+            source_address_length = GET_U_1(pptr);

             pptr++;
             li--;
             ND_TCHECK_LEN(pptr, source_address_length);
             pptr++;
             li--;
             ND_TCHECK_LEN(pptr, source_address_length);


@@ -1338,8 +1342,8 @@ esis_print(netdissect_options *ndo,
                 return;
             }
             ND_TCHECK_2(pptr);
                 return;
             }
             ND_TCHECK_2(pptr);

-            op = EXTRACT_U_1(pptr);
-            opli = EXTRACT_U_1(pptr + 1);
+            op = GET_U_1(pptr);
+            opli = GET_U_1(pptr + 1);

             pptr += 2;
             li -= 2;
             if (opli > li) {
             pptr += 2;
             li -= 2;
             if (opli > li) {


@@ -1359,7 +1363,7 @@ esis_print(netdissect_options *ndo,
             case ESIS_OPTION_ES_CONF_TIME:
                 if (opli == 2) {
                     ND_TCHECK_2(pptr);
             case ESIS_OPTION_ES_CONF_TIME:
                 if (opli == 2) {
                     ND_TCHECK_2(pptr);

-                    ND_PRINT("%us", EXTRACT_BE_U_2(tptr));
+                    ND_PRINT("%us", GET_BE_U_2(tptr));

                 } else
                     ND_PRINT("(bad length)");
                 break;
                 } else
                     ND_PRINT("(bad length)");
                 break;


@@ -1370,8 +1374,8 @@ esis_print(netdissect_options *ndo,
                     ND_PRINT("%s (0x%02x)",
                            tok2str(nlpid_values,
                                    "unknown",
                     ND_PRINT("%s (0x%02x)",
                            tok2str(nlpid_values,
                                    "unknown",

-                                   EXTRACT_U_1(tptr)),
-                           EXTRACT_U_1(tptr));
+                                   GET_U_1(tptr)),
+                           GET_U_1(tptr));

                     if (opli>1) /* further NPLIDs ? - put comma */
                         ND_PRINT(", ");
                     tptr++;
                     if (opli>1) /* further NPLIDs ? - put comma */
                         ND_PRINT(", ");
                     tptr++;


@@ -1411,12 +1415,12 @@ isis_print_mcid(netdissect_options *ndo,
   int i;
 
   ND_TCHECK_SIZE(mcid);
   int i;
 
   ND_TCHECK_SIZE(mcid);

-  ND_PRINT("ID: %u, Name: ", EXTRACT_U_1(mcid->format_id));
+  ND_PRINT("ID: %u, Name: ", GET_U_1(mcid->format_id));

 
   if (nd_printzp(ndo, mcid->name, 32, ndo->ndo_snapend))
 
   if (nd_printzp(ndo, mcid->name, 32, ndo->ndo_snapend))

-    goto trunc;
+      goto trunc;

 
 

-  ND_PRINT("\n\t              Lvl: %u", EXTRACT_BE_U_2(mcid->revision_lvl));
+  ND_PRINT("\n\t              Lvl: %u", GET_BE_U_2(mcid->revision_lvl));

 
   ND_PRINT(", Digest: ");
 
 
   ND_PRINT(", Digest: ");
 


@@ -1439,8 +1443,8 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,
   while (len > 2)
   {
     ND_TCHECK_2(tptr);
   while (len > 2)
   {
     ND_TCHECK_2(tptr);

-    stlv_type = EXTRACT_U_1(tptr);
-    stlv_len  = EXTRACT_U_1(tptr + 1);
+    stlv_type = GET_U_1(tptr);
+    stlv_len  = GET_U_1(tptr + 1);

 
     /* first lets see if we know the subTLVs name*/
     ND_PRINT("\n\t       %s subTLV #%u, length: %u",
 
     /* first lets see if we know the subTLVs name*/
     ND_PRINT("\n\t       %s subTLV #%u, length: %u",


@@ -1454,7 +1458,7 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,
 
     /* Make sure the subTLV fits within the space left */
     if (len < stlv_len)
 
     /* Make sure the subTLV fits within the space left */
     if (len < stlv_len)

-      goto trunc;
+        goto trunc;

     /* Make sure the entire subTLV is in the captured data */
     ND_TCHECK_LEN(tptr, stlv_len);
 
     /* Make sure the entire subTLV is in the captured data */
     ND_TCHECK_LEN(tptr, stlv_len);
 


@@ -1462,8 +1466,8 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,
     {
       case ISIS_SUBTLV_SPB_MCID:
       {
     {
       case ISIS_SUBTLV_SPB_MCID:
       {

-       if (stlv_len < ISIS_SUBTLV_SPB_MCID_MIN_LEN)
-         goto trunc;
+       if (stlv_len < ISIS_SUBTLV_SPB_MCID_MIN_LEN)
+           goto trunc;

 
         subtlv_spb_mcid = (const struct isis_subtlv_spb_mcid *)tptr;
 
 
         subtlv_spb_mcid = (const struct isis_subtlv_spb_mcid *)tptr;
 


@@ -1491,10 +1495,10 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,
           goto trunc;
 
         ND_PRINT("\n\t        RES: %u V: %u A: %u D: %u",
           goto trunc;
 
         ND_PRINT("\n\t        RES: %u V: %u A: %u D: %u",

-                        (EXTRACT_U_1(tptr) >> 5),
-                        ((EXTRACT_U_1(tptr) >> 4) & 0x01),
-                        ((EXTRACT_U_1(tptr) >> 2) & 0x03),
-                        (EXTRACT_U_1(tptr) & 0x03));
+                        (GET_U_1(tptr) >> 5),
+                        ((GET_U_1(tptr) >> 4) & 0x01),
+                        ((GET_U_1(tptr) >> 2) & 0x03),
+                        (GET_U_1(tptr) & 0x03));

 
         tptr++;
 
 
         tptr++;
 


@@ -1502,7 +1506,7 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,
 
         for(i=1;i<=8; i++)
         {
 
         for(i=1;i<=8; i++)
         {

-            ND_PRINT("%08x ", EXTRACT_BE_U_4(tptr));
+            ND_PRINT("%08x ", GET_BE_U_4(tptr));

             if (i%4 == 0 && i != 8)
               ND_PRINT("\n\t                 ");
             tptr = tptr + 4;
             if (i%4 == 0 && i != 8)
               ND_PRINT("\n\t                 ");
             tptr = tptr + 4;


@@ -1519,14 +1523,14 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,
         while (stlv_len >= ISIS_SUBTLV_SPB_BVID_MIN_LEN)
         {
           ND_PRINT("\n\t           ECT: %08x",
         while (stlv_len >= ISIS_SUBTLV_SPB_BVID_MIN_LEN)
         {
           ND_PRINT("\n\t           ECT: %08x",

-                      EXTRACT_BE_U_4(tptr));
+                      GET_BE_U_4(tptr));

 
           tptr = tptr+4;
 
           ND_PRINT(" BVID: %u, U:%01x M:%01x ",
 
           tptr = tptr+4;
 
           ND_PRINT(" BVID: %u, U:%01x M:%01x ",

-                     (EXTRACT_BE_U_2(tptr) >> 4) ,
-                     (EXTRACT_BE_U_2(tptr) >> 3) & 0x01,
-                     (EXTRACT_BE_U_2(tptr) >> 2) & 0x01);
+                     (GET_BE_U_2(tptr) >> 4) ,
+                     (GET_BE_U_2(tptr) >> 3) & 0x01,
+                     (GET_BE_U_2(tptr) >> 2) & 0x01);

 
           tptr = tptr + 2;
           len = len - ISIS_SUBTLV_SPB_BVID_MIN_LEN;
 
           tptr = tptr + 2;
           len = len - ISIS_SUBTLV_SPB_BVID_MIN_LEN;


@@ -1554,13 +1558,13 @@ static int
 isis_print_mt_capability_subtlv(netdissect_options *ndo,
                                 const uint8_t *tptr, u_int len)
 {
 isis_print_mt_capability_subtlv(netdissect_options *ndo,
                                 const uint8_t *tptr, u_int len)
 {

-  u_int stlv_type, stlv_len, tmp;
+  u_int stlv_type, stlv_len, treecount;

 
   while (len > 2)
   {
     ND_TCHECK_2(tptr);
 
   while (len > 2)
   {
     ND_TCHECK_2(tptr);

-    stlv_type = EXTRACT_U_1(tptr);
-    stlv_len  = EXTRACT_U_1(tptr + 1);
+    stlv_type = GET_U_1(tptr);
+    stlv_len  = GET_U_1(tptr + 1);

     tptr = tptr + 2;
     len = len - 2;
 
     tptr = tptr + 2;
     len = len - 2;
 


@@ -1582,54 +1586,54 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo,
           if (stlv_len < ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN)
             goto trunc;
 
           if (stlv_len < ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN)
             goto trunc;
 

-          ND_PRINT("\n\t        CIST Root-ID: %08x", EXTRACT_BE_U_4(tptr));
+          ND_PRINT("\n\t        CIST Root-ID: %08x", GET_BE_U_4(tptr));

           tptr = tptr+4;
           tptr = tptr+4;

-          ND_PRINT(" %08x", EXTRACT_BE_U_4(tptr));
+          ND_PRINT(" %08x", GET_BE_U_4(tptr));

           tptr = tptr+4;
           tptr = tptr+4;

-          ND_PRINT(", Path Cost: %08x", EXTRACT_BE_U_4(tptr));
+          ND_PRINT(", Path Cost: %08x", GET_BE_U_4(tptr));

           tptr = tptr+4;
           tptr = tptr+4;

-          ND_PRINT(", Prio: %u", EXTRACT_BE_U_2(tptr));
+          ND_PRINT(", Prio: %u", GET_BE_U_2(tptr));

           tptr = tptr + 2;
           ND_PRINT("\n\t        RES: %u",
           tptr = tptr + 2;
           ND_PRINT("\n\t        RES: %u",

-                    EXTRACT_BE_U_2(tptr) >> 5);
+                    GET_BE_U_2(tptr) >> 5);

           ND_PRINT(", V: %u",
           ND_PRINT(", V: %u",

-                    (EXTRACT_BE_U_2(tptr) >> 4) & 0x0001);
+                    (GET_BE_U_2(tptr) >> 4) & 0x0001);

           ND_PRINT(", SPSource-ID: %u",
           ND_PRINT(", SPSource-ID: %u",

-                    (EXTRACT_BE_U_4(tptr) & 0x000fffff));
+                    (GET_BE_U_4(tptr) & 0x000fffff));

           tptr = tptr+4;
           tptr = tptr+4;

-          ND_PRINT(", No of Trees: %x", EXTRACT_U_1(tptr));
+          ND_PRINT(", No of Trees: %x", GET_U_1(tptr));

 
 

-          tmp = EXTRACT_U_1(tptr);
+          treecount = GET_U_1(tptr);

           tptr++;
 
           len = len - ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN;
           stlv_len = stlv_len - ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN;
 
           tptr++;
 
           len = len - ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN;
           stlv_len = stlv_len - ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN;
 

-          while (tmp)
+          while (treecount)

           {
             if (stlv_len < ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN)
               goto trunc;
 
             ND_PRINT("\n\t         U:%u, M:%u, A:%u, RES:%u",
           {
             if (stlv_len < ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN)
               goto trunc;
 
             ND_PRINT("\n\t         U:%u, M:%u, A:%u, RES:%u",

-                      EXTRACT_U_1(tptr) >> 7,
-                      (EXTRACT_U_1(tptr) >> 6) & 0x01,
-                      (EXTRACT_U_1(tptr) >> 5) & 0x01,
-                      (EXTRACT_U_1(tptr) & 0x1f));
+                      GET_U_1(tptr) >> 7,
+                      (GET_U_1(tptr) >> 6) & 0x01,
+                      (GET_U_1(tptr) >> 5) & 0x01,
+                      (GET_U_1(tptr) & 0x1f));

 
             tptr++;
 
 
             tptr++;
 

-            ND_PRINT(", ECT: %08x", EXTRACT_BE_U_4(tptr));
+            ND_PRINT(", ECT: %08x", GET_BE_U_4(tptr));

 
             tptr = tptr + 4;
 
             ND_PRINT(", BVID: %u, SPVID: %u",
 
             tptr = tptr + 4;
 
             ND_PRINT(", BVID: %u, SPVID: %u",

-                      (EXTRACT_BE_U_3(tptr) >> 12) & 0x000fff,
-                      EXTRACT_BE_U_3(tptr) & 0x000fff);
+                      (GET_BE_U_3(tptr) >> 12) & 0x000fff,
+                      GET_BE_U_3(tptr) & 0x000fff);

 
             tptr = tptr + 3;
             len = len - ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN;
             stlv_len = stlv_len - ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN;
 
             tptr = tptr + 3;
             len = len - ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN;
             stlv_len = stlv_len - ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN;

-            tmp--;
+            treecount--;

           }
 
           break;
           }
 
           break;


@@ -1638,13 +1642,13 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo,
           if (stlv_len < 8)
             goto trunc;
 
           if (stlv_len < 8)
             goto trunc;
 

-          ND_PRINT("\n\t        BMAC: %08x", EXTRACT_BE_U_4(tptr));
+          ND_PRINT("\n\t        BMAC: %08x", GET_BE_U_4(tptr));

           tptr = tptr+4;
           tptr = tptr+4;

-          ND_PRINT("%04x", EXTRACT_BE_U_2(tptr));
+          ND_PRINT("%04x", GET_BE_U_2(tptr));

           tptr = tptr+2;
 
           tptr = tptr+2;
 

-          ND_PRINT(", RES: %u, VID: %u", EXTRACT_BE_U_2(tptr) >> 12,
-                    (EXTRACT_BE_U_2(tptr)) & 0x0fff);
+          ND_PRINT(", RES: %u, VID: %u", GET_BE_U_2(tptr) >> 12,
+                    (GET_BE_U_2(tptr)) & 0x0fff);

 
           tptr = tptr+2;
           len = len - 8;
 
           tptr = tptr+2;
           len = len - 8;


@@ -1653,10 +1657,10 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo,
           while (stlv_len >= 4) {
             ND_TCHECK_4(tptr);
             ND_PRINT("\n\t        T: %u, R: %u, RES: %u, ISID: %u",
           while (stlv_len >= 4) {
             ND_TCHECK_4(tptr);
             ND_PRINT("\n\t        T: %u, R: %u, RES: %u, ISID: %u",

-                    (EXTRACT_BE_U_4(tptr) >> 31),
-                    (EXTRACT_BE_U_4(tptr) >> 30) & 0x01,
-                    (EXTRACT_BE_U_4(tptr) >> 24) & 0x03f,
-                    (EXTRACT_BE_U_4(tptr)) & 0x0ffffff);
+                    (GET_BE_U_4(tptr) >> 31),
+                    (GET_BE_U_4(tptr) >> 30) & 0x01,
+                    (GET_BE_U_4(tptr) >> 24) & 0x03f,
+                    (GET_BE_U_4(tptr)) & 0x0ffffff);

 
             tptr = tptr + 4;
             len = len - 4;
 
             tptr = tptr + 4;
             len = len - 4;


@@ -1680,7 +1684,7 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo,
 
 /* shared routine for printing system, node and lsp-ids */
 static char *
 
 /* shared routine for printing system, node and lsp-ids */
 static char *

-isis_print_id(const uint8_t *cp, u_int id_len)
+isis_print_id(netdissect_options *ndo, const uint8_t *cp, u_int id_len)

 {
     u_int i;
     static char id[sizeof("xxxx.xxxx.xxxx.yy-zz")];
 {
     u_int i;
     static char id[sizeof("xxxx.xxxx.xxxx.yy-zz")];


@@ -1691,19 +1695,19 @@ isis_print_id(const uint8_t *cp, u_int id_len)
     if (sysid_len > id_len)
         sysid_len = id_len;
     for (i = 1; i <= sysid_len; i++) {
     if (sysid_len > id_len)
         sysid_len = id_len;
     for (i = 1; i <= sysid_len; i++) {

-        nd_snprintf(pos, sizeof(id) - (pos - id), "%02x", EXTRACT_U_1(cp));
+        nd_snprintf(pos, sizeof(id) - (pos - id), "%02x", GET_U_1(cp));

        cp++;
        pos += strlen(pos);
        if (i == 2 || i == 4)
            *pos++ = '.';
        }
     if (id_len >= NODE_ID_LEN) {
        cp++;
        pos += strlen(pos);
        if (i == 2 || i == 4)
            *pos++ = '.';
        }
     if (id_len >= NODE_ID_LEN) {

-        nd_snprintf(pos, sizeof(id) - (pos - id), ".%02x", EXTRACT_U_1(cp));
+        nd_snprintf(pos, sizeof(id) - (pos - id), ".%02x", GET_U_1(cp));

        cp++;
        pos += strlen(pos);
     }
     if (id_len == LSP_ID_LEN)
        cp++;
        pos += strlen(pos);
     }
     if (id_len == LSP_ID_LEN)

-        nd_snprintf(pos, sizeof(id) - (pos - id), "-%02x", EXTRACT_U_1(cp));
+        nd_snprintf(pos, sizeof(id) - (pos - id), "-%02x", GET_U_1(cp));

     return (id);
 }
 
     return (id);
 }
 


@@ -1748,10 +1752,9 @@ isis_print_tlv_ip_reach(netdissect_options *ndo,
                        return (0);
                }
 
                        return (0);
                }
 

-               if (!ND_TTEST_SIZE(tlv_ip_reach))
-                   return (0);
+               ND_TCHECK_SIZE(tlv_ip_reach);

 
 

-               prefix_len = mask2plen(EXTRACT_IPV4_TO_HOST_ORDER(tlv_ip_reach->mask));
+               prefix_len = mask2plen(GET_IPV4_TO_HOST_ORDER(tlv_ip_reach->mask));

 
                if (prefix_len == -1)
                        ND_PRINT("%sIPv4 prefix: %s mask %s",
 
                if (prefix_len == -1)
                        ND_PRINT("%sIPv4 prefix: %s mask %s",


@@ -1791,6 +1794,8 @@ isis_print_tlv_ip_reach(netdissect_options *ndo,
                tlv_ip_reach++;
        }
        return (1);
                tlv_ip_reach++;
        }
        return (1);

+trunc:
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -1815,8 +1820,8 @@ isis_print_ip_reach_subtlv(netdissect_options *ndo,
     case ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG32:
         while (subl >= 4) {
            ND_PRINT(", 0x%08x (=%u)",
     case ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG32:
         while (subl >= 4) {
            ND_PRINT(", 0x%08x (=%u)",

-                  EXTRACT_BE_U_4(tptr),
-                  EXTRACT_BE_U_4(tptr));
+                  GET_BE_U_4(tptr),
+                  GET_BE_U_4(tptr));

            tptr+=4;
            subl-=4;
        }
            tptr+=4;
            subl-=4;
        }


@@ -1824,8 +1829,8 @@ isis_print_ip_reach_subtlv(netdissect_options *ndo,
     case ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG64:
         while (subl >= 8) {
            ND_PRINT(", 0x%08x%08x",
     case ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG64:
         while (subl >= 8) {
            ND_PRINT(", 0x%08x%08x",

-                  EXTRACT_BE_U_4(tptr),
-                  EXTRACT_BE_U_4(tptr + 4));
+                  GET_BE_U_4(tptr),
+                  GET_BE_U_4(tptr + 4));

            tptr+=8;
            subl-=8;
        }
            tptr+=8;
            subl-=8;
        }


@@ -1861,30 +1866,27 @@ isis_print_ext_is_reach(netdissect_options *ndo,
         uint32_t i;
     } bw;
 
         uint32_t i;
     } bw;
 

-    if (!ND_TTEST_LEN(tptr, NODE_ID_LEN))
-        return(0);
+    ND_TCHECK_LEN(tptr, NODE_ID_LEN);

     if (tlv_remaining < NODE_ID_LEN)
         return(0);
 
     if (tlv_remaining < NODE_ID_LEN)
         return(0);
 

-    ND_PRINT("%sIS Neighbor: %s", ident, isis_print_id(tptr, NODE_ID_LEN));
+    ND_PRINT("%sIS Neighbor: %s", ident, isis_print_id(ndo, tptr, NODE_ID_LEN));

     tptr+=NODE_ID_LEN;
     tlv_remaining-=NODE_ID_LEN;
 
     if (tlv_type != ISIS_TLV_IS_ALIAS_ID) { /* the Alias TLV Metric field is implicit 0 */
     tptr+=NODE_ID_LEN;
     tlv_remaining-=NODE_ID_LEN;
 
     if (tlv_type != ISIS_TLV_IS_ALIAS_ID) { /* the Alias TLV Metric field is implicit 0 */

-        if (!ND_TTEST_3(tptr))    /* and is therefore skipped */
-           return(0);
+        ND_TCHECK_3(tptr);

        if (tlv_remaining < 3)
            return(0);
        if (tlv_remaining < 3)
            return(0);

-       ND_PRINT(", Metric: %u", EXTRACT_BE_U_3(tptr));
+       ND_PRINT(", Metric: %u", GET_BE_U_3(tptr));

        tptr+=3;
        tlv_remaining-=3;
     }
 
        tptr+=3;
        tlv_remaining-=3;
     }
 

-    if (!ND_TTEST_1(tptr))
-        return(0);
+    ND_TCHECK_1(tptr);

     if (tlv_remaining < 1)
         return(0);
     if (tlv_remaining < 1)
         return(0);

-    subtlv_sum_len=EXTRACT_U_1(tptr); /* read out subTLV length */
+    subtlv_sum_len=GET_U_1(tptr); /* read out subTLV length */

     tptr++;
     tlv_remaining--;
     proc_bytes=NODE_ID_LEN+3+1;
     tptr++;
     tlv_remaining--;
     proc_bytes=NODE_ID_LEN+3+1;


@@ -1895,8 +1897,7 @@ isis_print_ext_is_reach(netdissect_options *ndo,
         nd_snprintf(ident_buffer, sizeof(ident_buffer), "%s  ",ident);
         ident = ident_buffer;
         while (subtlv_sum_len != 0) {
         nd_snprintf(ident_buffer, sizeof(ident_buffer), "%s  ",ident);
         ident = ident_buffer;
         while (subtlv_sum_len != 0) {

-            if (!ND_TTEST_2(tptr))
-                return(0);
+            ND_TCHECK_2(tptr);

             if (tlv_remaining < 2) {
                 ND_PRINT("%sRemaining data in TLV shorter than a subTLV header",ident);
                 proc_bytes += tlv_remaining;
             if (tlv_remaining < 2) {
                 ND_PRINT("%sRemaining data in TLV shorter than a subTLV header",ident);
                 proc_bytes += tlv_remaining;


@@ -1907,8 +1908,8 @@ isis_print_ext_is_reach(netdissect_options *ndo,
                 proc_bytes += subtlv_sum_len;
                 break;
             }
                 proc_bytes += subtlv_sum_len;
                 break;
             }

-            subtlv_type=EXTRACT_U_1(tptr);
-            subtlv_len=EXTRACT_U_1(tptr + 1);
+            subtlv_type=GET_U_1(tptr);
+            subtlv_len=GET_U_1(tptr + 1);

             tptr += 2;
             tlv_remaining -= 2;
             subtlv_sum_len -= 2;
             tptr += 2;
             tlv_remaining -= 2;
             subtlv_sum_len -= 2;


@@ -1936,9 +1937,9 @@ isis_print_ext_is_reach(netdissect_options *ndo,
             case ISIS_SUBTLV_EXT_IS_REACH_LINK_LOCAL_REMOTE_ID:
             case ISIS_SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID:
                 if (subtlv_len >= 4) {
             case ISIS_SUBTLV_EXT_IS_REACH_LINK_LOCAL_REMOTE_ID:
             case ISIS_SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID:
                 if (subtlv_len >= 4) {

-                    ND_PRINT(", 0x%08x", EXTRACT_BE_U_4(tptr));
+                    ND_PRINT(", 0x%08x", GET_BE_U_4(tptr));

                     if (subtlv_len == 8) /* rfc4205 */
                     if (subtlv_len == 8) /* rfc4205 */

-                        ND_PRINT(", 0x%08x", EXTRACT_BE_U_4(tptr + 4));
+                        ND_PRINT(", 0x%08x", GET_BE_U_4(tptr + 4));

                 }
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR:
                 }
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR:


@@ -1949,14 +1950,14 @@ isis_print_ext_is_reach(netdissect_options *ndo,
             case ISIS_SUBTLV_EXT_IS_REACH_MAX_LINK_BW :
             case ISIS_SUBTLV_EXT_IS_REACH_RESERVABLE_BW:
                 if (subtlv_len >= 4) {
             case ISIS_SUBTLV_EXT_IS_REACH_MAX_LINK_BW :
             case ISIS_SUBTLV_EXT_IS_REACH_RESERVABLE_BW:
                 if (subtlv_len >= 4) {

-                    bw.i = EXTRACT_BE_U_4(tptr);
+                    bw.i = GET_BE_U_4(tptr);

                     ND_PRINT(", %.3f Mbps", bw.f * 8 / 1000000);
                 }
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_UNRESERVED_BW :
                 if (subtlv_len >= 32) {
                     for (te_class = 0; te_class < 8; te_class++) {
                     ND_PRINT(", %.3f Mbps", bw.f * 8 / 1000000);
                 }
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_UNRESERVED_BW :
                 if (subtlv_len >= 32) {
                     for (te_class = 0; te_class < 8; te_class++) {

-                        bw.i = EXTRACT_BE_U_4(tptr);
+                        bw.i = GET_BE_U_4(tptr);

                         ND_PRINT("%s  TE-Class %u: %.3f Mbps",
                                   ident,
                                   te_class,
                         ND_PRINT("%s  TE-Class %u: %.3f Mbps",
                                   ident,
                                   te_class,


@@ -1974,8 +1975,8 @@ isis_print_ext_is_reach(netdissect_options *ndo,
                     break;
                 ND_PRINT("%sBandwidth Constraints Model ID: %s (%u)",
                           ident,
                     break;
                 ND_PRINT("%sBandwidth Constraints Model ID: %s (%u)",
                           ident,

-                          tok2str(diffserv_te_bc_values, "unknown", EXTRACT_U_1(tptr)),
-                          EXTRACT_U_1(tptr));
+                          tok2str(diffserv_te_bc_values, "unknown", GET_U_1(tptr)),
+                          GET_U_1(tptr));

                 tptr++;
                 subtlv_len--;
                 subtlv_sum_len--;
                 tptr++;
                 subtlv_len--;
                 subtlv_sum_len--;


@@ -1984,7 +1985,7 @@ isis_print_ext_is_reach(netdissect_options *ndo,
                 for (te_class = 0; subtlv_len != 0; te_class++) {
                     if (subtlv_len < 4)
                         break;
                 for (te_class = 0; subtlv_len != 0; te_class++) {
                     if (subtlv_len < 4)
                         break;

-                    bw.i = EXTRACT_BE_U_4(tptr);
+                    bw.i = GET_BE_U_4(tptr);

                     ND_PRINT("%s  Bandwidth constraint CT%u: %.3f Mbps",
                               ident,
                               te_class,
                     ND_PRINT("%s  Bandwidth constraint CT%u: %.3f Mbps",
                               ident,
                               te_class,


@@ -1997,54 +1998,54 @@ isis_print_ext_is_reach(netdissect_options *ndo,
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_TE_METRIC:
                 if (subtlv_len >= 3)
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_TE_METRIC:
                 if (subtlv_len >= 3)

-                    ND_PRINT(", %u", EXTRACT_BE_U_3(tptr));
+                    ND_PRINT(", %u", GET_BE_U_3(tptr));

                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_LINK_ATTRIBUTE:
                 if (subtlv_len == 2) {
                     ND_PRINT(", [ %s ] (0x%04x)",
                               bittok2str(isis_subtlv_link_attribute_values,
                                          "Unknown",
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_LINK_ATTRIBUTE:
                 if (subtlv_len == 2) {
                     ND_PRINT(", [ %s ] (0x%04x)",
                               bittok2str(isis_subtlv_link_attribute_values,
                                          "Unknown",

-                                         EXTRACT_BE_U_2(tptr)),
-                              EXTRACT_BE_U_2(tptr));
+                                         GET_BE_U_2(tptr)),
+                              GET_BE_U_2(tptr));

                 }
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE:
                 if (subtlv_len >= 2) {
                     ND_PRINT(", %s, Priority %u",
                 }
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE:
                 if (subtlv_len >= 2) {
                     ND_PRINT(", %s, Priority %u",

-                              bittok2str(gmpls_link_prot_values, "none", EXTRACT_U_1(tptr)),
-                              EXTRACT_U_1(tptr + 1));
+                              bittok2str(gmpls_link_prot_values, "none", GET_U_1(tptr)),
+                              GET_U_1(tptr + 1));

                 }
                 break;
             case ISIS_SUBTLV_SPB_METRIC:
                 if (subtlv_len >= 6) {
                 }
                 break;
             case ISIS_SUBTLV_SPB_METRIC:
                 if (subtlv_len >= 6) {

-                    ND_PRINT(", LM: %u", EXTRACT_BE_U_3(tptr));
+                    ND_PRINT(", LM: %u", GET_BE_U_3(tptr));

                     tptr += 3;
                     subtlv_len -= 3;
                     subtlv_sum_len -= 3;
                     proc_bytes += 3;
                     tptr += 3;
                     subtlv_len -= 3;
                     subtlv_sum_len -= 3;
                     proc_bytes += 3;

-                    ND_PRINT(", P: %u", EXTRACT_U_1(tptr));
+                    ND_PRINT(", P: %u", GET_U_1(tptr));

                     tptr++;
                     subtlv_len--;
                     subtlv_sum_len--;
                     proc_bytes++;
                     tptr++;
                     subtlv_len--;
                     subtlv_sum_len--;
                     proc_bytes++;

-                    ND_PRINT(", P-ID: %u", EXTRACT_BE_U_2(tptr));
+                    ND_PRINT(", P-ID: %u", GET_BE_U_2(tptr));

                 }
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR:
                 if (subtlv_len >= 36) {
                 }
                 break;
             case ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR:
                 if (subtlv_len >= 36) {

-                    gmpls_switch_cap = EXTRACT_U_1(tptr);
+                    gmpls_switch_cap = GET_U_1(tptr);

                     ND_PRINT("%s  Interface Switching Capability:%s",
                               ident,
                               tok2str(gmpls_switch_cap_values, "Unknown", gmpls_switch_cap));
                     ND_PRINT(", LSP Encoding: %s",
                     ND_PRINT("%s  Interface Switching Capability:%s",
                               ident,
                               tok2str(gmpls_switch_cap_values, "Unknown", gmpls_switch_cap));
                     ND_PRINT(", LSP Encoding: %s",

-                              tok2str(gmpls_encoding_values, "Unknown", EXTRACT_U_1((tptr + 1))));
+                              tok2str(gmpls_encoding_values, "Unknown", GET_U_1((tptr + 1))));

                     tptr += 4;
                     subtlv_len -= 4;
                     subtlv_sum_len -= 4;
                     proc_bytes += 4;
                     ND_PRINT("%s  Max LSP Bandwidth:", ident);
                     for (priority_level = 0; priority_level < 8; priority_level++) {
                     tptr += 4;
                     subtlv_len -= 4;
                     subtlv_sum_len -= 4;
                     proc_bytes += 4;
                     ND_PRINT("%s  Max LSP Bandwidth:", ident);
                     for (priority_level = 0; priority_level < 8; priority_level++) {

-                        bw.i = EXTRACT_BE_U_4(tptr);
+                        bw.i = GET_BE_U_4(tptr);

                         ND_PRINT("%s    priority level %u: %.3f Mbps",
                                   ident,
                                   priority_level,
                         ND_PRINT("%s    priority level %u: %.3f Mbps",
                                   ident,
                                   priority_level,


@@ -2061,17 +2062,18 @@ isis_print_ext_is_reach(netdissect_options *ndo,
                     case GMPLS_PSC4:
                         if (subtlv_len < 6)
                             break;
                     case GMPLS_PSC4:
                         if (subtlv_len < 6)
                             break;

-                        bw.i = EXTRACT_BE_U_4(tptr);
+                        bw.i = GET_BE_U_4(tptr);

                         ND_PRINT("%s  Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000);
                         ND_PRINT("%s  Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000);

-                        ND_PRINT("%s  Interface MTU: %u", ident, EXTRACT_BE_U_2(tptr + 4));
+                        ND_PRINT("%s  Interface MTU: %u", ident,
+                                 GET_BE_U_2(tptr + 4));

                         break;
                     case GMPLS_TSC:
                         if (subtlv_len < 8)
                             break;
                         break;
                     case GMPLS_TSC:
                         if (subtlv_len < 8)
                             break;

-                        bw.i = EXTRACT_BE_U_4(tptr);
+                        bw.i = GET_BE_U_4(tptr);

                         ND_PRINT("%s  Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000);
                         ND_PRINT("%s  Indication %s", ident,
                         ND_PRINT("%s  Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000);
                         ND_PRINT("%s  Indication %s", ident,

-                                  tok2str(gmpls_switch_cap_tsc_indication_values, "Unknown (%u)", EXTRACT_U_1((tptr + 4))));
+                                  tok2str(gmpls_switch_cap_tsc_indication_values, "Unknown (%u)", GET_U_1((tptr + 4))));

                         break;
                     default:
                         /* there is some optional stuff left to decode but this is as of yet
                         break;
                     default:
                         /* there is some optional stuff left to decode but this is as of yet


@@ -2110,20 +2112,21 @@ static u_int
 isis_print_mtid(netdissect_options *ndo,
                 const uint8_t *tptr, const char *ident)
 {
 isis_print_mtid(netdissect_options *ndo,
                 const uint8_t *tptr, const char *ident)
 {

-    if (!ND_TTEST_2(tptr))
-        return(0);
+    ND_TCHECK_2(tptr);

 
     ND_PRINT("%s%s",
            ident,
            tok2str(isis_mt_values,
                    "Reserved for IETF Consensus",
 
     ND_PRINT("%s%s",
            ident,
            tok2str(isis_mt_values,
                    "Reserved for IETF Consensus",

-                   ISIS_MASK_MTID(EXTRACT_BE_U_2(tptr))));
+                   ISIS_MASK_MTID(GET_BE_U_2(tptr))));

 
     ND_PRINT(" Topology (0x%03x), Flags: [%s]",
 
     ND_PRINT(" Topology (0x%03x), Flags: [%s]",

-           ISIS_MASK_MTID(EXTRACT_BE_U_2(tptr)),
-           bittok2str(isis_mt_flag_values, "none",ISIS_MASK_MTFLAGS(EXTRACT_BE_U_2(tptr))));
+           ISIS_MASK_MTID(GET_BE_U_2(tptr)),
+           bittok2str(isis_mt_flag_values, "none",ISIS_MASK_MTFLAGS(GET_BE_U_2(tptr))));

 
     return(2);
 
     return(2);

+trunc:
+    return 0;

 }
 
 /*
 }
 
 /*


@@ -2141,16 +2144,14 @@ isis_print_extd_ip_reach(netdissect_options *ndo,
     uint8_t prefix[sizeof(nd_ipv6)]; /* shared copy buffer for IPv4 and IPv6 prefixes */
     u_int metric, status_byte, bit_length, byte_length, sublen, processed, subtlvtype, subtlvlen;
 
     uint8_t prefix[sizeof(nd_ipv6)]; /* shared copy buffer for IPv4 and IPv6 prefixes */
     u_int metric, status_byte, bit_length, byte_length, sublen, processed, subtlvtype, subtlvlen;
 

-    if (!ND_TTEST_4(tptr))
-        return (0);
-    metric = EXTRACT_BE_U_4(tptr);
+    ND_TCHECK_4(tptr);
+    metric = GET_BE_U_4(tptr);

     processed=4;
     tptr+=4;
 
     if (afi == AF_INET) {
     processed=4;
     tptr+=4;
 
     if (afi == AF_INET) {

-        if (!ND_TTEST_1(tptr)) /* fetch status byte */
-            return (0);
-        status_byte=EXTRACT_U_1(tptr);
+        ND_TCHECK_1(tptr);
+        status_byte=GET_U_1(tptr);

         tptr++;
         bit_length = status_byte&0x3f;
         if (bit_length > 32) {
         tptr++;
         bit_length = status_byte&0x3f;
         if (bit_length > 32) {


@@ -2161,10 +2162,9 @@ isis_print_extd_ip_reach(netdissect_options *ndo,
         }
         processed++;
     } else if (afi == AF_INET6) {
         }
         processed++;
     } else if (afi == AF_INET6) {

-        if (!ND_TTEST_2(tptr)) /* fetch status & prefix_len byte */
-            return (0);
-        status_byte=EXTRACT_U_1(tptr);
-        bit_length=EXTRACT_U_1(tptr + 1);
+        ND_TCHECK_2(tptr);
+        status_byte=GET_U_1(tptr);
+        bit_length=GET_U_1(tptr + 1);

         if (bit_length > 128) {
             ND_PRINT("%sIPv6 prefix: bad bit length %u",
                    ident,
         if (bit_length > 128) {
             ND_PRINT("%sIPv6 prefix: bad bit length %u",
                    ident,


@@ -2178,8 +2178,7 @@ isis_print_extd_ip_reach(netdissect_options *ndo,
 
     byte_length = (bit_length + 7) / 8; /* prefix has variable length encoding */
 
 
     byte_length = (bit_length + 7) / 8; /* prefix has variable length encoding */
 

-    if (!ND_TTEST_LEN(tptr, byte_length))
-        return (0);
+    ND_TCHECK_LEN(tptr, byte_length);

     memset(prefix, 0, sizeof(prefix));   /* clear the copy buffer */
     memcpy(prefix,tptr,byte_length);    /* copy as much as is stored in the TLV */
     tptr+=byte_length;
     memset(prefix, 0, sizeof(prefix));   /* clear the copy buffer */
     memcpy(prefix,tptr,byte_length);    /* copy as much as is stored in the TLV */
     tptr+=byte_length;


@@ -2214,18 +2213,16 @@ isis_print_extd_ip_reach(netdissect_options *ndo,
            than one subTLV - therefore the first byte must reflect
            the aggregate bytecount of the subTLVs for this prefix
         */
            than one subTLV - therefore the first byte must reflect
            the aggregate bytecount of the subTLVs for this prefix
         */

-        if (!ND_TTEST_1(tptr))
-            return (0);
-        sublen=EXTRACT_U_1(tptr);
+        ND_TCHECK_1(tptr);
+        sublen=GET_U_1(tptr);

         tptr++;
         processed+=sublen+1;
         ND_PRINT(" (%u)", sublen);   /* print out subTLV length */
 
         while (sublen>0) {
         tptr++;
         processed+=sublen+1;
         ND_PRINT(" (%u)", sublen);   /* print out subTLV length */
 
         while (sublen>0) {

-            if (!ND_TTEST_2(tptr))
-                return (0);
-            subtlvtype=EXTRACT_U_1(tptr);
-            subtlvlen=EXTRACT_U_1(tptr + 1);
+            ND_TCHECK_2(tptr);
+            subtlvtype=GET_U_1(tptr);
+            subtlvlen=GET_U_1(tptr + 1);

             tptr+=2;
             /* prepend the indent string */
             nd_snprintf(ident_buffer, sizeof(ident_buffer), "%s  ",ident);
             tptr+=2;
             /* prepend the indent string */
             nd_snprintf(ident_buffer, sizeof(ident_buffer), "%s  ",ident);


@@ -2236,6 +2233,8 @@ isis_print_extd_ip_reach(netdissect_options *ndo,
         }
     }
     return (processed);
         }
     }
     return (processed);

+trunc:
+    return 0;

 }
 
 /*
 }
 
 /*


@@ -2275,7 +2274,7 @@ isis_print(netdissect_options *ndo,
     const struct isis_tlv_es_reach *tlv_es_reach;
 
     uint8_t version, pdu_version, fixed_len;
     const struct isis_tlv_es_reach *tlv_es_reach;
 
     uint8_t version, pdu_version, fixed_len;

-    uint8_t pdu_type, pdu_max_area, max_area, pdu_id_length, id_length, tlv_type, tlv_len, tmp, alen, lan_alen, prefix_len;
+    uint8_t pdu_type, pdu_max_area, max_area, pdu_id_length, id_length, tlv_type, tlv_len, tlen, alen, lan_alen, prefix_len;

     u_int ext_is_len, ext_ip_len, mt_len;
     uint8_t isis_subtlv_idrp;
     const uint8_t *optr, *pptr, *tptr;
     u_int ext_is_len, ext_ip_len, mt_len;
     uint8_t isis_subtlv_idrp;
     const uint8_t *optr, *pptr, *tptr;


@@ -2307,26 +2306,26 @@ isis_print(netdissect_options *ndo,
      * Sanity checking of the header.
      */
 
      * Sanity checking of the header.
      */
 

-    version = EXTRACT_U_1(isis_header->version);
+    version = GET_U_1(isis_header->version);

     if (version != ISIS_VERSION) {
        ND_PRINT("version %u packet not supported", version);
        return (0);
     }
 
     if (version != ISIS_VERSION) {
        ND_PRINT("version %u packet not supported", version);
        return (0);
     }
 

-    pdu_id_length = EXTRACT_U_1(isis_header->id_length);
+    pdu_id_length = GET_U_1(isis_header->id_length);

     if ((pdu_id_length != SYSTEM_ID_LEN) && (pdu_id_length != 0)) {
        ND_PRINT("system ID length of %u is not supported",
               pdu_id_length);
        return (0);
     }
 
     if ((pdu_id_length != SYSTEM_ID_LEN) && (pdu_id_length != 0)) {
        ND_PRINT("system ID length of %u is not supported",
               pdu_id_length);
        return (0);
     }
 

-    pdu_version = EXTRACT_U_1(isis_header->pdu_version);
+    pdu_version = GET_U_1(isis_header->pdu_version);

     if (pdu_version != ISIS_VERSION) {
        ND_PRINT("version %u packet not supported", pdu_version);
        return (0);
     }
 
     if (pdu_version != ISIS_VERSION) {
        ND_PRINT("version %u packet not supported", pdu_version);
        return (0);
     }
 

-    fixed_len = EXTRACT_U_1(isis_header->fixed_len);
+    fixed_len = GET_U_1(isis_header->fixed_len);

     if (length < fixed_len) {
        ND_PRINT("fixed header length %u > packet length %u", fixed_len, length);
        return (0);
     if (length < fixed_len) {
        ND_PRINT("fixed header length %u > packet length %u", fixed_len, length);
        return (0);


@@ -2337,7 +2336,7 @@ isis_print(netdissect_options *ndo,
        return (0);
     }
 
        return (0);
     }
 

-    pdu_max_area = EXTRACT_U_1(isis_header->max_area);
+    pdu_max_area = GET_U_1(isis_header->max_area);

     switch(pdu_max_area) {
     case 0:
        max_area = 3;    /* silly shit */
     switch(pdu_max_area) {
     case 0:
        max_area = 3;    /* silly shit */


@@ -2378,7 +2377,7 @@ isis_print(netdissect_options *ndo,
        return (0);
     }
 
        return (0);
     }
 

-    pdu_type = EXTRACT_U_1(isis_header->pdu_type);
+    pdu_type = GET_U_1(isis_header->pdu_type);

 
     /* in non-verbose mode print the basic PDU Type plus PDU specific brief information*/
     if (ndo->ndo_vflag == 0) {
 
     /* in non-verbose mode print the basic PDU Type plus PDU specific brief information*/
     if (ndo->ndo_vflag == 0) {


@@ -2421,29 +2420,29 @@ isis_print(netdissect_options *ndo,
             goto trunc;
         if (ndo->ndo_vflag == 0) {
             ND_PRINT(", src-id %s",
             goto trunc;
         if (ndo->ndo_vflag == 0) {
             ND_PRINT(", src-id %s",

-                      isis_print_id(header_iih_lan->source_id, SYSTEM_ID_LEN));
+                      isis_print_id(ndo, header_iih_lan->source_id, SYSTEM_ID_LEN));

             ND_PRINT(", lan-id %s, prio %u",
             ND_PRINT(", lan-id %s, prio %u",

-                      isis_print_id(header_iih_lan->lan_id,NODE_ID_LEN),
-                      EXTRACT_U_1(header_iih_lan->priority));
+                      isis_print_id(ndo, header_iih_lan->lan_id,NODE_ID_LEN),
+                      GET_U_1(header_iih_lan->priority));

             ND_PRINT(", length %u", length);
             return (1);
         }
             ND_PRINT(", length %u", length);
             return (1);
         }

-        pdu_len=EXTRACT_BE_U_2(header_iih_lan->pdu_len);
+        pdu_len=GET_BE_U_2(header_iih_lan->pdu_len);

         if (packet_len>pdu_len) {
            packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
            length=pdu_len;
         }
 
         ND_PRINT("\n\t  source-id: %s,  holding time: %us, Flags: [%s]",
         if (packet_len>pdu_len) {
            packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
            length=pdu_len;
         }
 
         ND_PRINT("\n\t  source-id: %s,  holding time: %us, Flags: [%s]",

-                  isis_print_id(header_iih_lan->source_id,SYSTEM_ID_LEN),
-                  EXTRACT_BE_U_2(header_iih_lan->holding_time),
+                  isis_print_id(ndo, header_iih_lan->source_id,SYSTEM_ID_LEN),
+                  GET_BE_U_2(header_iih_lan->holding_time),

                   tok2str(isis_iih_circuit_type_values,
                           "unknown circuit type 0x%02x",
                   tok2str(isis_iih_circuit_type_values,
                           "unknown circuit type 0x%02x",

-                          EXTRACT_U_1(header_iih_lan->circuit_type)));
+                          GET_U_1(header_iih_lan->circuit_type)));

 
         ND_PRINT("\n\t  lan-id:    %s, Priority: %u, PDU length: %u",
 
         ND_PRINT("\n\t  lan-id:    %s, Priority: %u, PDU length: %u",

-                  isis_print_id(header_iih_lan->lan_id, NODE_ID_LEN),
-                  EXTRACT_U_1(header_iih_lan->priority) & ISIS_LAN_PRIORITY_MASK,
+                  isis_print_id(ndo, header_iih_lan->lan_id, NODE_ID_LEN),
+                  GET_U_1(header_iih_lan->priority) & ISIS_LAN_PRIORITY_MASK,

                   pdu_len);
 
         if (ndo->ndo_vflag > 1) {
                   pdu_len);
 
         if (ndo->ndo_vflag > 1) {


@@ -2465,25 +2464,25 @@ isis_print(netdissect_options *ndo,
         if (length < ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE)
             goto trunc;
         if (ndo->ndo_vflag == 0) {
         if (length < ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE)
             goto trunc;
         if (ndo->ndo_vflag == 0) {

-            ND_PRINT(", src-id %s", isis_print_id(header_iih_ptp->source_id, SYSTEM_ID_LEN));
+            ND_PRINT(", src-id %s", isis_print_id(ndo, header_iih_ptp->source_id, SYSTEM_ID_LEN));

             ND_PRINT(", length %u", length);
             return (1);
         }
             ND_PRINT(", length %u", length);
             return (1);
         }

-        pdu_len=EXTRACT_BE_U_2(header_iih_ptp->pdu_len);
+        pdu_len=GET_BE_U_2(header_iih_ptp->pdu_len);

         if (packet_len>pdu_len) {
             packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
             length=pdu_len;
         }
 
         ND_PRINT("\n\t  source-id: %s, holding time: %us, Flags: [%s]",
         if (packet_len>pdu_len) {
             packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
             length=pdu_len;
         }
 
         ND_PRINT("\n\t  source-id: %s, holding time: %us, Flags: [%s]",

-                  isis_print_id(header_iih_ptp->source_id,SYSTEM_ID_LEN),
-                  EXTRACT_BE_U_2(header_iih_ptp->holding_time),
+                  isis_print_id(ndo, header_iih_ptp->source_id,SYSTEM_ID_LEN),
+                  GET_BE_U_2(header_iih_ptp->holding_time),

                   tok2str(isis_iih_circuit_type_values,
                           "unknown circuit type 0x%02x",
                   tok2str(isis_iih_circuit_type_values,
                           "unknown circuit type 0x%02x",

-                          EXTRACT_U_1(header_iih_ptp->circuit_type)));
+                          GET_U_1(header_iih_ptp->circuit_type)));

 
         ND_PRINT("\n\t  circuit-id: 0x%02x, PDU length: %u",
 
         ND_PRINT("\n\t  circuit-id: 0x%02x, PDU length: %u",

-                  EXTRACT_U_1(header_iih_ptp->circuit_id),
+                  GET_U_1(header_iih_ptp->circuit_id),

                   pdu_len);
 
         if (ndo->ndo_vflag > 1) {
                   pdu_len);
 
         if (ndo->ndo_vflag > 1) {


@@ -2507,26 +2506,26 @@ isis_print(netdissect_options *ndo,
             goto trunc;
         if (ndo->ndo_vflag == 0) {
             ND_PRINT(", lsp-id %s, seq 0x%08x, lifetime %5us",
             goto trunc;
         if (ndo->ndo_vflag == 0) {
             ND_PRINT(", lsp-id %s, seq 0x%08x, lifetime %5us",

-                      isis_print_id(header_lsp->lsp_id, LSP_ID_LEN),
-                      EXTRACT_BE_U_4(header_lsp->sequence_number),
-                      EXTRACT_BE_U_2(header_lsp->remaining_lifetime));
+                      isis_print_id(ndo, header_lsp->lsp_id, LSP_ID_LEN),
+                      GET_BE_U_4(header_lsp->sequence_number),
+                      GET_BE_U_2(header_lsp->remaining_lifetime));

             ND_PRINT(", length %u", length);
             return (1);
         }
             ND_PRINT(", length %u", length);
             return (1);
         }

-        pdu_len=EXTRACT_BE_U_2(header_lsp->pdu_len);
+        pdu_len=GET_BE_U_2(header_lsp->pdu_len);

         if (packet_len>pdu_len) {
             packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
             length=pdu_len;
         }
 
         ND_PRINT("\n\t  lsp-id: %s, seq: 0x%08x, lifetime: %5us\n\t  chksum: 0x%04x",
         if (packet_len>pdu_len) {
             packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
             length=pdu_len;
         }
 
         ND_PRINT("\n\t  lsp-id: %s, seq: 0x%08x, lifetime: %5us\n\t  chksum: 0x%04x",

-               isis_print_id(header_lsp->lsp_id, LSP_ID_LEN),
-               EXTRACT_BE_U_4(header_lsp->sequence_number),
-               EXTRACT_BE_U_2(header_lsp->remaining_lifetime),
-               EXTRACT_BE_U_2(header_lsp->checksum));
+               isis_print_id(ndo, header_lsp->lsp_id, LSP_ID_LEN),
+               GET_BE_U_4(header_lsp->sequence_number),
+               GET_BE_U_2(header_lsp->remaining_lifetime),
+               GET_BE_U_2(header_lsp->checksum));

 
         osi_print_cksum(ndo, (const uint8_t *)header_lsp->lsp_id,
 
         osi_print_cksum(ndo, (const uint8_t *)header_lsp->lsp_id,

-                        EXTRACT_BE_U_2(header_lsp->checksum),
+                        GET_BE_U_2(header_lsp->checksum),

                         12, length-12);
 
         ND_PRINT(", PDU length: %u, Flags: [ %s",
                         12, length-12);
 
         ND_PRINT(", PDU length: %u, Flags: [ %s",


@@ -2564,23 +2563,23 @@ isis_print(netdissect_options *ndo,
         if (length < ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE)
             goto trunc;
         if (ndo->ndo_vflag == 0) {
         if (length < ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE)
             goto trunc;
         if (ndo->ndo_vflag == 0) {

-            ND_PRINT(", src-id %s", isis_print_id(header_csnp->source_id, NODE_ID_LEN));
+            ND_PRINT(", src-id %s", isis_print_id(ndo, header_csnp->source_id, NODE_ID_LEN));

             ND_PRINT(", length %u", length);
             return (1);
         }
             ND_PRINT(", length %u", length);
             return (1);
         }

-        pdu_len=EXTRACT_BE_U_2(header_csnp->pdu_len);
+        pdu_len=GET_BE_U_2(header_csnp->pdu_len);

         if (packet_len>pdu_len) {
             packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
             length=pdu_len;
         }
 
         ND_PRINT("\n\t  source-id:    %s, PDU length: %u",
         if (packet_len>pdu_len) {
             packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
             length=pdu_len;
         }
 
         ND_PRINT("\n\t  source-id:    %s, PDU length: %u",

-               isis_print_id(header_csnp->source_id, NODE_ID_LEN),
+               isis_print_id(ndo, header_csnp->source_id, NODE_ID_LEN),

                pdu_len);
         ND_PRINT("\n\t  start lsp-id: %s",
                pdu_len);
         ND_PRINT("\n\t  start lsp-id: %s",

-               isis_print_id(header_csnp->start_lsp_id, LSP_ID_LEN));
+               isis_print_id(ndo, header_csnp->start_lsp_id, LSP_ID_LEN));

         ND_PRINT("\n\t  end lsp-id:   %s",
         ND_PRINT("\n\t  end lsp-id:   %s",

-               isis_print_id(header_csnp->end_lsp_id, LSP_ID_LEN));
+               isis_print_id(ndo, header_csnp->end_lsp_id, LSP_ID_LEN));

 
         if (ndo->ndo_vflag > 1) {
             if (!print_unknown_data(ndo, pptr, "\n\t  ", ISIS_CSNP_HEADER_SIZE))
 
         if (ndo->ndo_vflag > 1) {
             if (!print_unknown_data(ndo, pptr, "\n\t  ", ISIS_CSNP_HEADER_SIZE))


@@ -2602,18 +2601,18 @@ isis_print(netdissect_options *ndo,
         if (length < ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE)
             goto trunc;
         if (ndo->ndo_vflag == 0) {
         if (length < ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE)
             goto trunc;
         if (ndo->ndo_vflag == 0) {

-            ND_PRINT(", src-id %s", isis_print_id(header_psnp->source_id, NODE_ID_LEN));
+            ND_PRINT(", src-id %s", isis_print_id(ndo, header_psnp->source_id, NODE_ID_LEN));

             ND_PRINT(", length %u", length);
             return (1);
         }
             ND_PRINT(", length %u", length);
             return (1);
         }

-        pdu_len=EXTRACT_BE_U_2(header_psnp->pdu_len);
+        pdu_len=GET_BE_U_2(header_psnp->pdu_len);

         if (packet_len>pdu_len) {
             packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
             length=pdu_len;
         }
 
         ND_PRINT("\n\t  source-id:    %s, PDU length: %u",
         if (packet_len>pdu_len) {
             packet_len=pdu_len; /* do TLV decoding as long as it makes sense */
             length=pdu_len;
         }
 
         ND_PRINT("\n\t  source-id:    %s, PDU length: %u",

-               isis_print_id(header_psnp->source_id, NODE_ID_LEN),
+               isis_print_id(ndo, header_psnp->source_id, NODE_ID_LEN),

                pdu_len);
 
         if (ndo->ndo_vflag > 1) {
                pdu_len);
 
         if (ndo->ndo_vflag > 1) {


@@ -2642,11 +2641,11 @@ isis_print(netdissect_options *ndo,
        ND_TCHECK_2(pptr);
        if (packet_len < 2)
            goto trunc;
        ND_TCHECK_2(pptr);
        if (packet_len < 2)
            goto trunc;

-       tlv_type = EXTRACT_U_1(pptr);
-       tlv_len = EXTRACT_U_1(pptr + 1);
+       tlv_type = GET_U_1(pptr);
+       tlv_len = GET_U_1(pptr + 1);

        pptr += 2;
        packet_len -= 2;
        pptr += 2;
        packet_len -= 2;

-        tmp =tlv_len; /* copy temporary len & pointer to packet data */
+        tlen = tlv_len; /* copy temporary len & pointer to packet data */

         tptr = pptr;
 
         /* first lets see if we know the TLVs name*/
         tptr = pptr;
 
         /* first lets see if we know the TLVs name*/


@@ -2667,47 +2666,47 @@ isis_print(netdissect_options *ndo,
        switch (tlv_type) {
        case ISIS_TLV_AREA_ADDR:
            ND_TCHECK_1(tptr);
        switch (tlv_type) {
        case ISIS_TLV_AREA_ADDR:
            ND_TCHECK_1(tptr);

-           alen = EXTRACT_U_1(tptr);
+           alen = GET_U_1(tptr);

            tptr++;
            tptr++;

-           while (tmp && alen < tmp) {
+           while (tlen && alen < tlen) {

                ND_TCHECK_LEN(tptr, alen);
                ND_PRINT("\n\t      Area address (length: %u): %s",
                        alen,
                        isonsap_string(ndo, tptr, alen));
                tptr += alen;
                ND_TCHECK_LEN(tptr, alen);
                ND_PRINT("\n\t      Area address (length: %u): %s",
                        alen,
                        isonsap_string(ndo, tptr, alen));
                tptr += alen;

-               tmp -= alen + 1;
-               if (tmp==0) /* if this is the last area address do not attempt a boundary check */
+               tlen -= alen + 1;
+               if (tlen==0) /* if this is the last area address do not attempt a boundary check */

                     break;
                ND_TCHECK_1(tptr);
                     break;
                ND_TCHECK_1(tptr);

-               alen = EXTRACT_U_1(tptr);
+               alen = GET_U_1(tptr);

                tptr++;
            }
            break;
        case ISIS_TLV_ISNEIGH:
                tptr++;
            }
            break;
        case ISIS_TLV_ISNEIGH:

-           while (tmp >= MAC_ADDR_LEN) {
+           while (tlen >= MAC_ADDR_LEN) {

                 ND_TCHECK_LEN(tptr, MAC_ADDR_LEN);
                 ND_TCHECK_LEN(tptr, MAC_ADDR_LEN);

-                ND_PRINT("\n\t      SNPA: %s", isis_print_id(tptr, MAC_ADDR_LEN));
-                tmp -= MAC_ADDR_LEN;
+                ND_PRINT("\n\t      SNPA: %s", isis_print_id(ndo, tptr, MAC_ADDR_LEN));
+                tlen -= MAC_ADDR_LEN;

                 tptr += MAC_ADDR_LEN;
            }
            break;
 
         case ISIS_TLV_ISNEIGH_VARLEN:
                 tptr += MAC_ADDR_LEN;
            }
            break;
 
         case ISIS_TLV_ISNEIGH_VARLEN:

-            if (!ND_TTEST_1(tptr) || tmp < 3) /* min. TLV length */
+            if (!ND_TTEST_1(tptr) || tlen < 3) /* min. TLV length */

                goto trunc;
                goto trunc;

-           lan_alen = EXTRACT_U_1(tptr); /* LAN address length */
+           lan_alen = GET_U_1(tptr); /* LAN address length */

            tptr++;
            if (lan_alen == 0) {
                 ND_PRINT("\n\t      LAN address length 0 bytes");
                 nd_print_invalid(ndo);
                 break;
             }
            tptr++;
            if (lan_alen == 0) {
                 ND_PRINT("\n\t      LAN address length 0 bytes");
                 nd_print_invalid(ndo);
                 break;
             }

-            tmp --;
+            tlen --;

             ND_PRINT("\n\t      LAN address length %u bytes ", lan_alen);
             ND_PRINT("\n\t      LAN address length %u bytes ", lan_alen);

-           while (tmp >= lan_alen) {
+           while (tlen >= lan_alen) {

                 ND_TCHECK_LEN(tptr, lan_alen);
                 ND_TCHECK_LEN(tptr, lan_alen);

-                ND_PRINT("\n\t\tIS Neighbor: %s", isis_print_id(tptr, lan_alen));
-                tmp -= lan_alen;
+                ND_PRINT("\n\t\tIS Neighbor: %s", isis_print_id(ndo, tptr, lan_alen));
+                tlen -= lan_alen;

                 tptr +=lan_alen;
             }
             break;
                 tptr +=lan_alen;
             }
             break;


@@ -2720,33 +2719,47 @@ isis_print(netdissect_options *ndo,
             if (mt_len == 0) /* did something go wrong ? */
                 goto trunc;
             tptr+=mt_len;
             if (mt_len == 0) /* did something go wrong ? */
                 goto trunc;
             tptr+=mt_len;

-            tmp-=mt_len;
-            while (tmp >= 2+NODE_ID_LEN+3+1) {
-                ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t      ", tlv_type, tmp);
+            tlen-=mt_len;
+            while (tlen >= 2+NODE_ID_LEN+3+1) {
+                ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t      ", tlv_type, tlen);

                 if (ext_is_len == 0) /* did something go wrong ? */
                     goto trunc;
                 if (ext_is_len == 0) /* did something go wrong ? */
                     goto trunc;

-
-                tmp-=ext_is_len;
+                if (tlen < ext_is_len) {
+                    ND_PRINT(" [remaining tlv length %u < %u]", tlen, ext_is_len);
+                    nd_print_invalid(ndo);
+                    break;
+                }
+                tlen-=ext_is_len;

                 tptr+=ext_is_len;
             }
             break;
 
         case ISIS_TLV_IS_ALIAS_ID:
                 tptr+=ext_is_len;
             }
             break;
 
         case ISIS_TLV_IS_ALIAS_ID:

-           while (tmp >= NODE_ID_LEN+1) { /* is it worth attempting a decode ? */
-               ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t      ", tlv_type, tmp);
-               if (ext_is_len == 0) /* did something go wrong ? */
-                   goto trunc;
-               tmp-=ext_is_len;
-               tptr+=ext_is_len;
-           }
-           break;
+            while (tlen >= NODE_ID_LEN+1) { /* is it worth attempting a decode ? */
+                ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t      ", tlv_type, tlen);
+                if (ext_is_len == 0) /* did something go wrong ? */
+                    goto trunc;
+                if (tlen < ext_is_len) {
+                    ND_PRINT(" [remaining tlv length %u < %u]", tlen, ext_is_len);
+                    nd_print_invalid(ndo);
+                    break;
+                }
+                tlen-=ext_is_len;
+                tptr+=ext_is_len;
+            }
+            break;

 
         case ISIS_TLV_EXT_IS_REACH:
 
         case ISIS_TLV_EXT_IS_REACH:

-            while (tmp >= NODE_ID_LEN+3+1) { /* is it worth attempting a decode ? */
-                ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t      ", tlv_type, tmp);
+            while (tlen >= NODE_ID_LEN+3+1) { /* is it worth attempting a decode ? */
+                ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t      ", tlv_type, tlen);

                 if (ext_is_len == 0) /* did something go wrong ? */
                     goto trunc;
                 if (ext_is_len == 0) /* did something go wrong ? */
                     goto trunc;

-                tmp-=ext_is_len;
+                if (tlen < ext_is_len) {
+                    ND_PRINT(" [remaining tlv length %u < %u]", tlen, ext_is_len);
+                    nd_print_invalid(ndo);
+                    break;
+                }
+                tlen-=ext_is_len;

                 tptr+=ext_is_len;
             }
             break;
                 tptr+=ext_is_len;
             }
             break;


@@ -2755,27 +2768,27 @@ isis_print(netdissect_options *ndo,
             ND_PRINT("\n\t      %s",
                    tok2str(isis_is_reach_virtual_values,
                            "bogus virtual flag 0x%02x",
             ND_PRINT("\n\t      %s",
                    tok2str(isis_is_reach_virtual_values,
                            "bogus virtual flag 0x%02x",

-                           EXTRACT_U_1(tptr)));
+                           GET_U_1(tptr)));

            tptr++;
            tlv_is_reach = (const struct isis_tlv_is_reach *)tptr;
            tptr++;
            tlv_is_reach = (const struct isis_tlv_is_reach *)tptr;

-            while (tmp >= sizeof(struct isis_tlv_is_reach)) {
+            while (tlen >= sizeof(struct isis_tlv_is_reach)) {

                ND_TCHECK_SIZE(tlv_is_reach);
                ND_PRINT("\n\t      IS Neighbor: %s",
                ND_TCHECK_SIZE(tlv_is_reach);
                ND_PRINT("\n\t      IS Neighbor: %s",

-                      isis_print_id(tlv_is_reach->neighbor_nodeid, NODE_ID_LEN));
+                      isis_print_id(ndo, tlv_is_reach->neighbor_nodeid, NODE_ID_LEN));

                isis_print_metric_block(ndo, &tlv_is_reach->isis_metric_block);
                isis_print_metric_block(ndo, &tlv_is_reach->isis_metric_block);

-               tmp -= sizeof(struct isis_tlv_is_reach);
+               tlen -= sizeof(struct isis_tlv_is_reach);

                tlv_is_reach++;
            }
             break;
 
         case ISIS_TLV_ESNEIGH:
            tlv_es_reach = (const struct isis_tlv_es_reach *)tptr;
                tlv_is_reach++;
            }
             break;
 
         case ISIS_TLV_ESNEIGH:
            tlv_es_reach = (const struct isis_tlv_es_reach *)tptr;

-            while (tmp >= sizeof(struct isis_tlv_es_reach)) {
+            while (tlen >= sizeof(struct isis_tlv_es_reach)) {

                ND_TCHECK_SIZE(tlv_es_reach);
                ND_PRINT("\n\t      ES Neighbor: %s",
                ND_TCHECK_SIZE(tlv_es_reach);
                ND_PRINT("\n\t      ES Neighbor: %s",

-                       isis_print_id(tlv_es_reach->neighbor_sysid, SYSTEM_ID_LEN));
+                       isis_print_id(ndo, tlv_es_reach->neighbor_sysid, SYSTEM_ID_LEN));

                isis_print_metric_block(ndo, &tlv_es_reach->isis_metric_block);
                isis_print_metric_block(ndo, &tlv_es_reach->isis_metric_block);

-               tmp -= sizeof(struct isis_tlv_es_reach);
+               tlen -= sizeof(struct isis_tlv_es_reach);

                tlv_es_reach++;
            }
             break;
                tlv_es_reach++;
            }
             break;


@@ -2788,14 +2801,19 @@ isis_print(netdissect_options *ndo,
                break;
 
        case ISIS_TLV_EXTD_IP_REACH:
                break;
 
        case ISIS_TLV_EXTD_IP_REACH:

-           while (tmp>0) {
+            while (tlen != 0) {

                 ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t      ", AF_INET);
                 if (ext_ip_len == 0) /* did something go wrong ? */
                     goto trunc;
                 ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t      ", AF_INET);
                 if (ext_ip_len == 0) /* did something go wrong ? */
                     goto trunc;

+                if (tlen < ext_ip_len) {
+                    ND_PRINT(" [remaining tlv length %u < %u]", tlen, ext_ip_len);
+                    nd_print_invalid(ndo);
+                    break;
+                }

                 tptr+=ext_ip_len;
                 tptr+=ext_ip_len;

-               tmp-=ext_ip_len;
-           }
-           break;
+                tlen-=ext_ip_len;
+            }
+            break;

 
         case ISIS_TLV_MT_IP_REACH:
             mt_len = isis_print_mtid(ndo, tptr, "\n\t      ");
 
         case ISIS_TLV_MT_IP_REACH:
             mt_len = isis_print_mtid(ndo, tptr, "\n\t      ");


@@ -2803,26 +2821,36 @@ isis_print(netdissect_options *ndo,
                 goto trunc;
             }
             tptr+=mt_len;
                 goto trunc;
             }
             tptr+=mt_len;

-            tmp-=mt_len;
+            tlen-=mt_len;

 
 

-            while (tmp>0) {
+            while (tlen != 0) {

                 ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t      ", AF_INET);
                 if (ext_ip_len == 0) /* did something go wrong ? */
                     goto trunc;
                 ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t      ", AF_INET);
                 if (ext_ip_len == 0) /* did something go wrong ? */
                     goto trunc;

+                if (tlen < ext_ip_len) {
+                    ND_PRINT(" [remaining tlv length %u < %u]", tlen, ext_ip_len);
+                    nd_print_invalid(ndo);
+                    break;
+                }

                 tptr+=ext_ip_len;
                 tptr+=ext_ip_len;

-               tmp-=ext_ip_len;
-           }
-           break;
+                tlen-=ext_ip_len;
+            }
+            break;

 
        case ISIS_TLV_IP6_REACH:
 
        case ISIS_TLV_IP6_REACH:

-           while (tmp>0) {
+            while (tlen != 0) {

                 ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t      ", AF_INET6);
                 if (ext_ip_len == 0) /* did something go wrong ? */
                     goto trunc;
                 ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t      ", AF_INET6);
                 if (ext_ip_len == 0) /* did something go wrong ? */
                     goto trunc;

+                if (tlen < ext_ip_len) {
+                    ND_PRINT(" [remaining tlv length %u < %u]", tlen, ext_ip_len);
+                    nd_print_invalid(ndo);
+                    break;
+                }

                 tptr+=ext_ip_len;
                 tptr+=ext_ip_len;

-               tmp-=ext_ip_len;
-           }
-           break;
+                tlen-=ext_ip_len;
+            }
+            break;

 
        case ISIS_TLV_MT_IP6_REACH:
             mt_len = isis_print_mtid(ndo, tptr, "\n\t      ");
 
        case ISIS_TLV_MT_IP6_REACH:
             mt_len = isis_print_mtid(ndo, tptr, "\n\t      ");


@@ -2830,26 +2858,31 @@ isis_print(netdissect_options *ndo,
                 goto trunc;
             }
             tptr+=mt_len;
                 goto trunc;
             }
             tptr+=mt_len;

-            tmp-=mt_len;
+            tlen-=mt_len;

 
 

-           while (tmp>0) {
+            while (tlen != 0) {

                 ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t      ", AF_INET6);
                 if (ext_ip_len == 0) /* did something go wrong ? */
                     goto trunc;
                 ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t      ", AF_INET6);
                 if (ext_ip_len == 0) /* did something go wrong ? */
                     goto trunc;

+                if (tlen < ext_ip_len) {
+                    ND_PRINT(" [remaining tlv length %u < %u]", tlen, ext_ip_len);
+                    nd_print_invalid(ndo);
+                    break;
+                }

                 tptr+=ext_ip_len;
                 tptr+=ext_ip_len;

-               tmp-=ext_ip_len;
-           }
-           break;
+                tlen-=ext_ip_len;
+            }
+            break;

 
        case ISIS_TLV_IP6ADDR:
 
        case ISIS_TLV_IP6ADDR:

-           while (tmp>=sizeof(nd_ipv6)) {
+           while (tlen>=sizeof(nd_ipv6)) {

                ND_TCHECK_LEN(tptr, sizeof(nd_ipv6));
 
                 ND_PRINT("\n\t      IPv6 interface address: %s",
                       ip6addr_string(ndo, tptr));
 
                tptr += sizeof(nd_ipv6);
                ND_TCHECK_LEN(tptr, sizeof(nd_ipv6));
 
                 ND_PRINT("\n\t      IPv6 interface address: %s",
                       ip6addr_string(ndo, tptr));
 
                tptr += sizeof(nd_ipv6);

-               tmp -= sizeof(nd_ipv6);
+               tlen -= sizeof(nd_ipv6);

            }
            break;
        case ISIS_TLV_AUTH:
            }
            break;
        case ISIS_TLV_AUTH:


@@ -2858,9 +2891,9 @@ isis_print(netdissect_options *ndo,
             ND_PRINT("\n\t      %s: ",
                    tok2str(isis_subtlv_auth_values,
                            "unknown Authentication type 0x%02x",
             ND_PRINT("\n\t      %s: ",
                    tok2str(isis_subtlv_auth_values,
                            "unknown Authentication type 0x%02x",

-                           EXTRACT_U_1(tptr)));
+                           GET_U_1(tptr)));

 
 

-           switch (EXTRACT_U_1(tptr)) {
+           switch (GET_U_1(tptr)) {

            case ISIS_SUBTLV_AUTH_SIMPLE:
                if (nd_printzp(ndo, tptr + 1, tlv_len - 1, ndo->ndo_snapend))
                    goto trunc;
            case ISIS_SUBTLV_AUTH_SIMPLE:
                if (nd_printzp(ndo, tptr + 1, tlv_len - 1, ndo->ndo_snapend))
                    goto trunc;


@@ -2868,7 +2901,7 @@ isis_print(netdissect_options *ndo,
            case ISIS_SUBTLV_AUTH_MD5:
                for(i=1;i<tlv_len;i++) {
                    ND_TCHECK_1(tptr + i);
            case ISIS_SUBTLV_AUTH_MD5:
                for(i=1;i<tlv_len;i++) {
                    ND_TCHECK_1(tptr + i);

-                   ND_PRINT("%02x", EXTRACT_U_1(tptr + i));
+                   ND_PRINT("%02x", GET_U_1(tptr + i));

                }
                if (tlv_len != ISIS_SUBTLV_AUTH_MD5_LEN+1)
                     ND_PRINT(", (invalid subTLV) ");
                }
                if (tlv_len != ISIS_SUBTLV_AUTH_MD5_LEN+1)
                     ND_PRINT(", (invalid subTLV) ");


@@ -2881,11 +2914,11 @@ isis_print(netdissect_options *ndo,
                break;
             case ISIS_SUBTLV_AUTH_GENERIC:
                ND_TCHECK_2(tptr + 1);
                break;
             case ISIS_SUBTLV_AUTH_GENERIC:
                ND_TCHECK_2(tptr + 1);

-                key_id = EXTRACT_BE_U_2(tptr + 1);
+                key_id = GET_BE_U_2(tptr + 1);

                 ND_PRINT("%u, password: ", key_id);
                 for(i=1 + sizeof(uint16_t);i<tlv_len;i++) {
                     ND_TCHECK_1(tptr + i);
                 ND_PRINT("%u, password: ", key_id);
                 for(i=1 + sizeof(uint16_t);i<tlv_len;i++) {
                     ND_TCHECK_1(tptr + i);

-                    ND_PRINT("%02x", EXTRACT_U_1(tptr + i));
+                    ND_PRINT("%02x", GET_U_1(tptr + i));

                 }
                 break;
            case ISIS_SUBTLV_AUTH_PRIVATE:
                 }
                 break;
            case ISIS_SUBTLV_AUTH_PRIVATE:


@@ -2898,45 +2931,45 @@ isis_print(netdissect_options *ndo,
 
        case ISIS_TLV_PTP_ADJ:
            tlv_ptp_adj = (const struct isis_tlv_ptp_adj *)tptr;
 
        case ISIS_TLV_PTP_ADJ:
            tlv_ptp_adj = (const struct isis_tlv_ptp_adj *)tptr;

-           if(tmp>=1) {
+           if(tlen>=1) {

                ND_TCHECK_1(tptr);
                ND_PRINT("\n\t      Adjacency State: %s (%u)",
                ND_TCHECK_1(tptr);
                ND_PRINT("\n\t      Adjacency State: %s (%u)",

-                      tok2str(isis_ptp_adjancey_values, "unknown", EXTRACT_U_1(tptr)),
-                      EXTRACT_U_1(tptr));
-               tmp--;
+                      tok2str(isis_ptp_adjancey_values, "unknown", GET_U_1(tptr)),
+                      GET_U_1(tptr));
+               tlen--;

            }
            }

-           if(tmp>sizeof(tlv_ptp_adj->extd_local_circuit_id)) {
+           if(tlen>sizeof(tlv_ptp_adj->extd_local_circuit_id)) {

                ND_TCHECK_4(tlv_ptp_adj->extd_local_circuit_id);
                ND_PRINT("\n\t      Extended Local circuit-ID: 0x%08x",
                ND_TCHECK_4(tlv_ptp_adj->extd_local_circuit_id);
                ND_PRINT("\n\t      Extended Local circuit-ID: 0x%08x",

-                      EXTRACT_BE_U_4(tlv_ptp_adj->extd_local_circuit_id));
-               tmp-=sizeof(tlv_ptp_adj->extd_local_circuit_id);
+                      GET_BE_U_4(tlv_ptp_adj->extd_local_circuit_id));
+               tlen-=sizeof(tlv_ptp_adj->extd_local_circuit_id);

            }
            }

-           if(tmp>=SYSTEM_ID_LEN) {
+           if(tlen>=SYSTEM_ID_LEN) {

                ND_TCHECK_LEN(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN);
                ND_PRINT("\n\t      Neighbor System-ID: %s",
                ND_TCHECK_LEN(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN);
                ND_PRINT("\n\t      Neighbor System-ID: %s",

-                      isis_print_id(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN));
-               tmp-=SYSTEM_ID_LEN;
+                      isis_print_id(ndo, tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN));
+               tlen-=SYSTEM_ID_LEN;

            }
            }

-           if(tmp>=sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)) {
+           if(tlen>=sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)) {

                ND_TCHECK_4(tlv_ptp_adj->neighbor_extd_local_circuit_id);
                ND_PRINT("\n\t      Neighbor Extended Local circuit-ID: 0x%08x",
                ND_TCHECK_4(tlv_ptp_adj->neighbor_extd_local_circuit_id);
                ND_PRINT("\n\t      Neighbor Extended Local circuit-ID: 0x%08x",

-                      EXTRACT_BE_U_4(tlv_ptp_adj->neighbor_extd_local_circuit_id));
+                      GET_BE_U_4(tlv_ptp_adj->neighbor_extd_local_circuit_id));

            }
            break;
 
        case ISIS_TLV_PROTOCOLS:
            ND_PRINT("\n\t      NLPID(s): ");
            }
            break;
 
        case ISIS_TLV_PROTOCOLS:
            ND_PRINT("\n\t      NLPID(s): ");

-           while (tmp>0) {
+           while (tlen>0) {

                ND_TCHECK_1(tptr);
                ND_PRINT("%s (0x%02x)",
                        tok2str(nlpid_values,
                                "unknown",
                ND_TCHECK_1(tptr);
                ND_PRINT("%s (0x%02x)",
                        tok2str(nlpid_values,
                                "unknown",

-                               EXTRACT_U_1(tptr)),
-                       EXTRACT_U_1(tptr));
-               if (tmp>1) /* further NPLIDs ? - put comma */
+                               GET_U_1(tptr)),
+                       GET_U_1(tptr));
+               if (tlen>1) /* further NPLIDs ? - put comma */

                    ND_PRINT(", ");
                 tptr++;
                    ND_PRINT(", ");
                 tptr++;

-                tmp--;
+                tlen--;

            }
            break;
 
            }
            break;
 


@@ -2945,14 +2978,14 @@ isis_print(netdissect_options *ndo,
       ND_TCHECK_2(tptr);
 
       ND_PRINT("\n\t       RES: %u, MTID(s): %u",
       ND_TCHECK_2(tptr);
 
       ND_PRINT("\n\t       RES: %u, MTID(s): %u",

-              (EXTRACT_BE_U_2(tptr) >> 12),
-              (EXTRACT_BE_U_2(tptr) & 0x0fff));
+              (GET_BE_U_2(tptr) >> 12),
+              (GET_BE_U_2(tptr) & 0x0fff));

 
 

-      tmp = tmp-2;
+      tlen = tlen-2;

       tptr = tptr+2;
 
       tptr = tptr+2;
 

-      if (tmp)
-        isis_print_mt_port_cap_subtlv(ndo, tptr, tmp);
+      if (tlen)
+        isis_print_mt_port_cap_subtlv(ndo, tptr, tlen);

 
       break;
     }
 
       break;
     }


@@ -2962,15 +2995,15 @@ isis_print(netdissect_options *ndo,
       ND_TCHECK_2(tptr);
 
       ND_PRINT("\n\t      O: %u, RES: %u, MTID(s): %u",
       ND_TCHECK_2(tptr);
 
       ND_PRINT("\n\t      O: %u, RES: %u, MTID(s): %u",

-                (EXTRACT_BE_U_2(tptr) >> 15) & 0x01,
-                (EXTRACT_BE_U_2(tptr) >> 12) & 0x07,
-                EXTRACT_BE_U_2(tptr) & 0x0fff);
+                (GET_BE_U_2(tptr) >> 15) & 0x01,
+                (GET_BE_U_2(tptr) >> 12) & 0x07,
+                GET_BE_U_2(tptr) & 0x0fff);

 
 

-      tmp = tmp-2;
+      tlen = tlen-2;

       tptr = tptr+2;
 
       tptr = tptr+2;
 

-      if (tmp)
-        isis_print_mt_capability_subtlv(ndo, tptr, tmp);
+      if (tlen)
+        isis_print_mt_capability_subtlv(ndo, tptr, tlen);

 
       break;
 
 
       break;
 


@@ -2980,85 +3013,88 @@ isis_print(netdissect_options *ndo,
            break;
 
        case ISIS_TLV_IPADDR:
            break;
 
        case ISIS_TLV_IPADDR:

-           while (tmp>=sizeof(nd_ipv4)) {
+           while (tlen>=sizeof(nd_ipv4)) {

                ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
                ND_PRINT("\n\t      IPv4 interface address: %s", ipaddr_string(ndo, tptr));
                tptr += sizeof(nd_ipv4);
                ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
                ND_PRINT("\n\t      IPv4 interface address: %s", ipaddr_string(ndo, tptr));
                tptr += sizeof(nd_ipv4);

-               tmp -= sizeof(nd_ipv4);
+               tlen -= sizeof(nd_ipv4);

            }
            break;
 
        case ISIS_TLV_HOSTNAME:
            ND_PRINT("\n\t      Hostname: ");
            }
            break;
 
        case ISIS_TLV_HOSTNAME:
            ND_PRINT("\n\t      Hostname: ");

-           if (nd_printzp(ndo, tptr, tmp, ndo->ndo_snapend))
+           if (nd_printzp(ndo, tptr, tlen, ndo->ndo_snapend))

                goto trunc;
            break;
 
        case ISIS_TLV_SHARED_RISK_GROUP:
                goto trunc;
            break;
 
        case ISIS_TLV_SHARED_RISK_GROUP:

-           if (tmp < NODE_ID_LEN)
+           if (tlen < NODE_ID_LEN)

                break;
            ND_TCHECK_LEN(tptr, NODE_ID_LEN);
                break;
            ND_TCHECK_LEN(tptr, NODE_ID_LEN);

-           ND_PRINT("\n\t      IS Neighbor: %s", isis_print_id(tptr, NODE_ID_LEN));
+           ND_PRINT("\n\t      IS Neighbor: %s", isis_print_id(ndo, tptr, NODE_ID_LEN));

            tptr+=NODE_ID_LEN;
            tptr+=NODE_ID_LEN;

-           tmp-=NODE_ID_LEN;
+           tlen-=NODE_ID_LEN;

 
 

-           if (tmp < 1)
+           if (tlen < 1)

                break;
            ND_TCHECK_1(tptr);
                break;
            ND_TCHECK_1(tptr);

-           ND_PRINT(", Flags: [%s]", ISIS_MASK_TLV_SHARED_RISK_GROUP(EXTRACT_U_1(tptr)) ? "numbered" : "unnumbered");
+           ND_PRINT(", Flags: [%s]",
+                     ISIS_MASK_TLV_SHARED_RISK_GROUP(GET_U_1(tptr)) ? "numbered" : "unnumbered");

            tptr++;
            tptr++;

-           tmp--;
+           tlen--;

 
 

-           if (tmp < sizeof(nd_ipv4))
+           if (tlen < sizeof(nd_ipv4))

                break;
            ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
            ND_PRINT("\n\t      IPv4 interface address: %s", ipaddr_string(ndo, tptr));
            tptr+=sizeof(nd_ipv4);
                break;
            ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
            ND_PRINT("\n\t      IPv4 interface address: %s", ipaddr_string(ndo, tptr));
            tptr+=sizeof(nd_ipv4);

-           tmp-=sizeof(nd_ipv4);
+           tlen-=sizeof(nd_ipv4);

 
 

-           if (tmp < sizeof(nd_ipv4))
+           if (tlen < sizeof(nd_ipv4))

                break;
            ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
            ND_PRINT("\n\t      IPv4 neighbor address: %s", ipaddr_string(ndo, tptr));
            tptr+=sizeof(nd_ipv4);
                break;
            ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
            ND_PRINT("\n\t      IPv4 neighbor address: %s", ipaddr_string(ndo, tptr));
            tptr+=sizeof(nd_ipv4);

-           tmp-=sizeof(nd_ipv4);
+           tlen-=sizeof(nd_ipv4);

 
 

-           while (tmp>=4) {
+           while (tlen>=4) {

                 ND_TCHECK_4(tptr);
                 ND_TCHECK_4(tptr);

-                ND_PRINT("\n\t      Link-ID: 0x%08x", EXTRACT_BE_U_4(tptr));
+                ND_PRINT("\n\t      Link-ID: 0x%08x", GET_BE_U_4(tptr));

                 tptr+=4;
                 tptr+=4;

-                tmp-=4;
+                tlen-=4;

            }
            break;
 
        case ISIS_TLV_LSP:
            tlv_lsp = (const struct isis_tlv_lsp *)tptr;
            }
            break;
 
        case ISIS_TLV_LSP:
            tlv_lsp = (const struct isis_tlv_lsp *)tptr;

-           while(tmp>=sizeof(struct isis_tlv_lsp)) {
+           while(tlen>=sizeof(struct isis_tlv_lsp)) {

                ND_TCHECK_1(tlv_lsp->lsp_id + LSP_ID_LEN - 1);
                ND_PRINT("\n\t      lsp-id: %s",
                ND_TCHECK_1(tlv_lsp->lsp_id + LSP_ID_LEN - 1);
                ND_PRINT("\n\t      lsp-id: %s",

-                       isis_print_id(tlv_lsp->lsp_id, LSP_ID_LEN));
+                       isis_print_id(ndo, tlv_lsp->lsp_id, LSP_ID_LEN));

                ND_TCHECK_4(tlv_lsp->sequence_number);
                ND_TCHECK_4(tlv_lsp->sequence_number);

-               ND_PRINT(", seq: 0x%08x", EXTRACT_BE_U_4(tlv_lsp->sequence_number));
+               ND_PRINT(", seq: 0x%08x",
+                         GET_BE_U_4(tlv_lsp->sequence_number));

                ND_TCHECK_2(tlv_lsp->remaining_lifetime);
                ND_TCHECK_2(tlv_lsp->remaining_lifetime);

-               ND_PRINT(", lifetime: %5ds", EXTRACT_BE_U_2(tlv_lsp->remaining_lifetime));
+               ND_PRINT(", lifetime: %5ds",
+                         GET_BE_U_2(tlv_lsp->remaining_lifetime));

                ND_TCHECK_2(tlv_lsp->checksum);
                ND_TCHECK_2(tlv_lsp->checksum);

-               ND_PRINT(", chksum: 0x%04x", EXTRACT_BE_U_2(tlv_lsp->checksum));
-               tmp-=sizeof(struct isis_tlv_lsp);
+               ND_PRINT(", chksum: 0x%04x", GET_BE_U_2(tlv_lsp->checksum));
+               tlen-=sizeof(struct isis_tlv_lsp);

                tlv_lsp++;
            }
            break;
 
        case ISIS_TLV_CHECKSUM:
                tlv_lsp++;
            }
            break;
 
        case ISIS_TLV_CHECKSUM:

-           if (tmp < ISIS_TLV_CHECKSUM_MINLEN)
+           if (tlen < ISIS_TLV_CHECKSUM_MINLEN)

                break;
            ND_TCHECK_LEN(tptr, ISIS_TLV_CHECKSUM_MINLEN);
                break;
            ND_TCHECK_LEN(tptr, ISIS_TLV_CHECKSUM_MINLEN);

-           ND_PRINT("\n\t      checksum: 0x%04x ", EXTRACT_BE_U_2(tptr));
+           ND_PRINT("\n\t      checksum: 0x%04x ", GET_BE_U_2(tptr));

             /* do not attempt to verify the checksum if it is zero
              * most likely a HMAC-MD5 TLV is also present and
              * to avoid conflicts the checksum TLV is zeroed.
              * see rfc3358 for details
              */
             /* do not attempt to verify the checksum if it is zero
              * most likely a HMAC-MD5 TLV is also present and
              * to avoid conflicts the checksum TLV is zeroed.
              * see rfc3358 for details
              */

-            osi_print_cksum(ndo, optr, EXTRACT_BE_U_2(tptr), (int)(tptr-optr),
+            osi_print_cksum(ndo, optr, GET_BE_U_2(tptr), (int)(tptr-optr),

                             length);
            break;
 
                             length);
            break;
 


@@ -3066,28 +3102,28 @@ isis_print(netdissect_options *ndo,
            if (tlv_len >= SYSTEM_ID_LEN + 1) {
                ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN + 1);
                ND_PRINT("\n\t      Purge Originator System-ID: %s",
            if (tlv_len >= SYSTEM_ID_LEN + 1) {
                ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN + 1);
                ND_PRINT("\n\t      Purge Originator System-ID: %s",

-                      isis_print_id(tptr + 1, SYSTEM_ID_LEN));
+                      isis_print_id(ndo, tptr + 1, SYSTEM_ID_LEN));

            }
 
            if (tlv_len == 2 * SYSTEM_ID_LEN + 1) {
                ND_TCHECK_LEN(tptr, 2 * SYSTEM_ID_LEN + 1);
                ND_PRINT("\n\t      Received from System-ID: %s",
            }
 
            if (tlv_len == 2 * SYSTEM_ID_LEN + 1) {
                ND_TCHECK_LEN(tptr, 2 * SYSTEM_ID_LEN + 1);
                ND_PRINT("\n\t      Received from System-ID: %s",

-                      isis_print_id(tptr + SYSTEM_ID_LEN + 1, SYSTEM_ID_LEN));
+                      isis_print_id(ndo, tptr + SYSTEM_ID_LEN + 1, SYSTEM_ID_LEN));

            }
            break;
 
        case ISIS_TLV_MT_SUPPORTED:
            }
            break;
 
        case ISIS_TLV_MT_SUPPORTED:

-            if (tmp < ISIS_TLV_MT_SUPPORTED_MINLEN)
+            if (tlen < ISIS_TLV_MT_SUPPORTED_MINLEN)

                 break;
                 break;

-           while (tmp>1) {
+           while (tlen>1) {

                /* length can only be a multiple of 2, otherwise there is
                   something broken -> so decode down until length is 1 */
                /* length can only be a multiple of 2, otherwise there is
                   something broken -> so decode down until length is 1 */

-               if (tmp!=1) {
+               if (tlen!=1) {

                     mt_len = isis_print_mtid(ndo, tptr, "\n\t      ");
                     if (mt_len == 0) /* did something go wrong ? */
                         goto trunc;
                     tptr+=mt_len;
                     mt_len = isis_print_mtid(ndo, tptr, "\n\t      ");
                     if (mt_len == 0) /* did something go wrong ? */
                         goto trunc;
                     tptr+=mt_len;

-                    tmp-=mt_len;
+                    tlen-=mt_len;

                } else {
                    ND_PRINT("\n\t      invalid MT-ID");
                    break;
                } else {
                    ND_PRINT("\n\t      invalid MT-ID");
                    break;


@@ -3097,47 +3133,47 @@ isis_print(netdissect_options *ndo,
 
        case ISIS_TLV_RESTART_SIGNALING:
             /* first attempt to decode the flags */
 
        case ISIS_TLV_RESTART_SIGNALING:
             /* first attempt to decode the flags */

-            if (tmp < ISIS_TLV_RESTART_SIGNALING_FLAGLEN)
+            if (tlen < ISIS_TLV_RESTART_SIGNALING_FLAGLEN)

                 break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_RESTART_SIGNALING_FLAGLEN);
             ND_PRINT("\n\t      Flags [%s]",
                 break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_RESTART_SIGNALING_FLAGLEN);
             ND_PRINT("\n\t      Flags [%s]",

-                   bittok2str(isis_restart_flag_values, "none", EXTRACT_U_1(tptr)));
+                   bittok2str(isis_restart_flag_values, "none", GET_U_1(tptr)));

             tptr+=ISIS_TLV_RESTART_SIGNALING_FLAGLEN;
             tptr+=ISIS_TLV_RESTART_SIGNALING_FLAGLEN;

-            tmp-=ISIS_TLV_RESTART_SIGNALING_FLAGLEN;
+            tlen-=ISIS_TLV_RESTART_SIGNALING_FLAGLEN;

 
             /* is there anything other than the flags field? */
 
             /* is there anything other than the flags field? */

-            if (tmp == 0)
+            if (tlen == 0)

                 break;
 
                 break;
 

-            if (tmp < ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN)
+            if (tlen < ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN)

                 break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN);
 
                 break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN);
 

-            ND_PRINT(", Remaining holding time %us", EXTRACT_BE_U_2(tptr));
+            ND_PRINT(", Remaining holding time %us", GET_BE_U_2(tptr));

             tptr+=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN;
             tptr+=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN;

-            tmp-=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN;
+            tlen-=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN;

 
             /* is there an additional sysid field present ?*/
 
             /* is there an additional sysid field present ?*/

-            if (tmp == SYSTEM_ID_LEN) {
+            if (tlen == SYSTEM_ID_LEN) {

                     ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN);
                     ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN);

-                    ND_PRINT(", for %s", isis_print_id(tptr,SYSTEM_ID_LEN));
+                    ND_PRINT(", for %s", isis_print_id(ndo, tptr,SYSTEM_ID_LEN));

             }
            break;
 
         case ISIS_TLV_IDRP_INFO:
             }
            break;
 
         case ISIS_TLV_IDRP_INFO:

-           if (tmp < ISIS_TLV_IDRP_INFO_MINLEN)
+           if (tlen < ISIS_TLV_IDRP_INFO_MINLEN)

                break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_IDRP_INFO_MINLEN);
             ND_PRINT("\n\t      Inter-Domain Information Type: %s",
                    tok2str(isis_subtlv_idrp_values,
                            "Unknown (0x%02x)",
                break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_IDRP_INFO_MINLEN);
             ND_PRINT("\n\t      Inter-Domain Information Type: %s",
                    tok2str(isis_subtlv_idrp_values,
                            "Unknown (0x%02x)",

-                           EXTRACT_U_1(tptr)));
-            isis_subtlv_idrp = EXTRACT_U_1(tptr);
+                           GET_U_1(tptr)));
+            isis_subtlv_idrp = GET_U_1(tptr);

             tptr++;
             switch (isis_subtlv_idrp) {
             case ISIS_SUBTLV_IDRP_ASN:
                 ND_TCHECK_2(tptr); /* fetch AS number */
             tptr++;
             switch (isis_subtlv_idrp) {
             case ISIS_SUBTLV_IDRP_ASN:
                 ND_TCHECK_2(tptr); /* fetch AS number */

-                ND_PRINT("AS Number: %u", EXTRACT_BE_U_2(tptr));
+                ND_PRINT("AS Number: %u", GET_BE_U_2(tptr));

                 break;
             case ISIS_SUBTLV_IDRP_LOCAL:
             case ISIS_SUBTLV_IDRP_RES:
                 break;
             case ISIS_SUBTLV_IDRP_LOCAL:
             case ISIS_SUBTLV_IDRP_RES:


@@ -3149,68 +3185,68 @@ isis_print(netdissect_options *ndo,
             break;
 
         case ISIS_TLV_LSP_BUFFERSIZE:
             break;
 
         case ISIS_TLV_LSP_BUFFERSIZE:

-           if (tmp < ISIS_TLV_LSP_BUFFERSIZE_MINLEN)
+           if (tlen < ISIS_TLV_LSP_BUFFERSIZE_MINLEN)

                break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_LSP_BUFFERSIZE_MINLEN);
                break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_LSP_BUFFERSIZE_MINLEN);

-            ND_PRINT("\n\t      LSP Buffersize: %u", EXTRACT_BE_U_2(tptr));
+            ND_PRINT("\n\t      LSP Buffersize: %u", GET_BE_U_2(tptr));

             break;
 
         case ISIS_TLV_PART_DIS:
             break;
 
         case ISIS_TLV_PART_DIS:

-            while (tmp >= SYSTEM_ID_LEN) {
+            while (tlen >= SYSTEM_ID_LEN) {

                 ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN);
                 ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN);

-                ND_PRINT("\n\t      %s", isis_print_id(tptr, SYSTEM_ID_LEN));
+                ND_PRINT("\n\t      %s", isis_print_id(ndo, tptr, SYSTEM_ID_LEN));

                 tptr+=SYSTEM_ID_LEN;
                 tptr+=SYSTEM_ID_LEN;

-                tmp-=SYSTEM_ID_LEN;
+                tlen-=SYSTEM_ID_LEN;

             }
             break;
 
         case ISIS_TLV_PREFIX_NEIGH:
             }
             break;
 
         case ISIS_TLV_PREFIX_NEIGH:

-           if (tmp < sizeof(struct isis_metric_block))
+           if (tlen < sizeof(struct isis_metric_block))

                break;
             ND_TCHECK_LEN(tptr, sizeof(struct isis_metric_block));
             ND_PRINT("\n\t      Metric Block");
             isis_print_metric_block(ndo, (const struct isis_metric_block *)tptr);
             tptr+=sizeof(struct isis_metric_block);
                break;
             ND_TCHECK_LEN(tptr, sizeof(struct isis_metric_block));
             ND_PRINT("\n\t      Metric Block");
             isis_print_metric_block(ndo, (const struct isis_metric_block *)tptr);
             tptr+=sizeof(struct isis_metric_block);

-            tmp-=sizeof(struct isis_metric_block);
+            tlen-=sizeof(struct isis_metric_block);

 
 

-            while(tmp>0) {
+            while(tlen>0) {

                 ND_TCHECK_1(tptr);
                 ND_TCHECK_1(tptr);

-                prefix_len=EXTRACT_U_1(tptr); /* read out prefix length in semioctets*/
+                prefix_len=GET_U_1(tptr); /* read out prefix length in semioctets*/

                 tptr++;
                 if (prefix_len < 2) {
                     ND_PRINT("\n\t\tAddress: prefix length %u < 2", prefix_len);
                     break;
                 }
                 tptr++;
                 if (prefix_len < 2) {
                     ND_PRINT("\n\t\tAddress: prefix length %u < 2", prefix_len);
                     break;
                 }

-                tmp--;
-                if (tmp < prefix_len/2)
+                tlen--;
+                if (tlen < prefix_len/2)

                     break;
                 ND_TCHECK_LEN(tptr, prefix_len / 2);
                 ND_PRINT("\n\t\tAddress: %s/%u",
                        isonsap_string(ndo, tptr, prefix_len / 2), prefix_len * 4);
                 tptr+=prefix_len/2;
                     break;
                 ND_TCHECK_LEN(tptr, prefix_len / 2);
                 ND_PRINT("\n\t\tAddress: %s/%u",
                        isonsap_string(ndo, tptr, prefix_len / 2), prefix_len * 4);
                 tptr+=prefix_len/2;

-                tmp-=prefix_len/2;
+                tlen-=prefix_len/2;

             }
             break;
 
         case ISIS_TLV_IIH_SEQNR:
             }
             break;
 
         case ISIS_TLV_IIH_SEQNR:

-           if (tmp < ISIS_TLV_IIH_SEQNR_MINLEN)
+           if (tlen < ISIS_TLV_IIH_SEQNR_MINLEN)

                break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_IIH_SEQNR_MINLEN); /* check if four bytes are on the wire */
                break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_IIH_SEQNR_MINLEN); /* check if four bytes are on the wire */

-            ND_PRINT("\n\t      Sequence number: %u", EXTRACT_BE_U_4(tptr));
+            ND_PRINT("\n\t      Sequence number: %u", GET_BE_U_4(tptr));

             break;
 
         case ISIS_TLV_VENDOR_PRIVATE:
             break;
 
         case ISIS_TLV_VENDOR_PRIVATE:

-           if (tmp < ISIS_TLV_VENDOR_PRIVATE_MINLEN)
+           if (tlen < ISIS_TLV_VENDOR_PRIVATE_MINLEN)

                break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_VENDOR_PRIVATE_MINLEN); /* check if enough byte for a full oui */
                break;
             ND_TCHECK_LEN(tptr, ISIS_TLV_VENDOR_PRIVATE_MINLEN); /* check if enough byte for a full oui */

-            vendor_id = EXTRACT_BE_U_3(tptr);
+            vendor_id = GET_BE_U_3(tptr);

             ND_PRINT("\n\t      Vendor: %s (%u)",
                    tok2str(oui_values, "Unknown", vendor_id),
                    vendor_id);
             tptr+=3;
             ND_PRINT("\n\t      Vendor: %s (%u)",
                    tok2str(oui_values, "Unknown", vendor_id),
                    vendor_id);
             tptr+=3;

-            tmp-=3;
-            if (tmp > 0) /* hexdump the rest */
-                if (!print_unknown_data(ndo, tptr, "\n\t\t", tmp))
+            tlen-=3;
+            if (tlen > 0) /* hexdump the rest */
+                if (!print_unknown_data(ndo, tptr, "\n\t\t", tlen))

                     return(0);
             break;
             /*
                     return(0);
             break;
             /*