CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-juniper.c

diff --git a/print-juniper.c b/print-juniper.c
index 0061b2ba113319bb2c5020e119f8bb40578fc9fa..1948075866a9f2e9d8c1e9f58c0fbdd14d99e9c9 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -22,14 +22,13 @@
 __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
 #endif
 
 __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
 #endif
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 #include <string.h>
 
 
 #include "netdissect-stdinc.h"
 
 #include <string.h>
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"


@@ -484,6 +483,7 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         uint8_t proto;
 
         ndo->ndo_protocol = "juniper_ggsn";
         uint8_t proto;
 
         ndo->ndo_protocol = "juniper_ggsn";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_GGSN;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_GGSN;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -493,13 +493,13 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         p+=l2info.header_len;
         gh = (struct juniper_ggsn_header *)&l2info.cookie;
 
         p+=l2info.header_len;
         gh = (struct juniper_ggsn_header *)&l2info.cookie;
 

-        ND_TCHECK_SIZE(gh);
-        proto = GET_U_1(gh->proto);
+        /* use EXTRACT_, not GET_ (not packet buffer pointer) */
+        proto = EXTRACT_U_1(gh->proto);

         if (ndo->ndo_eflag) {
             ND_PRINT("proto %s (%u), vlan %u: ",
                    tok2str(juniper_protocol_values,"Unknown",proto),
                    proto,
         if (ndo->ndo_eflag) {
             ND_PRINT("proto %s (%u), vlan %u: ",
                    tok2str(juniper_protocol_values,"Unknown",proto),
                    proto,

-                   GET_BE_U_2(gh->vlan_id));
+                   EXTRACT_BE_U_2(gh->vlan_id));

         }
 
         switch (proto) {
         }
 
         switch (proto) {


@@ -515,11 +515,6 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         }
 
         ndo->ndo_ll_hdr_len += l2info.header_len;
         }
 
         ndo->ndo_ll_hdr_len += l2info.header_len;

-        return;
-
-trunc:
-        nd_print_trunc(ndo);
-        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 }
 #endif
 


@@ -541,6 +536,7 @@ juniper_es_if_print(netdissect_options *ndo,
         const struct juniper_ipsec_header *ih;
 
         ndo->ndo_protocol = "juniper_es";
         const struct juniper_ipsec_header *ih;
 
         ndo->ndo_protocol = "juniper_es";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_ES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_ES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -597,11 +593,6 @@ juniper_es_if_print(netdissect_options *ndo,
 
         ip_print(ndo, p, l2info.length);
         ndo->ndo_ll_hdr_len += l2info.header_len;
 
         ip_print(ndo, p, l2info.length);
         ndo->ndo_ll_hdr_len += l2info.header_len;

-        return;
-
-trunc:
-        nd_print_trunc(ndo);
-        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 }
 #endif
 


@@ -620,6 +611,7 @@ juniper_monitor_if_print(netdissect_options *ndo,
         const struct juniper_monitor_header *mh;
 
         ndo->ndo_protocol = "juniper_monitor";
         const struct juniper_monitor_header *mh;
 
         ndo->ndo_protocol = "juniper_monitor";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_MONITOR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_MONITOR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -640,11 +632,6 @@ juniper_monitor_if_print(netdissect_options *ndo,
         ip_heuristic_guess (ndo, p, l2info.length);
 
         ndo->ndo_ll_hdr_len += l2info.header_len;
         ip_heuristic_guess (ndo, p, l2info.length);
 
         ndo->ndo_ll_hdr_len += l2info.header_len;

-        return;
-
-trunc:
-        nd_print_trunc(ndo);
-        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 }
 #endif
 


@@ -664,6 +651,7 @@ juniper_services_if_print(netdissect_options *ndo,
         const struct juniper_services_header *sh;
 
         ndo->ndo_protocol = "juniper_services";
         const struct juniper_services_header *sh;
 
         ndo->ndo_protocol = "juniper_services";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_SERVICES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_SERVICES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -685,11 +673,6 @@ juniper_services_if_print(netdissect_options *ndo,
         ip_heuristic_guess (ndo, p, l2info.length);
 
         ndo->ndo_ll_hdr_len += l2info.header_len;
         ip_heuristic_guess (ndo, p, l2info.length);
 
         ndo->ndo_ll_hdr_len += l2info.header_len;

-        return;
-
-trunc:
-        nd_print_trunc(ndo);
-        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 }
 #endif
 


@@ -701,6 +684,7 @@ juniper_pppoe_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_pppoe";
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_pppoe";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_PPPOE;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_PPPOE;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -709,7 +693,7 @@ juniper_pppoe_if_print(netdissect_options *ndo,
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw ethernet frames */
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw ethernet frames */

-        ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL, FALSE);
+        ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

         ndo->ndo_ll_hdr_len += l2info.header_len;
 }
 #endif
         ndo->ndo_ll_hdr_len += l2info.header_len;
 }
 #endif


