X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3712d818767d26ddecbaaf40de4c000a86620c6a..c5a34f01b4d03a0c24f9abb57f0db45c502aceb5:/print-juniper.c?ds=sidebyside

diff --git a/print-juniper.c b/print-juniper.c
index 843488b8..416b2f19 100644
--- a/print-juniper.c
+++ b/print-juniper.c
@@ -425,11 +425,11 @@ struct juniper_l2info_t {
     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 bundle;
+    u_int bundle;
     uint16_t proto;
     uint8_t flags;
 };
@@ -483,7 +483,7 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         const struct juniper_ggsn_header *gh;
         uint8_t proto;
 
-	ndo->ndo_protocol = "juniper_ggsn_if";
+        ndo->ndo_protocol = "juniper_ggsn";
         l2info.pictype = DLT_JUNIPER_GGSN;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -492,12 +492,12 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         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,
-                   EXTRACT_BE_U_2(gh->vlan_id));
+                   GET_BE_U_2(gh->vlan_id));
         }
 
         switch (proto) {
@@ -515,8 +515,8 @@ juniper_ggsn_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-	nd_print_trunc(ndo);
-	return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -537,7 +537,7 @@ juniper_es_if_print(netdissect_options *ndo,
         u_int rewrite_len,es_type_bundle;
         const struct juniper_ipsec_header *ih;
 
-	ndo->ndo_protocol = "juniper_es_if";
+        ndo->ndo_protocol = "juniper_es";
         l2info.pictype = DLT_JUNIPER_ES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -546,7 +546,7 @@ juniper_es_if_print(netdissect_options *ndo,
         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;
@@ -560,7 +560,7 @@ juniper_es_if_print(netdissect_options *ndo,
             break;
         default:
             ND_PRINT("ES Invalid type %u, length %u",
-                   EXTRACT_U_1(ih->type),
+                   GET_U_1(ih->type),
                    l2info.length);
             return l2info.header_len;
         }
@@ -571,20 +571,20 @@ 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",
-                       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),
+                       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),
                        ipaddr_string(ndo, ih->src_ip),
                        ipaddr_string(ndo, ih->dst_ip),
                        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);
             }
         }
@@ -593,8 +593,8 @@ juniper_es_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-	nd_print_trunc(ndo);
-	return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -612,7 +612,7 @@ juniper_monitor_if_print(netdissect_options *ndo,
         };
         const struct juniper_monitor_header *mh;
 
-	ndo->ndo_protocol = "juniper_monitor_if";
+        ndo->ndo_protocol = "juniper_monitor";
         l2info.pictype = DLT_JUNIPER_MONITOR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -623,9 +623,9 @@ 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: ",
-                   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);
@@ -633,8 +633,8 @@ juniper_monitor_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-	nd_print_trunc(ndo);
-	return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -653,7 +653,7 @@ juniper_services_if_print(netdissect_options *ndo,
         };
         const struct juniper_services_header *sh;
 
-	ndo->ndo_protocol = "juniper_services_if";
+        ndo->ndo_protocol = "juniper_services";
         l2info.pictype = DLT_JUNIPER_SERVICES;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -664,10 +664,10 @@ 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: ",
-                   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);
@@ -675,8 +675,8 @@ juniper_services_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-	nd_print_trunc(ndo);
-	return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -687,7 +687,7 @@ juniper_pppoe_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_pppoe_if";
+        ndo->ndo_protocol = "juniper_pppoe";
         l2info.pictype = DLT_JUNIPER_PPPOE;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -706,7 +706,7 @@ juniper_ether_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_ether_if";
+        ndo->ndo_protocol = "juniper_ether";
         l2info.pictype = DLT_JUNIPER_ETHER;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -725,7 +725,7 @@ juniper_ppp_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_ppp_if";
+        ndo->ndo_protocol = "juniper_ppp";
         l2info.pictype = DLT_JUNIPER_PPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -744,7 +744,7 @@ juniper_frelay_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_frelay_if";
+        ndo->ndo_protocol = "juniper_frelay";
         l2info.pictype = DLT_JUNIPER_FRELAY;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -763,7 +763,7 @@ juniper_chdlc_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_chdlc_if";
