bgp: Parse BGP extended message support capability

[tcpdump] / print-juniper.c

diff --git a/print-juniper.c b/print-juniper.c
index c4fb9dd8533d05926e3217b9abacfed9a3e31ef0..ea6f3f9fe2b31fb3eb040ae993bee1071d3a4bea 100644 (file)
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -30,6 +30,7 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp ");
 
 #include <string.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"


@@ -425,11 +426,11 @@ struct juniper_l2info_t {
     uint32_t caplen;
     uint32_t pictype;
     uint8_t direction;
     uint32_t caplen;
     uint32_t pictype;
     uint8_t direction;

-    uint8_t header_len;
+    u_int header_len;

     uint8_t cookie_len;
     uint8_t cookie_type;
     uint8_t cookie[8];
     uint8_t cookie_len;
     uint8_t cookie_type;
     uint8_t cookie[8];

-    uint8_t bundle;
+    u_int bundle;

     uint16_t proto;
     uint8_t flags;
 };
     uint16_t proto;
     uint8_t flags;
 };


@@ -467,7 +468,7 @@ static int juniper_ppp_heuristic_guess(netdissect_options *, const u_char *, u_i
 static int juniper_parse_header(netdissect_options *, const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *);
 
 #ifdef DLT_JUNIPER_GGSN
 static int juniper_parse_header(netdissect_options *, const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *);
 
 #ifdef DLT_JUNIPER_GGSN

-u_int
+void

 juniper_ggsn_if_print(netdissect_options *ndo,
                       const struct pcap_pkthdr *h, const u_char *p)
 {
 juniper_ggsn_if_print(netdissect_options *ndo,
                       const struct pcap_pkthdr *h, const u_char *p)
 {


@@ -484,20 +485,23 @@ 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;
         l2info.pictype = DLT_JUNIPER_GGSN;

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

 
         p+=l2info.header_len;
         gh = (struct juniper_ggsn_header *)&l2info.cookie;
 
         ND_TCHECK_SIZE(gh);
 
         p+=l2info.header_len;
         gh = (struct juniper_ggsn_header *)&l2info.cookie;
 
         ND_TCHECK_SIZE(gh);

-        proto = EXTRACT_U_1(gh->proto);
+        proto = GET_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,

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

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


@@ -512,16 +516,12 @@ juniper_ggsn_if_print(netdissect_options *ndo,
                 ND_PRINT("unknown GGSN proto (%u)", proto);
         }
 
                 ND_PRINT("unknown GGSN proto (%u)", proto);
         }
 

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

 }
 #endif
 
 #ifdef DLT_JUNIPER_ES
 }
 #endif
 
 #ifdef DLT_JUNIPER_ES