@@ -722,6 +706,7 @@ juniper_ether_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_ether";
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_ether";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_ETHER;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_ETHER;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -730,8 +715,9 @@ juniper_ether_if_print(netdissect_options *ndo,
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw Ethernet frames */
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw Ethernet frames */

-        ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL, TRUE);
-        ndo->ndo_ll_hdr_len += l2info.header_len;
+        ndo->ndo_ll_hdr_len +=
+               l2info.header_len +
+               ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

 }
 #endif
 
 }
 #endif
 


@@ -743,6 +729,7 @@ juniper_ppp_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_ppp";
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_ppp";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_PPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_PPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -764,6 +751,7 @@ juniper_frelay_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_frelay";
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_frelay";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_FRELAY;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_FRELAY;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -785,6 +773,7 @@ juniper_chdlc_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_chdlc";
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_chdlc";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_CHDLC;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_CHDLC;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -807,6 +796,7 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
         uint16_t extracted_ethertype;
 
         ndo->ndo_protocol = "juniper_pppoe_atm";
         uint16_t extracted_ethertype;
 
         ndo->ndo_protocol = "juniper_pppoe_atm";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_PPPOE_ATM;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_PPPOE_ATM;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -815,7 +805,6 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
 
         p+=l2info.header_len;
 
 
         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*/
         extracted_ethertype = GET_BE_U_2(p);
         /* this DLT contains nothing but raw PPPoE frames,
          * prepended with a type field*/


@@ -828,11 +817,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;
             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
 
 }
 #endif
 


@@ -844,6 +828,7 @@ juniper_mlppp_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_mlppp";
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_mlppp";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_MLPPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_MLPPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -905,7 +890,6 @@ juniper_mlppp_if_print(netdissect_options *ndo,
 }
 #endif
 
 }
 #endif
 

