X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/0c93b15d38b3f63047344fcb2ea920e73498bb3d..3fd60b0828c99dc00557c2a8328ed6b1423629a1:/print-juniper.c?ds=sidebyside

diff --git a/print-juniper.c b/print-juniper.c
index e668d0e7..1560cee5 100644
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -816,7 +816,6 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
 
         p+=l2info.header_len;
 
-        ND_TCHECK_2(p);
         extracted_ethertype = GET_BE_U_2(p);
         /* this DLT contains nothing but raw PPPoE frames,
          * prepended with a type field*/
@@ -829,11 +828,6 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
             ND_PRINT("unknown ethertype 0x%04x", extracted_ethertype);
 
         ndo->ndo_ll_hdr_len += l2info.header_len;
-        return;
-
-trunc:
-        nd_print_trunc(ndo);
-        ndo->ndo_ll_hdr_len += l2info.header_len;
 }
 #endif
 
@@ -1050,7 +1044,6 @@ juniper_atm1_if_print(netdissect_options *ndo,
             return;
         }
 
-        ND_TCHECK_3(p);
         if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
             GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
 
@@ -1074,11 +1067,6 @@ juniper_atm1_if_print(netdissect_options *ndo,
         }
 
         ndo->ndo_ll_hdr_len += l2info.header_len;
-        return;
-
-trunc:
-        nd_print_trunc(ndo);
-        ndo->ndo_ll_hdr_len += l2info.header_len;
 }
 #endif
 
@@ -1114,7 +1102,6 @@ juniper_atm2_if_print(netdissect_options *ndo,
             return;
         }
 
-        ND_TCHECK_3(p);
         if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
             GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
 
@@ -1151,11 +1138,6 @@ juniper_atm2_if_print(netdissect_options *ndo,
         }
 
         ndo->ndo_ll_hdr_len += l2info.header_len;
-        return;
-
-trunc:
-        nd_print_trunc(ndo);
-        ndo->ndo_ll_hdr_len += l2info.header_len;
 }
 
 /* try to guess, based on all PPP protos that are supported in
@@ -1301,7 +1283,6 @@ juniper_parse_header(netdissect_options *ndo,
 
     l2info->length = h->len;
     l2info->caplen = h->caplen;
-    ND_TCHECK_4(p);
     l2info->flags = GET_U_1(p + 3);
     l2info->direction = GET_U_1(p + 3) & JUNIPER_BPF_PKT_IN;
 
@@ -1326,7 +1307,6 @@ juniper_parse_header(netdissect_options *ndo,
         tptr = p+jnx_header_len;
 
         /* ok to read extension length ? */
-        ND_TCHECK_2(tptr);
         jnx_ext_len = GET_BE_U_2(tptr);
         jnx_header_len += 2;
         tptr +=2;
@@ -1481,7 +1461,6 @@ juniper_parse_header(netdissect_options *ndo,
             if (ndo->ndo_eflag) ND_PRINT(": "); /* print demarc b/w L2/L3*/
 
 
-            ND_TCHECK_2(p + l2info->cookie_len);
             l2info->proto = GET_BE_U_2(p + l2info->cookie_len);
             break;
         }
@@ -1512,7 +1491,6 @@ juniper_parse_header(netdissect_options *ndo,
     case DLT_JUNIPER_MLFR:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:
-            ND_TCHECK_2(p);
             l2info->bundle = l2info->cookie[1];
             l2info->proto = GET_BE_U_2(p);
             l2info->header_len += 2;
@@ -1537,7 +1515,6 @@ juniper_parse_header(netdissect_options *ndo,
     case DLT_JUNIPER_MFR:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:
-            ND_TCHECK_2(p);
             l2info->bundle = l2info->cookie[1];
             l2info->proto = GET_BE_U_2(p);
             l2info->header_len += 2;