-u_int
+void

 juniper_es_if_print(netdissect_options *ndo,
                     const struct pcap_pkthdr *h, const u_char *p)
 {
 juniper_es_if_print(netdissect_options *ndo,
                     const struct pcap_pkthdr *h, const u_char *p)
 {


@@ -538,15 +538,18 @@ 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;
         l2info.pictype = DLT_JUNIPER_ES;

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

 
         p+=l2info.header_len;
         ih = (const struct juniper_ipsec_header *)p;
 
         ND_TCHECK_SIZE(ih);
 
         p+=l2info.header_len;
         ih = (const struct juniper_ipsec_header *)p;
 
         ND_TCHECK_SIZE(ih);

-        switch (EXTRACT_U_1(ih->type)) {
+        switch (GET_U_1(ih->type)) {

         case JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE:
         case JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE:
             rewrite_len = 0;
         case JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE:
         case JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE:
             rewrite_len = 0;


@@ -560,9 +563,10 @@ juniper_es_if_print(netdissect_options *ndo,
             break;
         default:
             ND_PRINT("ES Invalid type %u, length %u",
             break;
         default:
             ND_PRINT("ES Invalid type %u, length %u",

-                   EXTRACT_U_1(ih->type),
+                   GET_U_1(ih->type),

                    l2info.length);
                    l2info.length);

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         }
 
         l2info.length-=rewrite_len;
         }
 
         l2info.length-=rewrite_len;


@@ -571,35 +575,31 @@ juniper_es_if_print(netdissect_options *ndo,
         if (ndo->ndo_eflag) {
             if (!es_type_bundle) {
                 ND_PRINT("ES SA, index %u, ttl %u type %s (%u), spi %u, Tunnel %s > %s, length %u\n",
         if (ndo->ndo_eflag) {
             if (!es_type_bundle) {
                 ND_PRINT("ES SA, index %u, ttl %u type %s (%u), spi %u, Tunnel %s > %s, length %u\n",

-                       EXTRACT_BE_U_2(ih->sa_index),
-                       EXTRACT_U_1(ih->ttl),
-                       tok2str(juniper_ipsec_type_values,"Unknown",EXTRACT_U_1(ih->type)),
-                       EXTRACT_U_1(ih->type),
-                       EXTRACT_BE_U_4(ih->spi),
-                       ipaddr_string(ndo, ih->src_ip),
-                       ipaddr_string(ndo, ih->dst_ip),
+                       GET_BE_U_2(ih->sa_index),
+                       GET_U_1(ih->ttl),
+                       tok2str(juniper_ipsec_type_values,"Unknown",GET_U_1(ih->type)),
+                       GET_U_1(ih->type),
+                       GET_BE_U_4(ih->spi),
+                       GET_IPADDR_STRING(ih->src_ip),
+                       GET_IPADDR_STRING(ih->dst_ip),

                        l2info.length);
             } else {
                 ND_PRINT("ES SA, index %u, ttl %u type %s (%u), length %u\n",
                        l2info.length);
             } else {
                 ND_PRINT("ES SA, index %u, ttl %u type %s (%u), length %u\n",

-                       EXTRACT_BE_U_2(ih->sa_index),
-                       EXTRACT_U_1(ih->ttl),
-                       tok2str(juniper_ipsec_type_values,"Unknown",EXTRACT_U_1(ih->type)),
-                       EXTRACT_U_1(ih->type),
+                       GET_BE_U_2(ih->sa_index),
+                       GET_U_1(ih->ttl),
+                       tok2str(juniper_ipsec_type_values,"Unknown",GET_U_1(ih->type)),
+                       GET_U_1(ih->type),

                        l2info.length);
             }
         }
 
         ip_print(ndo, p, l2info.length);
                        l2info.length);
             }
         }
 
         ip_print(ndo, p, l2info.length);

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

 }
 #endif
 
 #ifdef DLT_JUNIPER_MONITOR
 }
 #endif
 
 #ifdef DLT_JUNIPER_MONITOR

-u_int
+void

 juniper_monitor_if_print(netdissect_options *ndo,
                          const struct pcap_pkthdr *h, const u_char *p)
 {
 juniper_monitor_if_print(netdissect_options *ndo,
                          const struct pcap_pkthdr *h, const u_char *p)
 {


@@ -613,9 +613,12 @@ 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;
         l2info.pictype = DLT_JUNIPER_MONITOR;

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

 
         p+=l2info.header_len;
         mh = (const struct juniper_monitor_header *)p;
 
         p+=l2info.header_len;
         mh = (const struct juniper_monitor_header *)p;


@@ -623,23 +626,19 @@ juniper_monitor_if_print(netdissect_options *ndo,
         ND_TCHECK_SIZE(mh);
         if (ndo->ndo_eflag)
             ND_PRINT("service-id %u, iif %u, pkt-type %u: ",
         ND_TCHECK_SIZE(mh);
         if (ndo->ndo_eflag)
             ND_PRINT("service-id %u, iif %u, pkt-type %u: ",

-                   EXTRACT_BE_U_4(mh->service_id),
-                   EXTRACT_BE_U_2(mh->iif),
-                   EXTRACT_U_1(mh->pkt_type));
+                   GET_BE_U_4(mh->service_id),
+                   GET_BE_U_2(mh->iif),
+                   GET_U_1(mh->pkt_type));

 
         /* no proto field - lets guess by first byte of IP header*/
         ip_heuristic_guess (ndo, p, l2info.length);
 
 
         /* no proto field - lets guess by first byte of IP header*/
         ip_heuristic_guess (ndo, p, l2info.length);
 

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

 }
 #endif
 
 #ifdef DLT_JUNIPER_SERVICES
 }
 #endif
 
 #ifdef DLT_JUNIPER_SERVICES

-u_int
+void

 juniper_services_if_print(netdissect_options *ndo,
                           const struct pcap_pkthdr *h, const u_char *p)
 {
 juniper_services_if_print(netdissect_options *ndo,
                           const struct pcap_pkthdr *h, const u_char *p)
 {


@@ -654,9 +653,12 @@ 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;
         l2info.pictype = DLT_JUNIPER_SERVICES;

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

 
         p+=l2info.header_len;
         sh = (const struct juniper_services_header *)p;
 
         p+=l2info.header_len;
         sh = (const struct juniper_services_header *)p;


@@ -664,119 +666,131 @@ juniper_services_if_print(netdissect_options *ndo,
         ND_TCHECK_SIZE(sh);
         if (ndo->ndo_eflag)
             ND_PRINT("service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ",
         ND_TCHECK_SIZE(sh);
         if (ndo->ndo_eflag)
             ND_PRINT("service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ",

-                   EXTRACT_U_1(sh->svc_id),
-                   EXTRACT_U_1(sh->flags_len),
-                   EXTRACT_BE_U_2(sh->svc_set_id),
-                   EXTRACT_BE_U_3(sh->dir_iif));
+                   GET_U_1(sh->svc_id),
+                   GET_U_1(sh->flags_len),
+                   GET_BE_U_2(sh->svc_set_id),
+                   GET_BE_U_3(sh->dir_iif));

 
         /* no proto field - lets guess by first byte of IP header*/
         ip_heuristic_guess (ndo, p, l2info.length);
 
 
         /* no proto field - lets guess by first byte of IP header*/
         ip_heuristic_guess (ndo, p, l2info.length);
 

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

 }
 #endif
 
 #ifdef DLT_JUNIPER_PPPOE
 }
 #endif
 
 #ifdef DLT_JUNIPER_PPPOE

-u_int
+void

 juniper_pppoe_if_print(netdissect_options *ndo,
                        const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_pppoe";
 juniper_pppoe_if_print(netdissect_options *ndo,
                        const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_pppoe";

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

         l2info.pictype = DLT_JUNIPER_PPPOE;
         l2info.pictype = DLT_JUNIPER_PPPOE;

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

 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw ethernet frames */
         ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw ethernet frames */
         ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

-        return l2info.header_len;
+        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 #ifdef DLT_JUNIPER_ETHER
 }
 #endif
 
 #ifdef DLT_JUNIPER_ETHER

-u_int
+void

 juniper_ether_if_print(netdissect_options *ndo,
                        const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_ether";
 juniper_ether_if_print(netdissect_options *ndo,
                        const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_ether";

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

         l2info.pictype = DLT_JUNIPER_ETHER;
         l2info.pictype = DLT_JUNIPER_ETHER;

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

 
         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);
-        return l2info.header_len;
+        ndo->ndo_ll_hdr_len +=
+               l2info.header_len +
+               ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

 }
 #endif
 
 #ifdef DLT_JUNIPER_PPP
 }
 #endif
 
 #ifdef DLT_JUNIPER_PPP

-u_int
+void

 juniper_ppp_if_print(netdissect_options *ndo,
                      const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_ppp";
 juniper_ppp_if_print(netdissect_options *ndo,
                      const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_ppp";

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

         l2info.pictype = DLT_JUNIPER_PPP;
         l2info.pictype = DLT_JUNIPER_PPP;

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

 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw ppp frames */
         ppp_print(ndo, p, l2info.length);
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw ppp frames */
         ppp_print(ndo, p, l2info.length);

-        return l2info.header_len;
+        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 #ifdef DLT_JUNIPER_FRELAY
 }
 #endif
 
 #ifdef DLT_JUNIPER_FRELAY

-u_int
+void

 juniper_frelay_if_print(netdissect_options *ndo,
                         const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_frelay";
 juniper_frelay_if_print(netdissect_options *ndo,
                         const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_frelay";

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

         l2info.pictype = DLT_JUNIPER_FRELAY;
         l2info.pictype = DLT_JUNIPER_FRELAY;

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

 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw frame-relay frames */
         fr_print(ndo, p, l2info.length);
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw frame-relay frames */
         fr_print(ndo, p, l2info.length);

-        return l2info.header_len;
+        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 #ifdef DLT_JUNIPER_CHDLC
 }
 #endif
 
 #ifdef DLT_JUNIPER_CHDLC

-u_int
+void

 juniper_chdlc_if_print(netdissect_options *ndo,
                        const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_chdlc";
 juniper_chdlc_if_print(netdissect_options *ndo,
                        const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_chdlc";

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

         l2info.pictype = DLT_JUNIPER_CHDLC;
         l2info.pictype = DLT_JUNIPER_CHDLC;

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

 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw c-hdlc frames */
         chdlc_print(ndo, p, l2info.length);
 
         p+=l2info.header_len;
         /* this DLT contains nothing but raw c-hdlc frames */
         chdlc_print(ndo, p, l2info.length);

-        return l2info.header_len;
+        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 #ifdef DLT_JUNIPER_PPPOE_ATM
 }
 #endif
 
 #ifdef DLT_JUNIPER_PPPOE_ATM

-u_int
+void

 juniper_pppoe_atm_if_print(netdissect_options *ndo,
                            const struct pcap_pkthdr *h, const u_char *p)
 {
 juniper_pppoe_atm_if_print(netdissect_options *ndo,
                            const struct pcap_pkthdr *h, const u_char *p)
 {


@@ -784,14 +798,16 @@ 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;
         l2info.pictype = DLT_JUNIPER_PPPOE_ATM;

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

 
         p+=l2info.header_len;
 
 
         p+=l2info.header_len;
 

-        ND_TCHECK_2(p);
-        extracted_ethertype = EXTRACT_BE_U_2(p);
+        extracted_ethertype = GET_BE_U_2(p);

         /* this DLT contains nothing but raw PPPoE frames,
          * prepended with a type field*/
         if (ethertype_print(ndo, extracted_ethertype,
         /* this DLT contains nothing but raw PPPoE frames,
          * prepended with a type field*/
         if (ethertype_print(ndo, extracted_ethertype,


@@ -802,30 +818,31 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
             /* ether_type not known, probably it wasn't one */
             ND_PRINT("unknown ethertype 0x%04x", extracted_ethertype);
 
             /* ether_type not known, probably it wasn't one */
             ND_PRINT("unknown ethertype 0x%04x", extracted_ethertype);
 

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

 }
 #endif
 
 #ifdef DLT_JUNIPER_MLPPP
 }
 #endif
 
 #ifdef DLT_JUNIPER_MLPPP

-u_int
+void

 juniper_mlppp_if_print(netdissect_options *ndo,
                        const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_mlppp";
 juniper_mlppp_if_print(netdissect_options *ndo,
                        const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_mlppp";

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

         l2info.pictype = DLT_JUNIPER_MLPPP;
         l2info.pictype = DLT_JUNIPER_MLPPP;

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

 
         /* suppress Bundle-ID if frame was captured on a child-link
          * best indicator if the cookie looks like a proto */
         if (ndo->ndo_eflag &&
 
         /* suppress Bundle-ID if frame was captured on a child-link
          * best indicator if the cookie looks like a proto */
         if (ndo->ndo_eflag &&

+            /* use EXTRACT_, not GET_ (not packet buffer pointer) */

             EXTRACT_BE_U_2(&l2info.cookie) != PPP_OSI &&
             EXTRACT_BE_U_2(&l2info.cookie) != PPP_OSI &&

+            /* use EXTRACT_, not GET_ (not packet buffer pointer) */

             EXTRACT_BE_U_2(&l2info.cookie) !=  (PPP_ADDRESS << 8 | PPP_CONTROL))
             ND_PRINT("Bundle-ID %u: ", l2info.bundle);
 
             EXTRACT_BE_U_2(&l2info.cookie) !=  (PPP_ADDRESS << 8 | PPP_CONTROL))
             ND_PRINT("Bundle-ID %u: ", l2info.bundle);
 


@@ -841,21 +858,26 @@ juniper_mlppp_if_print(netdissect_options *ndo,
                 ppp_print(ndo, p, l2info.length);
             else
                 ip_print(ndo, p, l2info.length);
                 ppp_print(ndo, p, l2info.length);
             else
                 ip_print(ndo, p, l2info.length);

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         case JUNIPER_LSQ_L3_PROTO_IPV6:
             ip6_print(ndo, p,l2info.length);
         case JUNIPER_LSQ_L3_PROTO_IPV6:
             ip6_print(ndo, p,l2info.length);

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         case JUNIPER_LSQ_L3_PROTO_MPLS:
             mpls_print(ndo, p, l2info.length);
         case JUNIPER_LSQ_L3_PROTO_MPLS:
             mpls_print(ndo, p, l2info.length);

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         case JUNIPER_LSQ_L3_PROTO_ISO:
             isoclns_print(ndo, p, l2info.length);
         case JUNIPER_LSQ_L3_PROTO_ISO:
             isoclns_print(ndo, p, l2info.length);

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         default:
             break;
         }
 
         /* zero length cookie ? */
         default:
             break;
         }
 
         /* zero length cookie ? */

+        /* use EXTRACT_, not GET_ (not packet buffer pointer) */

         switch (EXTRACT_BE_U_2(&l2info.cookie)) {
         case PPP_OSI:
             ppp_print(ndo, p - 2, l2info.length + 2);
         switch (EXTRACT_BE_U_2(&l2info.cookie)) {
         case PPP_OSI:
             ppp_print(ndo, p - 2, l2info.length + 2);


@@ -866,13 +888,13 @@ juniper_mlppp_if_print(netdissect_options *ndo,
             break;
         }
 
             break;
         }
 

-        return l2info.header_len;
+        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 
 #ifdef DLT_JUNIPER_MFR
 }
 #endif
 
 
 #ifdef DLT_JUNIPER_MFR

-u_int
+void

 juniper_mfr_if_print(netdissect_options *ndo,
                      const struct pcap_pkthdr *h, const u_char *p)
 {
 juniper_mfr_if_print(netdissect_options *ndo,
                      const struct pcap_pkthdr *h, const u_char *p)
 {


@@ -881,15 +903,18 @@ juniper_mfr_if_print(netdissect_options *ndo,
         ndo->ndo_protocol = "juniper_mfr";
         memset(&l2info, 0, sizeof(l2info));
         l2info.pictype = DLT_JUNIPER_MFR;
         ndo->ndo_protocol = "juniper_mfr";
         memset(&l2info, 0, sizeof(l2info));
         l2info.pictype = DLT_JUNIPER_MFR;

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

 
         p+=l2info.header_len;
 
         /* child-link ? */
         if (l2info.cookie_len == 0) {
             mfr_print(ndo, p, l2info.length);
 
         p+=l2info.header_len;
 
         /* child-link ? */
         if (l2info.cookie_len == 0) {
             mfr_print(ndo, p, l2info.length);

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         }
 
         /* first try the LSQ protos */
         }
 
         /* first try the LSQ protos */


@@ -897,27 +922,35 @@ juniper_mfr_if_print(netdissect_options *ndo,
             switch(l2info.proto) {
             case JUNIPER_LSQ_L3_PROTO_IPV4:
                 ip_print(ndo, p, l2info.length);
             switch(l2info.proto) {
             case JUNIPER_LSQ_L3_PROTO_IPV4:
                 ip_print(ndo, p, l2info.length);

-                return l2info.header_len;
+                ndo->ndo_ll_hdr_len += l2info.header_len;
+                return;

             case JUNIPER_LSQ_L3_PROTO_IPV6:
                 ip6_print(ndo, p,l2info.length);
             case JUNIPER_LSQ_L3_PROTO_IPV6:
                 ip6_print(ndo, p,l2info.length);

-                return l2info.header_len;
+                ndo->ndo_ll_hdr_len += l2info.header_len;
+                return;

             case JUNIPER_LSQ_L3_PROTO_MPLS:
                 mpls_print(ndo, p, l2info.length);
             case JUNIPER_LSQ_L3_PROTO_MPLS:
                 mpls_print(ndo, p, l2info.length);

-                return l2info.header_len;
+                ndo->ndo_ll_hdr_len += l2info.header_len;
+                return;

             case JUNIPER_LSQ_L3_PROTO_ISO:
                 isoclns_print(ndo, p, l2info.length);
             case JUNIPER_LSQ_L3_PROTO_ISO:
                 isoclns_print(ndo, p, l2info.length);

-                return l2info.header_len;
+                ndo->ndo_ll_hdr_len += l2info.header_len;
+                return;

             default:
                 break;
             }
             default:
                 break;
             }

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         }
 
         /* suppress Bundle-ID if frame was captured on a child-link */
         }
 
         /* suppress Bundle-ID if frame was captured on a child-link */

+        /* use EXTRACT_, not GET_ (not packet buffer pointer) */

         if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1)
             ND_PRINT("Bundle-ID %u, ", l2info.bundle);
         switch (l2info.proto) {
         case (LLCSAP_ISONS<<8 | LLCSAP_ISONS):
         if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1)
             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):


@@ -930,25 +963,29 @@ juniper_mfr_if_print(netdissect_options *ndo,
             ND_PRINT("unknown protocol 0x%04x, length %u", l2info.proto, l2info.length);
         }
 
             ND_PRINT("unknown protocol 0x%04x, length %u", l2info.proto, l2info.length);
         }
 

-        return l2info.header_len;
+        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 #ifdef DLT_JUNIPER_MLFR
 }
 #endif
 
 #ifdef DLT_JUNIPER_MLFR

-u_int
+void

 juniper_mlfr_if_print(netdissect_options *ndo,
                       const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_mlfr";
 juniper_mlfr_if_print(netdissect_options *ndo,
                       const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
 
         ndo->ndo_protocol = "juniper_mlfr";

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

         l2info.pictype = DLT_JUNIPER_MLFR;
         l2info.pictype = DLT_JUNIPER_MLFR;

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

 
         p+=l2info.header_len;
 
         /* suppress Bundle-ID if frame was captured on a child-link */
 
         p+=l2info.header_len;
 
         /* suppress Bundle-ID if frame was captured on a child-link */

+        /* use EXTRACT_, not GET_ (not packet buffer pointer) */

         if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1)
             ND_PRINT("Bundle-ID %u, ", l2info.bundle);
         switch (l2info.proto) {
         if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1)
             ND_PRINT("Bundle-ID %u, ", l2info.bundle);
         switch (l2info.proto) {


@@ -966,7 +1003,7 @@ juniper_mlfr_if_print(netdissect_options *ndo,
             ND_PRINT("unknown protocol 0x%04x, length %u", l2info.proto, l2info.length);
         }
 
             ND_PRINT("unknown protocol 0x%04x, length %u", l2info.proto, l2info.length);
         }
 

-        return l2info.header_len;
+        ndo->ndo_ll_hdr_len += l2info.header_len;

 }
 #endif
 
 }
 #endif
 


@@ -979,7 +1016,7 @@ juniper_mlfr_if_print(netdissect_options *ndo,
  */
 
 #ifdef DLT_JUNIPER_ATM1
  */
 
 #ifdef DLT_JUNIPER_ATM1

-u_int
+void

 juniper_atm1_if_print(netdissect_options *ndo,
                       const struct pcap_pkthdr *h, const u_char *p)
 {
 juniper_atm1_if_print(netdissect_options *ndo,
                       const struct pcap_pkthdr *h, const u_char *p)
 {


@@ -988,40 +1025,46 @@ 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;
         l2info.pictype = DLT_JUNIPER_ATM1;

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

 
         p+=l2info.header_len;
 
         if (l2info.cookie[0] == 0x80) { /* OAM cell ? */
             oam_print(ndo, p, l2info.length, ATM_OAM_NOHEC);
 
         p+=l2info.header_len;
 
         if (l2info.cookie[0] == 0x80) { /* OAM cell ? */
             oam_print(ndo, p, l2info.length, ATM_OAM_NOHEC);

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         }
 
         }
 

-        ND_TCHECK_3(p);
-        if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
-            EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
+        if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
+            GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */

 
             llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
 
             llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

-            if (llc_hdrlen > 0)
-                return l2info.header_len;
+            if (llc_hdrlen > 0) {
+                ndo->ndo_ll_hdr_len += l2info.header_len;
+                return;
+            }

         }
 
         }
 

-        if (EXTRACT_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 */
             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         }
 
         }
 

-        if (ip_heuristic_guess(ndo, p, l2info.length) != 0) /* last try - vcmux encaps ? */
-            return l2info.header_len;
-
-        return l2info.header_len;
+        if (ip_heuristic_guess(ndo, p, l2info.length) != 0) { /* last try - vcmux encaps ? */
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;
+        }

 
 

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

 }
 #endif
 
 }
 #endif
 


@@ -1034,7 +1077,7 @@ trunc:
  */
 
 #ifdef DLT_JUNIPER_ATM2
  */
 
 #ifdef DLT_JUNIPER_ATM2

-u_int
+void

 juniper_atm2_if_print(netdissect_options *ndo,
                       const struct pcap_pkthdr *h, const u_char *p)
 {
 juniper_atm2_if_print(netdissect_options *ndo,
                       const struct pcap_pkthdr *h, const u_char *p)
 {


@@ -1043,49 +1086,59 @@ 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;
         l2info.pictype = DLT_JUNIPER_ATM2;

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

 
         p+=l2info.header_len;
 
         if (l2info.cookie[7] & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */
             oam_print(ndo, p, l2info.length, ATM_OAM_NOHEC);
 
         p+=l2info.header_len;
 
         if (l2info.cookie[7] & ATM2_PKT_TYPE_MASK) { /* OAM cell ? */
             oam_print(ndo, p, l2info.length, ATM_OAM_NOHEC);

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         }
 
         }
 

-        ND_TCHECK_3(p);
-        if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
-            EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */
+        if (GET_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */
+            GET_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */

 
             llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
 
             llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

-            if (llc_hdrlen > 0)
-                return l2info.header_len;
+            if (llc_hdrlen > 0) {
+                ndo->ndo_ll_hdr_len += l2info.header_len;
+                return;
+            }

         }
 
         if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */
         }
 
         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);
             (EXTRACT_BE_U_4(l2info.cookie) & ATM2_GAP_COUNT_MASK)) {
             ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         }
 
         }
 

-        if (EXTRACT_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 */
             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */

-            return l2info.header_len;
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;

         }
 
         }
 

-        if(juniper_ppp_heuristic_guess(ndo, p, l2info.length) != 0) /* PPPoA vcmux encaps ? */
-            return l2info.header_len;
-
-        if (ip_heuristic_guess(ndo, p, l2info.length) != 0) /* last try - vcmux encaps ? */
-            return l2info.header_len;
+        if(juniper_ppp_heuristic_guess(ndo, p, l2info.length) != 0) { /* PPPoA vcmux encaps ? */
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;
+        }

 
 

-        return l2info.header_len;
+        if (ip_heuristic_guess(ndo, p, l2info.length) != 0) { /* last try - vcmux encaps ? */
+            ndo->ndo_ll_hdr_len += l2info.header_len;
+            return;
+        }

 
 

-trunc:
-        nd_print_trunc(ndo);
-        return l2info.header_len;
+        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


@@ -1094,7 +1147,7 @@ static int
 juniper_ppp_heuristic_guess(netdissect_options *ndo,
                             const u_char *p, u_int length)
 {
 juniper_ppp_heuristic_guess(netdissect_options *ndo,
                             const u_char *p, u_int length)
 {

-    switch(EXTRACT_BE_U_2(p)) {
+    switch(GET_BE_U_2(p)) {

     case PPP_IP :
     case PPP_OSI :
     case PPP_MPLS_UCAST :
     case PPP_IP :
     case PPP_OSI :
     case PPP_MPLS_UCAST :


@@ -1123,7 +1176,7 @@ static int
 ip_heuristic_guess(netdissect_options *ndo,
                    const u_char *p, u_int length)
 {
 ip_heuristic_guess(netdissect_options *ndo,
                    const u_char *p, u_int length)
 {

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

     case 0x45:
     case 0x46:
     case 0x47:
     case 0x45:
     case 0x46:
     case 0x47:


@@ -1172,16 +1225,16 @@ juniper_read_tlv_value(netdissect_options *ndo,
    if (tlv_type < 128) {
        switch (tlv_len) {
        case 1:
    if (tlv_type < 128) {
        switch (tlv_len) {
        case 1:

-           tlv_value = EXTRACT_U_1(p);
+           tlv_value = GET_U_1(p);

            break;
        case 2:
            break;
        case 2:

-           tlv_value = EXTRACT_LE_U_2(p);
+           tlv_value = GET_LE_U_2(p);

            break;
        case 3:
            break;
        case 3:

-           tlv_value = EXTRACT_LE_U_3(p);
+           tlv_value = GET_LE_U_3(p);

            break;
        case 4:
            break;
        case 4:

-           tlv_value = EXTRACT_LE_U_4(p);
+           tlv_value = GET_LE_U_4(p);

            break;
        default:
            tlv_value = -1;
            break;
        default:
            tlv_value = -1;


@@ -1191,16 +1244,16 @@ juniper_read_tlv_value(netdissect_options *ndo,
        /* TLVs >= 128 are big endian encoded */
        switch (tlv_len) {
        case 1:
        /* TLVs >= 128 are big endian encoded */
        switch (tlv_len) {
        case 1:

-           tlv_value = EXTRACT_U_1(p);
+           tlv_value = GET_U_1(p);

            break;
        case 2:
            break;
        case 2:

-           tlv_value = EXTRACT_BE_U_2(p);
+           tlv_value = GET_BE_U_2(p);

            break;
        case 3:
            break;
        case 3:

-           tlv_value = EXTRACT_BE_U_3(p);
+           tlv_value = GET_BE_U_3(p);

            break;
        case 4:
            break;
        case 4:

-           tlv_value = EXTRACT_BE_U_4(p);
+           tlv_value = GET_BE_U_4(p);

            break;
        default:
            tlv_value = -1;
            break;
        default:
            tlv_value = -1;


@@ -1231,11 +1284,10 @@ juniper_parse_header(netdissect_options *ndo,
 
     l2info->length = h->len;
     l2info->caplen = h->caplen;
 
     l2info->length = h->len;
     l2info->caplen = h->caplen;

-    ND_TCHECK_4(p);
-    l2info->flags = EXTRACT_U_1(p + 3);
-    l2info->direction = EXTRACT_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;

 
 

-    if (EXTRACT_BE_U_3(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */
+    if (GET_BE_U_3(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */

         ND_PRINT("no magic-number found!");
         return 0;
     }
         ND_PRINT("no magic-number found!");
         return 0;
     }


@@ -1256,8 +1308,7 @@ 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 = EXTRACT_BE_U_2(tptr);
+        jnx_ext_len = GET_BE_U_2(tptr);

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


@@ -1271,9 +1322,9 @@ juniper_parse_header(netdissect_options *ndo,
 
         ND_TCHECK_LEN(tptr, jnx_ext_len);
         while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) {
 
         ND_TCHECK_LEN(tptr, jnx_ext_len);
         while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) {

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

             tptr++;
             tptr++;

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

             tptr++;
             tlv_value = 0;
 
             tptr++;
             tlv_value = 0;
 


@@ -1360,7 +1411,7 @@ juniper_parse_header(netdissect_options *ndo,
 
             l2info->cookie_len += lp->cookie_len;
 
 
             l2info->cookie_len += lp->cookie_len;
 

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

             case LS_COOKIE_ID:
                 l2info->cookie_type = LS_COOKIE_ID;
                 l2info->cookie_len += 2;
             case LS_COOKIE_ID:
                 l2info->cookie_type = LS_COOKIE_ID;
                 l2info->cookie_len += 2;


@@ -1379,7 +1430,7 @@ juniper_parse_header(netdissect_options *ndo,
 #ifdef DLT_JUNIPER_MFR
             /* MFR child links don't carry cookies */
             if (l2info->pictype == DLT_JUNIPER_MFR &&
 #ifdef DLT_JUNIPER_MFR
             /* MFR child links don't carry cookies */
             if (l2info->pictype == DLT_JUNIPER_MFR &&

-                (EXTRACT_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) {
+                (GET_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) {

                 l2info->cookie_len = 0;
             }
 #endif
                 l2info->cookie_len = 0;
             }
 #endif


@@ -1393,21 +1444,25 @@ juniper_parse_header(netdissect_options *ndo,
                        lp->s,
                        l2info->cookie_len);
 
                        lp->s,
                        l2info->cookie_len);
 

+            if (l2info->cookie_len > 8) {
+                nd_print_invalid(ndo);
+                return 0;
+            }
+

             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++) {
             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] = EXTRACT_U_1(p + idx); /* copy cookie data */
-                    if (ndo->ndo_eflag) ND_PRINT("%02x", EXTRACT_U_1(p + 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 = EXTRACT_BE_U_2(p + l2info->cookie_len);
+            l2info->proto = GET_BE_U_2(p + l2info->cookie_len);

             break;
         }
         ++lp;
             break;
         }
         ++lp;


@@ -1423,6 +1478,7 @@ juniper_parse_header(netdissect_options *ndo,
             l2info->bundle = l2info->cookie[1];
             break;
         case AS_COOKIE_ID:
             l2info->bundle = l2info->cookie[1];
             break;
         case AS_COOKIE_ID:

+            /* use EXTRACT_, not GET_ (not packet buffer pointer) */

             l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff;
             l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
             break;
             l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff;
             l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
             break;


@@ -1436,14 +1492,14 @@ 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->bundle = l2info->cookie[1];

-            l2info->proto = EXTRACT_BE_U_2(p);
+            l2info->proto = GET_BE_U_2(p);

             l2info->header_len += 2;
             l2info->length -= 2;
             l2info->caplen -= 2;
             break;
         case AS_COOKIE_ID:
             l2info->header_len += 2;
             l2info->length -= 2;
             l2info->caplen -= 2;
             break;
         case AS_COOKIE_ID:

+            /* use EXTRACT_, not GET_ (not packet buffer pointer) */

             l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff;
             l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
             break;
             l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff;
             l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
             break;


@@ -1460,14 +1516,14 @@ 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->bundle = l2info->cookie[1];

-            l2info->proto = EXTRACT_BE_U_2(p);
+            l2info->proto = GET_BE_U_2(p);

             l2info->header_len += 2;
             l2info->length -= 2;
             l2info->caplen -= 2;
             break;
         case AS_COOKIE_ID:
             l2info->header_len += 2;
             l2info->length -= 2;
             l2info->caplen -= 2;
             break;
         case AS_COOKIE_ID:

+            /* use EXTRACT_, not GET_ (not packet buffer pointer) */

             l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff;
             l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
             break;
             l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff;
             l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK;
             break;


@@ -1482,7 +1538,7 @@ juniper_parse_header(netdissect_options *ndo,
         ND_TCHECK_4(p);
         /* ATM cell relay control word present ? */
         if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK) {
         ND_TCHECK_4(p);
         /* ATM cell relay control word present ? */
         if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK) {

-            control_word = EXTRACT_BE_U_4(p);
+            control_word = GET_BE_U_4(p);

             /* some control word heuristics */
             switch(control_word) {
             case 0: /* zero control word */
             /* some control word heuristics */
             switch(control_word) {
             case 0: /* zero control word */


@@ -1529,7 +1585,7 @@ juniper_parse_header(netdissect_options *ndo,
         break;
     }
 
         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 */