+        ndo->ndo_protocol = "juniper_chdlc";
         l2info.pictype = DLT_JUNIPER_CHDLC;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -781,9 +781,9 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
                            const struct pcap_pkthdr *h, const u_char *p)
 {
         struct juniper_l2info_t l2info;
-	uint16_t extracted_ethertype;
+        uint16_t extracted_ethertype;
 
-	ndo->ndo_protocol = "juniper_pppoe_atm_if";
+        ndo->ndo_protocol = "juniper_pppoe_atm";
         l2info.pictype = DLT_JUNIPER_PPPOE_ATM;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -791,7 +791,7 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
         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,
@@ -805,8 +805,8 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo,
         return l2info.header_len;
 
 trunc:
-	nd_print_trunc(ndo);
-	return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -817,7 +817,7 @@ juniper_mlppp_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_mlppp_if";
+        ndo->ndo_protocol = "juniper_mlppp";
         l2info.pictype = DLT_JUNIPER_MLPPP;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -825,7 +825,9 @@ juniper_mlppp_if_print(netdissect_options *ndo,
         /* 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 &&
+            /* 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);
 
@@ -856,6 +858,7 @@ juniper_mlppp_if_print(netdissect_options *ndo,
         }
 
         /* 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);
@@ -878,7 +881,7 @@ juniper_mfr_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_mfr_if";
+        ndo->ndo_protocol = "juniper_mfr";
         memset(&l2info, 0, sizeof(l2info));
         l2info.pictype = DLT_JUNIPER_MFR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
@@ -914,6 +917,7 @@ juniper_mfr_if_print(netdissect_options *ndo,
         }
 
         /* 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) {
@@ -941,7 +945,7 @@ juniper_mlfr_if_print(netdissect_options *ndo,
 {
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_mlfr_if";
+        ndo->ndo_protocol = "juniper_mlfr";
         l2info.pictype = DLT_JUNIPER_MLFR;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -949,6 +953,7 @@ juniper_mlfr_if_print(netdissect_options *ndo,
         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) {
@@ -987,7 +992,7 @@ juniper_atm1_if_print(netdissect_options *ndo,
 
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_atm1_if";
+        ndo->ndo_protocol = "juniper_atm1";
         l2info.pictype = DLT_JUNIPER_ATM1;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -1000,15 +1005,15 @@ juniper_atm1_if_print(netdissect_options *ndo,
         }
 
         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);
             if (llc_hdrlen > 0)
                 return l2info.header_len;
         }
 
-        if (EXTRACT_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
+        if (GET_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */
             return l2info.header_len;
@@ -1017,11 +1022,11 @@ juniper_atm1_if_print(netdissect_options *ndo,
         if (ip_heuristic_guess(ndo, p, l2info.length) != 0) /* last try - vcmux encaps ? */
             return l2info.header_len;
 
-	return l2info.header_len;
+        return l2info.header_len;
 
 trunc:
-	nd_print_trunc(ndo);
-	return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 #endif
 
@@ -1042,7 +1047,7 @@ juniper_atm2_if_print(netdissect_options *ndo,
 
         struct juniper_l2info_t l2info;
 
-	ndo->ndo_protocol = "juniper_atm2_if";
+        ndo->ndo_protocol = "juniper_atm2";
         l2info.pictype = DLT_JUNIPER_ATM2;
         if (juniper_parse_header(ndo, p, h, &l2info) == 0)
             return l2info.header_len;
@@ -1055,8 +1060,8 @@ juniper_atm2_if_print(netdissect_options *ndo,
         }
 
         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);
             if (llc_hdrlen > 0)
@@ -1064,12 +1069,13 @@ 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)) {
             ether_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL);
             return l2info.header_len;
         }
 