-

 #ifdef DLT_JUNIPER_MFR
 void
 juniper_mfr_if_print(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_MFR
 void
 juniper_mfr_if_print(netdissect_options *ndo,


@@ -962,6 +946,8 @@ juniper_mfr_if_print(netdissect_options *ndo,
             ND_PRINT("Bundle-ID %u, ", l2info.bundle);
         switch (l2info.proto) {
         case (LLCSAP_ISONS<<8 | LLCSAP_ISONS):
             ND_PRINT("Bundle-ID %u, ", l2info.bundle);
         switch (l2info.proto) {
         case (LLCSAP_ISONS<<8 | LLCSAP_ISONS):

+            /* At least one byte is required */
+            ND_TCHECK_1(p);

             isoclns_print(ndo, p + 1, l2info.length - 1);
             break;
         case (LLC_UI<<8 | NLPID_Q933):
             isoclns_print(ndo, p + 1, l2info.length - 1);
             break;
         case (LLC_UI<<8 | NLPID_Q933):


@@ -986,6 +972,7 @@ juniper_mlfr_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_mlfr";
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_mlfr";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_MLFR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_MLFR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -1021,7 +1008,7 @@ juniper_mlfr_if_print(netdissect_options *ndo,
  *     ATM1 PIC cookie format
  *
  *     +-----+-------------------------+-------------------------------+
  *     ATM1 PIC cookie format
  *
  *     +-----+-------------------------+-------------------------------+

- *     |fmtid|     vc index            |  channel  ID                  |
+ *     |fmtid|     vc index            |  channel ID                   |

  *     +-----+-------------------------+-------------------------------+
  */
 
  *     +-----+-------------------------+-------------------------------+
  */
 


@@ -1035,6 +1022,7 @@ juniper_atm1_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_atm1";
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_atm1";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_ATM1;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_ATM1;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -1049,7 +1037,6 @@ juniper_atm1_if_print(netdissect_options *ndo,
             return;
         }
 
             return;
         }
 

-        ND_TCHECK_3(p);

         if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
             GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
 
         if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
             GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
 


@@ -1061,6 +1048,8 @@ juniper_atm1_if_print(netdissect_options *ndo,
         }
 
         if (GET_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
         }
 
         if (GET_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */

+            /* At least one byte is required */
+            ND_TCHECK_1(p);

             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */
             ndo->ndo_ll_hdr_len += l2info.header_len;
             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -1073,11 +1062,6 @@ juniper_atm1_if_print(netdissect_options *ndo,
         }
 
         ndo->ndo_ll_hdr_len += l2info.header_len;
         }
 
         ndo->ndo_ll_hdr_len += l2info.header_len;

-        return;
-
-trunc:
-        nd_print_trunc(ndo);
-        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 }
 #endif
 


@@ -1085,7 +1069,7 @@ trunc:
  *     ATM2 PIC cookie format
  *
  *     +-------------------------------+---------+---+-----+-----------+
  *     ATM2 PIC cookie format
  *
  *     +-------------------------------+---------+---+-----+-----------+

- *     |     channel ID                |  reserv |AAL| CCRQ| gap cnt   |
+ *     |     channel ID                |reserved |AAL| CCRQ| gap count |

  *     +-------------------------------+---------+---+-----+-----------+
  */
 
  *     +-------------------------------+---------+---+-----+-----------+
  */
 


@@ -1099,6 +1083,7 @@ juniper_atm2_if_print(netdissect_options *ndo,
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_atm2";
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_atm2";

+        memset(&l2info, 0, sizeof(l2info));

         l2info.pictype = DLT_JUNIPER_ATM2;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;
         l2info.pictype = DLT_JUNIPER_ATM2;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0) {
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -1113,7 +1098,6 @@ juniper_atm2_if_print(netdissect_options *ndo,
             return;
         }
 
             return;
         }
 

-        ND_TCHECK_3(p);

         if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
             GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
 
         if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
             GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
 


@@ -1127,12 +1111,14 @@ juniper_atm2_if_print(netdissect_options *ndo,
         if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */
             /* use EXTRACT_, not GET_ (not packet buffer pointer) */
             (EXTRACT_BE_U_4(l2info.cookie) & ATM2_GAP_COUNT_MASK)) {
         if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */
             /* use EXTRACT_, not GET_ (not packet buffer pointer) */
             (EXTRACT_BE_U_4(l2info.cookie) & ATM2_GAP_COUNT_MASK)) {

-            ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL, FALSE);
+            ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

             ndo->ndo_ll_hdr_len += l2info.header_len;
             return;
         }
 
         if (GET_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
             ndo->ndo_ll_hdr_len += l2info.header_len;
             return;
         }
 
         if (GET_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */

+            /* At least one byte is required */
+            ND_TCHECK_1(p);

             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */
             ndo->ndo_ll_hdr_len += l2info.header_len;
             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */
             ndo->ndo_ll_hdr_len += l2info.header_len;


@@ -1150,11 +1136,6 @@ juniper_atm2_if_print(netdissect_options *ndo,
         }
 
         ndo->ndo_ll_hdr_len += l2info.header_len;
         }
 
         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
 }
 
 /* try to guess, based on all PPP protos that are supported in


@@ -1182,7 +1163,6 @@ juniper_ppp_heuristic_guess(netdissect_options *ndo,
 
     default:
         return 0; /* did not find a ppp header */
 
     default:
         return 0; /* did not find a ppp header */

-        break;

     }
     return 1; /* we printed a ppp packet */
 }
     }
     return 1; /* we printed a ppp packet */
 }


@@ -1226,7 +1206,6 @@ ip_heuristic_guess(netdissect_options *ndo,
         break;
     default:
         return 0; /* did not find a ip header */
         break;
     default:
         return 0; /* did not find a ip header */

-        break;

     }
     return 1; /* we printed an v4/v6 packet */
 }
     }
     return 1; /* we printed an v4/v6 packet */
 }


