remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-isoclns.c

diff --git a/print-isoclns.c b/print-isoclns.c
index da155708ff08c6d7ef425d93a1eddc3f118bf0cc..6762f4d9f8ecb83ea4a797b6e43b7bcb5ecfe4ac 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -964,7 +964,6 @@ clnp_print(netdissect_options *ndo,
                 ND_PRINT(", bad opts/li");
                 return (0);
             }
                 ND_PRINT(", bad opts/li");
                 return (0);
             }

-            ND_TCHECK_2(pptr);

             op = GET_U_1(pptr);
             opli = GET_U_1(pptr + 1);
             pptr += 2;
             op = GET_U_1(pptr);
             opli = GET_U_1(pptr + 1);
             pptr += 2;


@@ -1023,8 +1022,6 @@ clnp_print(netdissect_options *ndo,
                             }
                             if (source_address_length > 0) {
                                     source_address=(tptr+1);
                             }
                             if (source_address_length > 0) {
                                     source_address=(tptr+1);

-                                    ND_TCHECK_LEN(source_address,
-                                                  source_address_length);

                                     ND_PRINT("\n\t    NSAP address (length %u): %s",
                                            source_address_length,
                                            GET_ISONSAP_STRING(source_address, source_address_length));
                                     ND_PRINT("\n\t    NSAP address (length %u): %s",
                                            source_address_length,
                                            GET_ISONSAP_STRING(source_address, source_address_length));


@@ -1301,7 +1298,7 @@ esis_print(netdissect_options *ndo,
                pptr += netal;
                 li -= netal;
 
                pptr += netal;
                 li -= netal;
 

-               if (snpal == 6)
+               if (snpal == MAC_ADDR_LEN)

                        ND_PRINT("\n\t  SNPA (length: %u): %s",
                               snpal,
                               GET_ETHERADDR_STRING(snpa));
                        ND_PRINT("\n\t  SNPA (length: %u): %s",
                               snpal,
                               GET_ETHERADDR_STRING(snpa));


@@ -1394,7 +1391,6 @@ esis_print(netdissect_options *ndo,
                 ND_PRINT(", bad opts/li");
                 return;
             }
                 ND_PRINT(", bad opts/li");
                 return;
             }

-            ND_TCHECK_2(pptr);

             op = GET_U_1(pptr);
             opli = GET_U_1(pptr + 1);
             pptr += 2;
             op = GET_U_1(pptr);
             opli = GET_U_1(pptr + 1);
             pptr += 2;


@@ -1494,7 +1490,6 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo,
 
   while (len > 2)
   {
 
   while (len > 2)
   {

-    ND_TCHECK_2(tptr);

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


@@ -1627,7 +1622,6 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo,
 
   while (len > 2)
   {
 
   while (len > 2)
   {

-    ND_TCHECK_2(tptr);

     stlv_type = GET_U_1(tptr);
     stlv_len  = GET_U_1(tptr + 1);
     tptr += 2;
     stlv_type = GET_U_1(tptr);
     stlv_len  = GET_U_1(tptr + 1);
     tptr += 2;


@@ -2252,7 +2246,6 @@ isis_print_mtid(netdissect_options *ndo,
 {
     if (tlv_remaining < 2)
         goto trunc;
 {
     if (tlv_remaining < 2)
         goto trunc;

-    ND_TCHECK_2(tptr);

 
     ND_PRINT("%s%s",
            ident,
 
     ND_PRINT("%s%s",
            ident,


@@ -2300,7 +2293,6 @@ isis_print_extd_ip_reach(netdissect_options *ndo,
         }
         processed++;
     } else if (afi == AF_INET6) {
         }
         processed++;
     } else if (afi == AF_INET6) {

-        ND_TCHECK_2(tptr);

         status_byte=GET_U_1(tptr);
         bit_length=GET_U_1(tptr + 1);
         if (bit_length > 128) {
         status_byte=GET_U_1(tptr);
         bit_length=GET_U_1(tptr + 1);
         if (bit_length > 128) {


@@ -2357,7 +2349,6 @@ isis_print_extd_ip_reach(netdissect_options *ndo,
         ND_PRINT(" (%u)", sublen);   /* print out subTLV length */
 
         while (sublen>0) {
         ND_PRINT(" (%u)", sublen);   /* print out subTLV length */
 
         while (sublen>0) {

-            ND_TCHECK_2(tptr);

             subtlvtype=GET_U_1(tptr);
             subtlvlen=GET_U_1(tptr + 1);
             tptr+=2;
             subtlvtype=GET_U_1(tptr);
             subtlvlen=GET_U_1(tptr + 1);
             tptr+=2;


@@ -2380,7 +2371,6 @@ isis_print_router_cap_subtlv(netdissect_options *ndo, const uint8_t *tptr, uint8
     uint8_t subt, subl;
 
     while (tlen >= 2) {
     uint8_t subt, subl;
 
     while (tlen >= 2) {

-       ND_TCHECK_LEN(tptr, 2);

        subt = GET_U_1(tptr);
        subl = GET_U_1(tptr+1);
        tlen -= 2;
        subt = GET_U_1(tptr);
        subl = GET_U_1(tptr+1);
        tlen -= 2;


@@ -2899,7 +2889,6 @@ isis_print(netdissect_options *ndo,
                tlen--;
                if (tlen < alen)
                    goto tlv_trunc;
                tlen--;
                if (tlen < alen)
                    goto tlv_trunc;

-               ND_TCHECK_LEN(tptr, alen);

                ND_PRINT("\n\t      Area address (length: %u): %s",
                        alen,
                        GET_ISONSAP_STRING(tptr, alen));
                ND_PRINT("\n\t      Area address (length: %u): %s",
                        alen,
                        GET_ISONSAP_STRING(tptr, alen));


@@ -3210,7 +3199,6 @@ isis_print(netdissect_options *ndo,
         {
             if (tlen < 2)
                 goto tlv_trunc;
         {
             if (tlen < 2)
                 goto tlv_trunc;

-            ND_TCHECK_2(tptr);

 
             ND_PRINT("\n\t       RES: %u, MTID(s): %u",
                     (GET_BE_U_2(tptr) >> 12),
 
             ND_PRINT("\n\t       RES: %u, MTID(s): %u",
                     (GET_BE_U_2(tptr) >> 12),


@@ -3245,7 +3233,6 @@ isis_print(netdissect_options *ndo,
        case ISIS_TLV_TE_ROUTER_ID:
            if (tlen < sizeof(nd_ipv4))
                goto tlv_trunc;
        case ISIS_TLV_TE_ROUTER_ID:
            if (tlen < sizeof(nd_ipv4))
                goto tlv_trunc;

-           ND_TCHECK_LEN(pptr, sizeof(nd_ipv4));

            ND_PRINT("\n\t      Traffic Engineering Router ID: %s", GET_IPADDR_STRING(pptr));
            break;
 
            ND_PRINT("\n\t      Traffic Engineering Router ID: %s", GET_IPADDR_STRING(pptr));
            break;
 


@@ -3253,7 +3240,6 @@ isis_print(netdissect_options *ndo,
            while (tlen != 0) {
                 if (tlen < sizeof(nd_ipv4))
                     goto tlv_trunc;
            while (tlen != 0) {
                 if (tlen < sizeof(nd_ipv4))
                     goto tlv_trunc;

-               ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));

                ND_PRINT("\n\t      IPv4 interface address: %s", GET_IPADDR_STRING(tptr));
                tptr += sizeof(nd_ipv4);
                tlen -= sizeof(nd_ipv4);
                ND_PRINT("\n\t      IPv4 interface address: %s", GET_IPADDR_STRING(tptr));
                tptr += sizeof(nd_ipv4);
                tlen -= sizeof(nd_ipv4);


@@ -3283,14 +3269,12 @@ isis_print(netdissect_options *ndo,
 
            if (tlen < sizeof(nd_ipv4))
                break;
 
            if (tlen < sizeof(nd_ipv4))
                break;

-           ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));

            ND_PRINT("\n\t      IPv4 interface address: %s", GET_IPADDR_STRING(tptr));
            tptr+=sizeof(nd_ipv4);
            tlen-=sizeof(nd_ipv4);
 
            if (tlen < sizeof(nd_ipv4))
                break;
            ND_PRINT("\n\t      IPv4 interface address: %s", GET_IPADDR_STRING(tptr));
            tptr+=sizeof(nd_ipv4);
            tlen-=sizeof(nd_ipv4);
 
            if (tlen < sizeof(nd_ipv4))
                break;

-           ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));

            ND_PRINT("\n\t      IPv4 neighbor address: %s", GET_IPADDR_STRING(tptr));
            tptr+=sizeof(nd_ipv4);
            tlen-=sizeof(nd_ipv4);
            ND_PRINT("\n\t      IPv4 neighbor address: %s", GET_IPADDR_STRING(tptr));
            tptr+=sizeof(nd_ipv4);
            tlen-=sizeof(nd_ipv4);


@@ -3472,7 +3456,6 @@ isis_print(netdissect_options *ndo,
                 }
                 if (tlen < prefix_len/2)
                     break;
                 }
                 if (tlen < prefix_len/2)
                     break;

-                ND_TCHECK_LEN(tptr, prefix_len / 2);

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


@@ -3492,7 +3475,6 @@ isis_print(netdissect_options *ndo,
                 nd_print_invalid(ndo);
                 break;
             }
                 nd_print_invalid(ndo);
                 break;
             }

-            ND_TCHECK_5(tptr); /* router-id + flags */

             ND_PRINT("\n\t      Router-ID %s", GET_IPADDR_STRING(tptr));
             ND_PRINT(", Flags [%s]",
                     bittok2str(isis_tlv_router_capability_flags, "none", GET_U_1(tptr+4)));
             ND_PRINT("\n\t      Router-ID %s", GET_IPADDR_STRING(tptr));
             ND_PRINT(", Flags [%s]",
                     bittok2str(isis_tlv_router_capability_flags, "none", GET_U_1(tptr+4)));