-        if (EXTRACT_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
+        if (GET_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */
             isoclns_print(ndo, p + 1, l2info.length - 1);
             /* FIXME check if frame was recognized */
             return l2info.header_len;
@@ -1081,11 +1087,11 @@ juniper_atm2_if_print(netdissect_options *ndo,
         if (ip_heuristic_guess(ndo, p, l2info.length) != 0) /* last try - vcmux encaps ? */
             return l2info.header_len;
 
-	return l2info.header_len;
+        return l2info.header_len;
 
 trunc:
-	nd_print_trunc(ndo);
-	return l2info.header_len;
+        nd_print_trunc(ndo);
+        return l2info.header_len;
 }
 
 /* try to guess, based on all PPP protos that are supported in
@@ -1094,7 +1100,7 @@ static int
 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 :
@@ -1123,7 +1129,7 @@ static int
 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:
@@ -1135,8 +1141,8 @@ ip_heuristic_guess(netdissect_options *ndo,
     case 0x4d:
     case 0x4e:
     case 0x4f:
-	    ip_print(ndo, p, length);
-	    break;
+        ip_print(ndo, p, length);
+        break;
     case 0x60:
     case 0x61:
     case 0x62:
@@ -1163,7 +1169,8 @@ ip_heuristic_guess(netdissect_options *ndo,
 }
 
 static int
-juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len)
+juniper_read_tlv_value(netdissect_options *ndo,
+		       const u_char *p, u_int tlv_type, u_int tlv_len)
 {
    int tlv_value;
 
@@ -1171,16 +1178,16 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len)
    if (tlv_type < 128) {
        switch (tlv_len) {
        case 1:
-           tlv_value = EXTRACT_U_1(p);
+           tlv_value = GET_U_1(p);
            break;
        case 2:
-           tlv_value = EXTRACT_LE_U_2(p);
+           tlv_value = GET_LE_U_2(p);
            break;
        case 3:
-           tlv_value = EXTRACT_LE_U_3(p);
+           tlv_value = GET_LE_U_3(p);
            break;
        case 4:
-           tlv_value = EXTRACT_LE_U_4(p);
+           tlv_value = GET_LE_U_4(p);
            break;
        default:
            tlv_value = -1;
@@ -1190,16 +1197,16 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len)
        /* 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:
-           tlv_value = EXTRACT_BE_U_2(p);
+           tlv_value = GET_BE_U_2(p);
            break;
        case 3:
-           tlv_value = EXTRACT_BE_U_3(p);
+           tlv_value = GET_BE_U_3(p);
            break;
        case 4:
-           tlv_value = EXTRACT_BE_U_4(p);
+           tlv_value = GET_BE_U_4(p);
            break;
        default:
            tlv_value = -1;
@@ -1231,10 +1238,10 @@ juniper_parse_header(netdissect_options *ndo,
     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;
     }
@@ -1256,7 +1263,7 @@ juniper_parse_header(netdissect_options *ndo,
 
         /* 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;
 
@@ -1270,9 +1277,9 @@ juniper_parse_header(netdissect_options *ndo,
 
         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++;
-            tlv_len = EXTRACT_U_1(tptr);
+            tlv_len = GET_U_1(tptr);
             tptr++;
             tlv_value = 0;
 
@@ -1288,7 +1295,7 @@ juniper_parse_header(netdissect_options *ndo,
                        tlv_type,
                        tlv_len);
 
-            tlv_value = juniper_read_tlv_value(tptr, tlv_type, tlv_len);
+            tlv_value = juniper_read_tlv_value(ndo, tptr, tlv_type, tlv_len);
             switch (tlv_type) {
             case JUNIPER_EXT_TLV_IFD_NAME:
                 /* FIXME */
@@ -1359,7 +1366,7 @@ juniper_parse_header(netdissect_options *ndo,
 
             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;
@@ -1378,7 +1385,7 @@ juniper_parse_header(netdissect_options *ndo,
 #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
@@ -1392,13 +1399,18 @@ juniper_parse_header(netdissect_options *ndo,
                        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++) {
-                    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));
                 }
             }
 
@@ -1406,7 +1418,7 @@ juniper_parse_header(netdissect_options *ndo,
 
 
             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;
@@ -1422,6 +1434,7 @@ juniper_parse_header(netdissect_options *ndo,
             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;
@@ -1437,12 +1450,13 @@ juniper_parse_header(netdissect_options *ndo,
         case LS_COOKIE_ID:
             ND_TCHECK_2(p);
             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:
+            /* 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;
@@ -1461,12 +1475,13 @@ juniper_parse_header(netdissect_options *ndo,
         case LS_COOKIE_ID:
             ND_TCHECK_2(p);
             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:
+            /* 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;
@@ -1481,7 +1496,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) {
-            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 */