@@ -1283,8 +1262,8 @@ static int
 juniper_parse_header(netdissect_options *ndo,
                      const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info)
 {
 juniper_parse_header(netdissect_options *ndo,
                      const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info)
 {

-    const struct juniper_cookie_table_t *lp = juniper_cookie_table;
-    u_int idx, jnx_ext_len, jnx_header_len = 0;
+    const struct juniper_cookie_table_t *lp;
+    u_int idx, extension_length, jnx_header_len = 0;

     uint8_t tlv_type,tlv_len;
 #ifdef DLT_JUNIPER_ATM2
     uint32_t control_word;
     uint8_t tlv_type,tlv_len;
 #ifdef DLT_JUNIPER_ATM2
     uint32_t control_word;


@@ -1292,15 +1271,12 @@ juniper_parse_header(netdissect_options *ndo,
     int tlv_value;
     const u_char *tptr;
 
     int tlv_value;
     const u_char *tptr;
 

-

     l2info->header_len = 0;
     l2info->cookie_len = 0;
     l2info->proto = 0;
 
     l2info->header_len = 0;
     l2info->cookie_len = 0;
     l2info->proto = 0;
 

-

     l2info->length = h->len;
     l2info->caplen = h->caplen;
     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;
 
     l2info->flags = GET_U_1(p + 3);
     l2info->direction = GET_U_1(p + 3) & JUNIPER_BPF_PKT_IN;
 


@@ -1325,21 +1301,20 @@ juniper_parse_header(netdissect_options *ndo,
         tptr = p+jnx_header_len;
 
         /* ok to read extension length ? */
         tptr = p+jnx_header_len;
 
         /* ok to read extension length ? */

-        ND_TCHECK_2(tptr);
-        jnx_ext_len = GET_BE_U_2(tptr);
+        extension_length = GET_BE_U_2(tptr);

         jnx_header_len += 2;
         tptr +=2;
 
         /* nail up the total length -
          * just in case something goes wrong
          * with TLV parsing */
         jnx_header_len += 2;
         tptr +=2;
 
         /* nail up the total length -
          * just in case something goes wrong
          * with TLV parsing */

-        jnx_header_len += jnx_ext_len;
+        jnx_header_len += extension_length;

 
         if (ndo->ndo_vflag > 1)
 
         if (ndo->ndo_vflag > 1)

-            ND_PRINT(", PCAP Extension(s) total length %u", jnx_ext_len);
+            ND_PRINT(", PCAP Extension(s) total length %u", extension_length);

 
 

-        ND_TCHECK_LEN(tptr, jnx_ext_len);
-        while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) {
+        ND_TCHECK_LEN(tptr, extension_length);
+        while (extension_length > JUNIPER_EXT_TLV_OVERHEAD) {

             tlv_type = GET_U_1(tptr);
             tptr++;
             tlv_len = GET_U_1(tptr);
             tlv_type = GET_U_1(tptr);
             tptr++;
             tlv_len = GET_U_1(tptr);


@@ -1349,8 +1324,8 @@ juniper_parse_header(netdissect_options *ndo,
             /* sanity checks */
             if (tlv_type == 0 || tlv_len == 0)
                 break;
             /* sanity checks */
             if (tlv_type == 0 || tlv_len == 0)
                 break;

-            if (tlv_len+JUNIPER_EXT_TLV_OVERHEAD > jnx_ext_len)
-                goto trunc;
+            ND_ICHECK_U(extension_length, <,
+                        tlv_len + JUNIPER_EXT_TLV_OVERHEAD);

 
             if (ndo->ndo_vflag > 1)
                 ND_PRINT("\n\t  %s Extension TLV #%u, length %u, value ",
 
             if (ndo->ndo_vflag > 1)
                 ND_PRINT("\n\t  %s Extension TLV #%u, length %u, value ",


@@ -1393,7 +1368,7 @@ juniper_parse_header(netdissect_options *ndo,
             }
 
             tptr+=tlv_len;
             }
 
             tptr+=tlv_len;

-            jnx_ext_len -= tlv_len+JUNIPER_EXT_TLV_OVERHEAD;
+            extension_length -= tlv_len+JUNIPER_EXT_TLV_OVERHEAD;

         }
 
         if (ndo->ndo_vflag > 1)
         }
 
         if (ndo->ndo_vflag > 1)


@@ -1422,69 +1397,67 @@ juniper_parse_header(netdissect_options *ndo,
     l2info->length -= l2info->header_len;
     l2info->caplen -= l2info->header_len;
 
     l2info->length -= l2info->header_len;
     l2info->caplen -= l2info->header_len;
 

-    /* search through the cookie table and copy values matching for our PIC type */
-    ND_TCHECK_1(p);
-    while (lp->s != NULL) {
-        if (lp->pictype == l2info->pictype) {
+    /* search through the cookie table for one matching our PIC type */
+    lp = NULL;
+    for (const struct juniper_cookie_table_t *table_lp = juniper_cookie_table;
+         table_lp->s != NULL; table_lp++) {
+        if (table_lp->pictype == l2info->pictype) {
+            lp = table_lp;
+            break;
+        }
+    }

 
 

-            l2info->cookie_len += lp->cookie_len;
+    /* If we found one matching our PIC type, copy its values */
+    if (lp != NULL) {
+        l2info->cookie_len += lp->cookie_len;

 
 

-            switch (GET_U_1(p)) {
-            case LS_COOKIE_ID:
-                l2info->cookie_type = LS_COOKIE_ID;
-                l2info->cookie_len += 2;
-                break;
-            case AS_COOKIE_ID:
-                l2info->cookie_type = AS_COOKIE_ID;
-                l2info->cookie_len = 8;
-                break;
-
-            default:
-                l2info->bundle = l2info->cookie[0];
-                break;
-            }
+        switch (GET_U_1(p)) {
+        case LS_COOKIE_ID:
+            l2info->cookie_type = LS_COOKIE_ID;
+            l2info->cookie_len += 2;
+            break;
+        case AS_COOKIE_ID:
+            l2info->cookie_type = AS_COOKIE_ID;
+            l2info->cookie_len = 8;
+            break;

 
 

+        default:
+            l2info->bundle = l2info->cookie[0];
+            break;
+        }

 
 #ifdef DLT_JUNIPER_MFR
 
 #ifdef DLT_JUNIPER_MFR

-            /* MFR child links don't carry cookies */
-            if (l2info->pictype == DLT_JUNIPER_MFR &&
-                (GET_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) {
-                l2info->cookie_len = 0;
-            }
+        /* MFR child links don't carry cookies */
+        if (l2info->pictype == DLT_JUNIPER_MFR &&
+            (GET_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) {
+            l2info->cookie_len = 0;
+        }

 #endif
 
 #endif
 

-            l2info->header_len += l2info->cookie_len;
-            l2info->length -= l2info->cookie_len;
-            l2info->caplen -= l2info->cookie_len;
+        l2info->header_len += l2info->cookie_len;
+        l2info->length -= l2info->cookie_len;
+        l2info->caplen -= l2info->cookie_len;

 
 

-            if (ndo->ndo_eflag)
-                ND_PRINT("%s-PIC, cookie-len %u",
-                       lp->s,
-                       l2info->cookie_len);
+        if (ndo->ndo_eflag)
+            ND_PRINT("%s-PIC, cookie-len %u",
+                   lp->s,
+                   l2info->cookie_len);

 
 

-            if (l2info->cookie_len > 8) {
-                nd_print_invalid(ndo);
-                return 0;
-            }
+        ND_ICHECKMSG_U("cookie length", l2info->cookie_len, >, 8);

 
 

-            if (l2info->cookie_len > 0) {
-                ND_TCHECK_LEN(p, l2info->cookie_len);
-                if (ndo->ndo_eflag)
-                    ND_PRINT(", cookie 0x");
-                for (idx = 0; idx < l2info->cookie_len; idx++) {
-                    l2info->cookie[idx] = GET_U_1(p + idx); /* copy cookie data */
-                    if (ndo->ndo_eflag) ND_PRINT("%02x", GET_U_1(p + idx));
-                }
+        if (l2info->cookie_len > 0) {
+            ND_TCHECK_LEN(p, l2info->cookie_len);
+            if (ndo->ndo_eflag)
+                ND_PRINT(", cookie 0x");
+            for (idx = 0; idx < l2info->cookie_len; idx++) {
+                l2info->cookie[idx] = GET_U_1(p + idx); /* copy cookie data */
+                if (ndo->ndo_eflag) ND_PRINT("%02x", GET_U_1(p + idx));

             }
             }

+        }

 
 

-            if (ndo->ndo_eflag) ND_PRINT(": "); /* print demarc b/w L2/L3*/
-
+        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;
-        }
-        ++lp;
+        l2info->proto = GET_BE_U_2(p + l2info->cookie_len);

     }
     p+=l2info->cookie_len;
 
     }
     p+=l2info->cookie_len;
 


@@ -1511,7 +1484,6 @@ juniper_parse_header(netdissect_options *ndo,
     case DLT_JUNIPER_MLFR:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:
     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;
             l2info->bundle = l2info->cookie[1];
             l2info->proto = GET_BE_U_2(p);
             l2info->header_len += 2;


@@ -1536,7 +1508,6 @@ juniper_parse_header(netdissect_options *ndo,
     case DLT_JUNIPER_MFR:
         switch (l2info->cookie_type) {
         case LS_COOKIE_ID:
     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;
             l2info->bundle = l2info->cookie[1];
             l2info->proto = GET_BE_U_2(p);
             l2info->header_len += 2;


@@ -1576,10 +1547,18 @@ juniper_parse_header(netdissect_options *ndo,
         }
         break;
 #endif
         }
         break;
 #endif

+#ifdef DLT_JUNIPER_ES
+    case DLT_JUNIPER_ES:
+        break;
+#endif

 #ifdef DLT_JUNIPER_GGSN
     case DLT_JUNIPER_GGSN:
         break;
 #endif
 #ifdef DLT_JUNIPER_GGSN
     case DLT_JUNIPER_GGSN:
         break;
 #endif

+#ifdef DLT_JUNIPER_SERVICES
+    case DLT_JUNIPER_SERVICES:
+        break;
+#endif

 #ifdef DLT_JUNIPER_ATM1
     case DLT_JUNIPER_ATM1:
         break;
 #ifdef DLT_JUNIPER_ATM1
     case DLT_JUNIPER_ATM1:
         break;


@@ -1600,18 +1579,30 @@ juniper_parse_header(netdissect_options *ndo,
     case DLT_JUNIPER_FRELAY:
         break;
 #endif
     case DLT_JUNIPER_FRELAY:
         break;
 #endif

+#ifdef DLT_JUNIPER_MONITOR
+    case DLT_JUNIPER_MONITOR:
+        break;
+#endif
+#ifdef DLT_JUNIPER_PPPOE
+    case DLT_JUNIPER_PPPOE:
+        break;
+#endif
+#ifdef DLT_JUNIPER_PPPOE_ATM
+    case DLT_JUNIPER_PPPOE_ATM:
+        break;
+#endif

 
     default:
         ND_PRINT("Unknown Juniper DLT_ type %u: ", l2info->pictype);
         break;
     }
 
 
     default:
         ND_PRINT("Unknown Juniper DLT_ type %u: ", l2info->pictype);
         break;
     }
 

-    if (ndo->ndo_eflag > 1)
+    if (ndo->ndo_eflag)

         ND_PRINT("hlen %u, proto 0x%04x, ", l2info->header_len, l2info->proto);
 
     return 1; /* everything went ok so far. continue parsing */
         ND_PRINT("hlen %u, proto 0x%04x, ", l2info->header_len, l2info->proto);
 
     return 1; /* everything went ok so far. continue parsing */

-trunc:
-    nd_print_trunc(ndo);
+invalid:
+    nd_print_invalid(ndo);

     return 0;
 }
 #endif /* defined(DLT_JUNIPER_GGSN) || defined(DLT_JUNIPER_ES) || \
     return 0;
 }
 #endif /* defined(DLT_JUNIPER_GGSN) || defined(DLT_JUNIPER_ES) || \