X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bd00116d80c18b782f4cb15dfc90cd5bf993d4f5..HEAD:/print-juniper.c diff --git a/print-juniper.c b/print-juniper.c index 6ae5b6d8..19480758 100644 --- a/print-juniper.c +++ b/print-juniper.c @@ -12,21 +12,24 @@ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * FOR A PARTICULAR PURPOSE. * - * Original code by Hannes Gredler (hannes@juniper.net) + * Original code by Hannes Gredler (hannes@gredler.at) */ +/* \summary: DLT_JUNIPER_* printers */ + #ifndef lint #else __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp "); #endif -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include + +#include "netdissect-stdinc.h" -#include +#include -#include "interface.h" +#define ND_LONGJMP_FROM_TCHECK +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" #include "ppp.h" @@ -35,6 +38,17 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp "); #include "ethertype.h" #include "atm.h" +/* + * If none of the Juniper DLT_s are defined, there's nothing to do. + */ +#if defined(DLT_JUNIPER_GGSN) || defined(DLT_JUNIPER_ES) || \ + defined(DLT_JUNIPER_MONITOR) || defined(DLT_JUNIPER_SERVICES) || \ + defined(DLT_JUNIPER_PPPOE) || defined(DLT_JUNIPER_ETHER) || \ + defined(DLT_JUNIPER_PPP) || defined(DLT_JUNIPER_FRELAY) || \ + defined(DLT_JUNIPER_CHDLC) || defined(DLT_JUNIPER_PPPOE_ATM) || \ + defined(DLT_JUNIPER_MLPPP) || defined(DLT_JUNIPER_MFR) || \ + defined(DLT_JUNIPER_MLFR) || defined(DLT_JUNIPER_ATM1) || \ + defined(DLT_JUNIPER_ATM2) #define JUNIPER_BPF_OUT 0 /* Outgoing packet */ #define JUNIPER_BPF_IN 1 /* Incoming packet */ #define JUNIPER_BPF_PKT_IN 0x1 /* Incoming packet */ @@ -60,6 +74,7 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp "); #define JUNIPER_IPSEC_O_AH_AUTHENTICATION_TYPE 4 #define JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE 5 +#ifdef DLT_JUNIPER_ES static const struct tok juniper_ipsec_type_values[] = { { JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE, "ESP ENCR-AUTH" }, { JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE, "ESP ENCR-AH AUTH" }, @@ -68,6 +83,7 @@ static const struct tok juniper_ipsec_type_values[] = { { JUNIPER_IPSEC_O_ESP_ENCRYPTION_TYPE, "ESP ENCR" }, { 0, NULL} }; +#endif static const struct tok juniper_direction_values[] = { { JUNIPER_BPF_IN, "In"}, @@ -88,7 +104,7 @@ enum { }; /* 1 byte type and 1-byte length */ -#define JUNIPER_EXT_TLV_OVERHEAD 2 +#define JUNIPER_EXT_TLV_OVERHEAD 2U static const struct tok jnx_ext_tlv_values[] = { { JUNIPER_EXT_TLV_IFD_IDX, "Device Interface Index" }, @@ -362,7 +378,7 @@ static const struct tok juniper_ifle_values[] = { struct juniper_cookie_table_t { uint32_t pictype; /* pic type */ - uint8_t cookie_len; /* cookie len */ + uint8_t cookie_len; /* cookie len */ const char *s; /* pic name */ }; @@ -408,11 +424,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; }; @@ -434,48 +450,59 @@ struct juniper_l2info_t { #define MFR_BE_MASK 0xc0 +#ifdef DLT_JUNIPER_GGSN static const struct tok juniper_protocol_values[] = { { JUNIPER_PROTO_NULL, "Null" }, { JUNIPER_PROTO_IPV4, "IPv4" }, { JUNIPER_PROTO_IPV6, "IPv6" }, { 0, NULL} }; +#endif -static int ip_heuristic_guess(netdissect_options *, register const u_char *, u_int); -static int juniper_ppp_heuristic_guess(netdissect_options *, register const u_char *, u_int); +static int ip_heuristic_guess(netdissect_options *, const u_char *, u_int); +#ifdef DLT_JUNIPER_ATM2 +static int juniper_ppp_heuristic_guess(netdissect_options *, const u_char *, u_int); +#endif static int juniper_parse_header(netdissect_options *, const u_char *, const struct pcap_pkthdr *, struct juniper_l2info_t *); #ifdef DLT_JUNIPER_GGSN -u_int -juniper_ggsn_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +void +juniper_ggsn_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, const u_char *p) { struct juniper_l2info_t l2info; struct juniper_ggsn_header { - uint8_t svc_id; - uint8_t flags_len; - uint8_t proto; - uint8_t flags; - uint8_t vlan_id[2]; - uint8_t res[2]; + nd_uint8_t svc_id; + nd_uint8_t flags_len; + nd_uint8_t proto; + nd_uint8_t flags; + nd_uint16_t vlan_id; + nd_byte res[2]; }; const struct juniper_ggsn_header *gh; + 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) - 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; + /* use EXTRACT_, not GET_ (not packet buffer pointer) */ + proto = EXTRACT_U_1(gh->proto); if (ndo->ndo_eflag) { - ND_PRINT((ndo, "proto %s (%u), vlan %u: ", - tok2str(juniper_protocol_values,"Unknown",gh->proto), - gh->proto, - EXTRACT_16BITS(&gh->vlan_id[0]))); + ND_PRINT("proto %s (%u), vlan %u: ", + tok2str(juniper_protocol_values,"Unknown",proto), + proto, + EXTRACT_BE_U_2(gh->vlan_id)); } - switch (gh->proto) { + switch (proto) { case JUNIPER_PROTO_IPV4: ip_print(ndo, p, l2info.length); break; @@ -484,38 +511,43 @@ juniper_ggsn_print(netdissect_options *ndo, break; default: if (!ndo->ndo_eflag) - ND_PRINT((ndo, "unknown GGSN proto (%u)", gh->proto)); + ND_PRINT("unknown GGSN proto (%u)", proto); } - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif #ifdef DLT_JUNIPER_ES -u_int -juniper_es_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +void +juniper_es_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, const u_char *p) { struct juniper_l2info_t l2info; struct juniper_ipsec_header { - uint8_t sa_index[2]; - uint8_t ttl; - uint8_t type; - uint8_t spi[4]; - uint8_t src_ip[4]; - uint8_t dst_ip[4]; + nd_uint16_t sa_index; + nd_uint8_t ttl; + nd_uint8_t type; + nd_uint32_t spi; + nd_ipv4 src_ip; + nd_ipv4 dst_ip; }; u_int rewrite_len,es_type_bundle; 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) - 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 = (struct juniper_ipsec_header *)p; + ih = (const struct juniper_ipsec_header *)p; - switch (ih->type) { + ND_TCHECK_SIZE(ih); + 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; @@ -528,10 +560,11 @@ juniper_es_print(netdissect_options *ndo, es_type_bundle = 0; break; default: - ND_PRINT((ndo, "ES Invalid type %u, length %u", - ih->type, - l2info.length)); - return l2info.header_len; + ND_PRINT("ES Invalid type %u, length %u", + GET_U_1(ih->type), + l2info.length); + ndo->ndo_ll_hdr_len += l2info.header_len; + return; } l2info.length-=rewrite_len; @@ -539,234 +572,277 @@ juniper_es_print(netdissect_options *ndo, if (ndo->ndo_eflag) { if (!es_type_bundle) { - ND_PRINT((ndo, "ES SA, index %u, ttl %u type %s (%u), spi %u, Tunnel %s > %s, length %u\n", - EXTRACT_16BITS(&ih->sa_index), - ih->ttl, - tok2str(juniper_ipsec_type_values,"Unknown",ih->type), - ih->type, - EXTRACT_32BITS(&ih->spi), - ipaddr_string(ndo, &ih->src_ip), - ipaddr_string(ndo, &ih->dst_ip), - l2info.length)); + ND_PRINT("ES SA, index %u, ttl %u type %s (%u), spi %u, Tunnel %s > %s, length %u\n", + 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((ndo, "ES SA, index %u, ttl %u type %s (%u), length %u\n", - EXTRACT_16BITS(&ih->sa_index), - ih->ttl, - tok2str(juniper_ipsec_type_values,"Unknown",ih->type), - ih->type, - l2info.length)); + ND_PRINT("ES SA, index %u, ttl %u type %s (%u), length %u\n", + 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif #ifdef DLT_JUNIPER_MONITOR -u_int -juniper_monitor_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +void +juniper_monitor_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, const u_char *p) { struct juniper_l2info_t l2info; struct juniper_monitor_header { - uint8_t pkt_type; - uint8_t padding; - uint8_t iif[2]; - uint8_t service_id[4]; + nd_uint8_t pkt_type; + nd_byte padding; + nd_uint16_t iif; + nd_uint32_t service_id; }; 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) - 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 = (struct juniper_monitor_header *)p; + mh = (const struct juniper_monitor_header *)p; + ND_TCHECK_SIZE(mh); if (ndo->ndo_eflag) - ND_PRINT((ndo, "service-id %u, iif %u, pkt-type %u: ", - EXTRACT_32BITS(&mh->service_id), - EXTRACT_16BITS(&mh->iif), - mh->pkt_type)); + ND_PRINT("service-id %u, iif %u, pkt-type %u: ", + 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif #ifdef DLT_JUNIPER_SERVICES -u_int -juniper_services_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +void +juniper_services_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, const u_char *p) { struct juniper_l2info_t l2info; struct juniper_services_header { - uint8_t svc_id; - uint8_t flags_len; - uint8_t svc_set_id[2]; - uint8_t dir_iif[4]; + nd_uint8_t svc_id; + nd_uint8_t flags_len; + nd_uint16_t svc_set_id; + nd_byte pad; + nd_uint24_t dir_iif; }; 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) - 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 = (struct juniper_services_header *)p; + sh = (const struct juniper_services_header *)p; + ND_TCHECK_SIZE(sh); if (ndo->ndo_eflag) - ND_PRINT((ndo, "service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ", - sh->svc_id, - sh->flags_len, - EXTRACT_16BITS(&sh->svc_set_id), - EXTRACT_24BITS(&sh->dir_iif[1]))); + ND_PRINT("service-id %u flags 0x%02x service-set-id 0x%04x iif %u: ", + 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif #ifdef DLT_JUNIPER_PPPOE -u_int -juniper_pppoe_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +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"; + memset(&l2info, 0, sizeof(l2info)); 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif #ifdef DLT_JUNIPER_ETHER -u_int -juniper_ether_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +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"; + memset(&l2info, 0, sizeof(l2info)); 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 */ - 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 -u_int -juniper_ppp_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +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"; + memset(&l2info, 0, sizeof(l2info)); 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif #ifdef DLT_JUNIPER_FRELAY -u_int -juniper_frelay_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +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"; + memset(&l2info, 0, sizeof(l2info)); 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif #ifdef DLT_JUNIPER_CHDLC -u_int -juniper_chdlc_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +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"; + memset(&l2info, 0, sizeof(l2info)); 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif #ifdef DLT_JUNIPER_PPPOE_ATM -u_int -juniper_pppoe_atm_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +void +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"; + memset(&l2info, 0, sizeof(l2info)); 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; - extracted_ethertype = EXTRACT_16BITS(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, p+ETHERTYPE_LEN, l2info.length-ETHERTYPE_LEN, - l2info.caplen-ETHERTYPE_LEN) == 0) + l2info.caplen-ETHERTYPE_LEN, + NULL, NULL) == 0) /* ether_type not known, probably it wasn't one */ - ND_PRINT((ndo, "unknown ethertype 0x%04x", extracted_ethertype)); + ND_PRINT("unknown ethertype 0x%04x", extracted_ethertype); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif #ifdef DLT_JUNIPER_MLPPP -u_int -juniper_mlppp_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +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"; + memset(&l2info, 0, sizeof(l2info)); 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 && - EXTRACT_16BITS(&l2info.cookie) != PPP_OSI && - EXTRACT_16BITS(&l2info.cookie) != (PPP_ADDRESS << 8 | PPP_CONTROL)) - ND_PRINT((ndo, "Bundle-ID %u: ", l2info.bundle)); + /* 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); p+=l2info.header_len; @@ -780,22 +856,27 @@ juniper_mlppp_print(netdissect_options *ndo, 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); - 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); - 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, l2info.caplen); - return l2info.header_len; + isoclns_print(ndo, p, l2info.length); + ndo->ndo_ll_hdr_len += l2info.header_len; + return; default: break; } /* zero length cookie ? */ - switch (EXTRACT_16BITS(&l2info.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); break; @@ -805,28 +886,32 @@ juniper_mlppp_print(netdissect_options *ndo, break; } - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif - #ifdef DLT_JUNIPER_MFR -u_int -juniper_mfr_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +void +juniper_mfr_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, const u_char *p) { struct juniper_l2info_t l2info; + 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; + return; } /* first try the LSQ protos */ @@ -834,75 +919,88 @@ juniper_mfr_print(netdissect_options *ndo, 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); - 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); - 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, l2info.caplen); - return l2info.header_len; + isoclns_print(ndo, p, l2info.length); + ndo->ndo_ll_hdr_len += l2info.header_len; + return; 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 */ - if (ndo->ndo_eflag && EXTRACT_32BITS(l2info.cookie) != 1) - ND_PRINT((ndo, "Bundle-ID %u, ", l2info.bundle)); + /* 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): - isoclns_print(ndo, p + 1, l2info.length - 1, l2info.caplen - 1); + /* 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): case (LLC_UI<<8 | NLPID_IP): case (LLC_UI<<8 | NLPID_IP6): /* pass IP{4,6} to the OSI layer for proper link-layer printing */ - isoclns_print(ndo, p - 1, l2info.length + 1, l2info.caplen + 1); + isoclns_print(ndo, p - 1, l2info.length + 1); break; default: - ND_PRINT((ndo, "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 -u_int -juniper_mlfr_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +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"; + memset(&l2info, 0, sizeof(l2info)); 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 */ - if (ndo->ndo_eflag && EXTRACT_32BITS(l2info.cookie) != 1) - ND_PRINT((ndo, "Bundle-ID %u, ", l2info.bundle)); + /* 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 (LLC_UI): case (LLC_UI<<8): - isoclns_print(ndo, p, l2info.length, l2info.caplen); + isoclns_print(ndo, p, l2info.length); break; case (LLC_UI<<8 | NLPID_Q933): case (LLC_UI<<8 | NLPID_IP): case (LLC_UI<<8 | NLPID_IP6): /* pass IP{4,6} to the OSI layer for proper link-layer printing */ - isoclns_print(ndo, p - 1, l2info.length + 1, l2info.caplen + 1); + isoclns_print(ndo, p - 1, l2info.length + 1); break; default: - ND_PRINT((ndo, "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 @@ -910,48 +1008,60 @@ juniper_mlfr_print(netdissect_options *ndo, * ATM1 PIC cookie format * * +-----+-------------------------+-------------------------------+ - * |fmtid| vc index | channel ID | + * |fmtid| vc index | channel ID | * +-----+-------------------------+-------------------------------+ */ #ifdef DLT_JUNIPER_ATM1 -u_int -juniper_atm1_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +void +juniper_atm1_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, const u_char *p) { int llc_hdrlen; 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) - 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; + return; } - if (EXTRACT_24BITS(p) == 0xfefe03 || /* NLPID encaps ? */ - EXTRACT_24BITS(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 (llc_hdrlen > 0) { + ndo->ndo_ll_hdr_len += l2info.header_len; + return; + } } - if (p[0] == 0x03) { /* Cisco style NLPID encaps ? */ - isoclns_print(ndo, p + 1, l2info.length - 1, l2info.caplen - 1); + 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 */ - 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; + if (ip_heuristic_guess(ndo, p, l2info.length) != 0) { /* last try - vcmux encaps ? */ + ndo->ndo_ll_hdr_len += l2info.header_len; + return; + } - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } #endif @@ -959,68 +1069,82 @@ juniper_atm1_print(netdissect_options *ndo, * ATM2 PIC cookie format * * +-------------------------------+---------+---+-----+-----------+ - * | channel ID | reserv |AAL| CCRQ| gap cnt | + * | channel ID |reserved |AAL| CCRQ| gap count | * +-------------------------------+---------+---+-----+-----------+ */ #ifdef DLT_JUNIPER_ATM2 -u_int -juniper_atm2_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +void +juniper_atm2_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, const u_char *p) { int llc_hdrlen; 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) - 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); - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; + return; } - if (EXTRACT_24BITS(p) == 0xfefe03 || /* NLPID encaps ? */ - EXTRACT_24BITS(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 (llc_hdrlen > 0) { + ndo->ndo_ll_hdr_len += l2info.header_len; + return; + } } if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */ - (EXTRACT_32BITS(l2info.cookie) & ATM2_GAP_COUNT_MASK)) { + /* 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; + ndo->ndo_ll_hdr_len += l2info.header_len; + return; } - if (p[0] == 0x03) { /* Cisco style NLPID encaps ? */ - isoclns_print(ndo, p + 1, l2info.length - 1, l2info.caplen - 1); + 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 */ - 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(juniper_ppp_heuristic_guess(ndo, p, l2info.length) != 0) { /* PPPoA vcmux encaps ? */ + 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; + if (ip_heuristic_guess(ndo, p, l2info.length) != 0) { /* last try - vcmux encaps ? */ + ndo->ndo_ll_hdr_len += l2info.header_len; + return; + } - return l2info.header_len; + ndo->ndo_ll_hdr_len += l2info.header_len; } -#endif - /* try to guess, based on all PPP protos that are supported in * a juniper router if the payload data is encapsulated using PPP */ static int juniper_ppp_heuristic_guess(netdissect_options *ndo, - register const u_char *p, u_int length) + const u_char *p, u_int length) { - switch(EXTRACT_16BITS(p)) { + switch(GET_BE_U_2(p)) { case PPP_IP : case PPP_OSI : case PPP_MPLS_UCAST : @@ -1032,25 +1156,23 @@ juniper_ppp_heuristic_guess(netdissect_options *ndo, case PPP_PAP : case PPP_CHAP : case PPP_ML : -#ifdef INET6 case PPP_IPV6 : case PPP_IPV6CP : -#endif ppp_print(ndo, p, length); break; default: return 0; /* did not find a ppp header */ - break; } return 1; /* we printed a ppp packet */ } +#endif static int ip_heuristic_guess(netdissect_options *ndo, - register const u_char *p, u_int length) + const u_char *p, u_int length) { - switch(p[0]) { + switch(GET_U_1(p)) { case 0x45: case 0x46: case 0x47: @@ -1062,8 +1184,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: @@ -1084,13 +1206,13 @@ ip_heuristic_guess(netdissect_options *ndo, break; default: return 0; /* did not find a ip header */ - break; } return 1; /* we printed an v4/v6 packet */ } 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; @@ -1098,16 +1220,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 = *p; + tlv_value = GET_U_1(p); break; case 2: - tlv_value = EXTRACT_LE_16BITS(p); + tlv_value = GET_LE_U_2(p); break; case 3: - tlv_value = EXTRACT_LE_24BITS(p); + tlv_value = GET_LE_U_3(p); break; case 4: - tlv_value = EXTRACT_LE_32BITS(p); + tlv_value = GET_LE_U_4(p); break; default: tlv_value = -1; @@ -1117,16 +1239,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 = *p; + tlv_value = GET_U_1(p); break; case 2: - tlv_value = EXTRACT_16BITS(p); + tlv_value = GET_BE_U_2(p); break; case 3: - tlv_value = EXTRACT_24BITS(p); + tlv_value = GET_BE_U_3(p); break; case 4: - tlv_value = EXTRACT_32BITS(p); + tlv_value = GET_BE_U_4(p); break; default: tlv_value = -1; @@ -1140,39 +1262,38 @@ static int 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; +#endif int tlv_value; const u_char *tptr; - l2info->header_len = 0; l2info->cookie_len = 0; l2info->proto = 0; - l2info->length = h->len; l2info->caplen = h->caplen; - ND_TCHECK2(p[0], 4); - l2info->flags = p[3]; - l2info->direction = 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_24BITS(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */ - ND_PRINT((ndo, "no magic-number found!")); + if (GET_BE_U_3(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */ + ND_PRINT("no magic-number found!"); return 0; } if (ndo->ndo_eflag) /* print direction */ - ND_PRINT((ndo, "%3s ", tok2str(juniper_direction_values, "---", l2info->direction))); + ND_PRINT("%3s ", tok2str(juniper_direction_values, "---", l2info->direction)); /* magic number + flags */ jnx_header_len = 4; if (ndo->ndo_vflag > 1) - ND_PRINT((ndo, "\n\tJuniper PCAP Flags [%s]", - bittok2str(jnx_flag_values, "none", l2info->flags))); + ND_PRINT("\n\tJuniper PCAP Flags [%s]", + bittok2str(jnx_flag_values, "none", l2info->flags)); /* extensions present ? - calculate how much bytes to skip */ if ((l2info->flags & JUNIPER_BPF_EXT ) == JUNIPER_BPF_EXT ) { @@ -1180,36 +1301,39 @@ juniper_parse_header(netdissect_options *ndo, tptr = p+jnx_header_len; /* ok to read extension length ? */ - ND_TCHECK2(tptr[0], 2); - jnx_ext_len = EXTRACT_16BITS(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 += jnx_ext_len; + jnx_header_len += extension_length; if (ndo->ndo_vflag > 1) - ND_PRINT((ndo, ", PCAP Extension(s) total length %u", jnx_ext_len)); - - ND_TCHECK2(tptr[0], jnx_ext_len); - while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) { - tlv_type = *(tptr++); - tlv_len = *(tptr++); + ND_PRINT(", PCAP Extension(s) total length %u", extension_length); + + 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); + tptr++; tlv_value = 0; - /* sanity check */ + /* sanity checks */ if (tlv_type == 0 || tlv_len == 0) break; + ND_ICHECK_U(extension_length, <, + tlv_len + JUNIPER_EXT_TLV_OVERHEAD); if (ndo->ndo_vflag > 1) - ND_PRINT((ndo, "\n\t %s Extension TLV #%u, length %u, value ", + ND_PRINT("\n\t %s Extension TLV #%u, length %u, value ", tok2str(jnx_ext_tlv_values,"Unknown",tlv_type), tlv_type, - tlv_len)); + 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 */ @@ -1218,18 +1342,18 @@ juniper_parse_header(netdissect_options *ndo, case JUNIPER_EXT_TLV_TTP_IFD_MEDIATYPE: if (tlv_value != -1) { if (ndo->ndo_vflag > 1) - ND_PRINT((ndo, "%s (%u)", + ND_PRINT("%s (%u)", tok2str(juniper_ifmt_values, "Unknown", tlv_value), - tlv_value)); + tlv_value); } break; case JUNIPER_EXT_TLV_IFL_ENCAPS: case JUNIPER_EXT_TLV_TTP_IFL_ENCAPS: if (tlv_value != -1) { if (ndo->ndo_vflag > 1) - ND_PRINT((ndo, "%s (%u)", + ND_PRINT("%s (%u)", tok2str(juniper_ifle_values, "Unknown", tlv_value), - tlv_value)); + tlv_value); } break; case JUNIPER_EXT_TLV_IFL_IDX: /* fall through */ @@ -1238,31 +1362,31 @@ juniper_parse_header(netdissect_options *ndo, default: if (tlv_value != -1) { if (ndo->ndo_vflag > 1) - ND_PRINT((ndo, "%u", tlv_value)); + ND_PRINT("%u", tlv_value); } break; } 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) - ND_PRINT((ndo, "\n\t-----original packet-----\n\t")); + ND_PRINT("\n\t-----original packet-----\n\t"); } if ((l2info->flags & JUNIPER_BPF_NO_L2 ) == JUNIPER_BPF_NO_L2 ) { if (ndo->ndo_eflag) - ND_PRINT((ndo, "no-L2-hdr, ")); + ND_PRINT("no-L2-hdr, "); /* there is no link-layer present - * perform the v4/v6 heuristics * to figure out what it is */ - ND_TCHECK2(p[jnx_header_len + 4], 1); + ND_TCHECK_1(p + (jnx_header_len + 4)); if (ip_heuristic_guess(ndo, p + jnx_header_len + 4, l2info->length - (jnx_header_len + 4)) == 0) - ND_PRINT((ndo, "no IP-hdr found!")); + ND_PRINT("no IP-hdr found!"); l2info->header_len=jnx_header_len+4; return 0; /* stop parsing the output further */ @@ -1273,62 +1397,67 @@ juniper_parse_header(netdissect_options *ndo, l2info->length -= l2info->header_len; l2info->caplen -= l2info->header_len; - /* search through the cookie table and copy values matching for our PIC type */ - while (lp->s != NULL) { - if (lp->pictype == l2info->pictype) { - - l2info->cookie_len += lp->cookie_len; + /* 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; + } + } - switch (p[0]) { - 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; + /* If we found one matching our PIC type, copy its values */ + if (lp != NULL) { + l2info->cookie_len += lp->cookie_len; - 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 - /* MFR child links don't carry cookies */ - if (l2info->pictype == DLT_JUNIPER_MFR && - (p[0] & 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 - 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); + + 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((ndo, "%s-PIC, cookie-len %u", - lp->s, - l2info->cookie_len)); - - if (l2info->cookie_len > 0) { - ND_TCHECK2(p[0], l2info->cookie_len); - if (ndo->ndo_eflag) - ND_PRINT((ndo, ", cookie 0x")); - for (idx = 0; idx < l2info->cookie_len; idx++) { - l2info->cookie[idx] = p[idx]; /* copy cookie data */ - if (ndo->ndo_eflag) ND_PRINT((ndo, "%02x", p[idx])); - } + 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((ndo, ": ")); /* print demarc b/w L2/L3*/ - + if (ndo->ndo_eflag) ND_PRINT(": "); /* print demarc b/w L2/L3*/ - l2info->proto = EXTRACT_16BITS(p+l2info->cookie_len); - break; - } - ++lp; + l2info->proto = GET_BE_U_2(p + l2info->cookie_len); } p+=l2info->cookie_len; @@ -1341,7 +1470,8 @@ juniper_parse_header(netdissect_options *ndo, l2info->bundle = l2info->cookie[1]; break; case AS_COOKIE_ID: - l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff; + /* 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; default: @@ -1355,13 +1485,14 @@ juniper_parse_header(netdissect_options *ndo, switch (l2info->cookie_type) { case LS_COOKIE_ID: l2info->bundle = l2info->cookie[1]; - l2info->proto = EXTRACT_16BITS(p); + l2info->proto = GET_BE_U_2(p); l2info->header_len += 2; l2info->length -= 2; l2info->caplen -= 2; break; case AS_COOKIE_ID: - l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff; + /* 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; default: @@ -1378,13 +1509,14 @@ juniper_parse_header(netdissect_options *ndo, switch (l2info->cookie_type) { case LS_COOKIE_ID: l2info->bundle = l2info->cookie[1]; - l2info->proto = EXTRACT_16BITS(p); + l2info->proto = GET_BE_U_2(p); l2info->header_len += 2; l2info->length -= 2; l2info->caplen -= 2; break; case AS_COOKIE_ID: - l2info->bundle = (EXTRACT_16BITS(&l2info->cookie[6])>>3)&0xfff; + /* 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; default: @@ -1395,10 +1527,10 @@ juniper_parse_header(netdissect_options *ndo, #endif #ifdef DLT_JUNIPER_ATM2 case DLT_JUNIPER_ATM2: - ND_TCHECK2(p[0], 4); + ND_TCHECK_4(p); /* ATM cell relay control word present ? */ if (l2info->cookie[7] & ATM2_PKT_TYPE_MASK) { - control_word = EXTRACT_32BITS(p); + control_word = GET_BE_U_4(p); /* some control word heuristics */ switch(control_word) { case 0: /* zero control word */ @@ -1411,14 +1543,22 @@ juniper_parse_header(netdissect_options *ndo, } if (ndo->ndo_eflag) - ND_PRINT((ndo, "control-word 0x%08x ", control_word)); + ND_PRINT("control-word 0x%08x ", control_word); } 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_SERVICES + case DLT_JUNIPER_SERVICES: + break; +#endif #ifdef DLT_JUNIPER_ATM1 case DLT_JUNIPER_ATM1: break; @@ -1439,25 +1579,37 @@ juniper_parse_header(netdissect_options *ndo, 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((ndo, "Unknown Juniper DLT_ type %u: ", l2info->pictype)); + ND_PRINT("Unknown Juniper DLT_ type %u: ", l2info->pictype); break; } - if (ndo->ndo_eflag > 1) - ND_PRINT((ndo, "hlen %u, proto 0x%04x, ", l2info->header_len, l2info->proto)); + 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 */ - trunc: - ND_PRINT((ndo, "[|juniper_hdr], length %u", h->len)); +invalid: + nd_print_invalid(ndo); return 0; } - - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 4 - * End: - */ +#endif /* defined(DLT_JUNIPER_GGSN) || defined(DLT_JUNIPER_ES) || \ + defined(DLT_JUNIPER_MONITOR) || defined(DLT_JUNIPER_SERVICES) || \ + defined(DLT_JUNIPER_PPPOE) || defined(DLT_JUNIPER_ETHER) || \ + defined(DLT_JUNIPER_PPP) || defined(DLT_JUNIPER_FRELAY) || \ + defined(DLT_JUNIPER_CHDLC) || defined(DLT_JUNIPER_PPPOE_ATM) || \ + defined(DLT_JUNIPER_MLPPP) || defined(DLT_JUNIPER_MFR) || \ + defined(DLT_JUNIPER_MLFR) || defined(DLT_JUNIPER_ATM1) || \ + defined(DLT_JUNIPER_ATM2) */