X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/bbedebc666a341d8e14922dce37a92766400c798..61c422a88caefe986c2bc0a7f2f3028f696fa5cd:/print-juniper.c diff --git a/print-juniper.c b/print-juniper.c index 058bfd56..e36b0a8f 100644 --- a/print-juniper.c +++ b/print-juniper.c @@ -12,22 +12,25 @@ * 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 -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include + +#include -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #include "extract.h" #include "ppp.h" @@ -89,7 +92,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,8 +365,8 @@ static const struct tok juniper_ifle_values[] = { }; struct juniper_cookie_table_t { - u_int32_t pictype; /* pic type */ - u_int8_t cookie_len; /* cookie len */ + uint32_t pictype; /* pic type */ + uint8_t cookie_len; /* cookie len */ const char *s; /* pic name */ }; @@ -405,17 +408,17 @@ static const struct juniper_cookie_table_t juniper_cookie_table[] = { }; struct juniper_l2info_t { - u_int32_t length; - u_int32_t caplen; - u_int32_t pictype; - u_int8_t direction; - u_int8_t header_len; - u_int8_t cookie_len; - u_int8_t cookie_type; - u_int8_t cookie[8]; - u_int8_t bundle; - u_int16_t proto; - u_int8_t flags; + uint32_t length; + uint32_t caplen; + uint32_t pictype; + uint8_t direction; + uint8_t header_len; + uint8_t cookie_len; + uint8_t cookie_type; + uint8_t cookie[8]; + uint8_t bundle; + uint16_t proto; + uint8_t flags; }; #define LS_COOKIE_ID 0x54 @@ -448,17 +451,17 @@ static int juniper_parse_header(netdissect_options *, const u_char *, const stru #ifdef DLT_JUNIPER_GGSN u_int -juniper_ggsn_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_ggsn_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; struct juniper_ggsn_header { - u_int8_t svc_id; - u_int8_t flags_len; - u_int8_t proto; - u_int8_t flags; - u_int8_t vlan_id[2]; - u_int8_t res[2]; + uint8_t svc_id; + uint8_t flags_len; + uint8_t proto; + uint8_t flags; + uint8_t vlan_id[2]; + uint8_t res[2]; }; const struct juniper_ggsn_header *gh; @@ -469,44 +472,47 @@ juniper_ggsn_print(netdissect_options *ndo, p+=l2info.header_len; gh = (struct juniper_ggsn_header *)&l2info.cookie; + ND_TCHECK(*gh); 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]))); + EXTRACT_BE_U_2(&gh->vlan_id[0]))); } switch (gh->proto) { case JUNIPER_PROTO_IPV4: ip_print(ndo, p, l2info.length); break; -#ifdef INET6 case JUNIPER_PROTO_IPV6: ip6_print(ndo, p, l2info.length); break; -#endif /* INET6 */ default: if (!ndo->ndo_eflag) ND_PRINT((ndo, "unknown GGSN proto (%u)", gh->proto)); } return l2info.header_len; + +trunc: + ND_PRINT((ndo, "[|juniper_services]")); + return 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) +juniper_es_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; struct juniper_ipsec_header { - u_int8_t sa_index[2]; - u_int8_t ttl; - u_int8_t type; - u_int8_t spi[4]; - u_int8_t src_ip[4]; - u_int8_t dst_ip[4]; + 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]; }; u_int rewrite_len,es_type_bundle; const struct juniper_ipsec_header *ih; @@ -516,8 +522,9 @@ juniper_es_print(netdissect_options *ndo, return l2info.header_len; p+=l2info.header_len; - ih = (struct juniper_ipsec_header *)p; + ih = (const struct juniper_ipsec_header *)p; + ND_TCHECK(*ih); switch (ih->type) { case JUNIPER_IPSEC_O_ESP_ENCRYPT_ESP_AUTHEN_TYPE: case JUNIPER_IPSEC_O_ESP_ENCRYPT_AH_AUTHEN_TYPE: @@ -543,17 +550,17 @@ 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), + EXTRACT_BE_U_2(&ih->sa_index), ih->ttl, tok2str(juniper_ipsec_type_values,"Unknown",ih->type), ih->type, - EXTRACT_32BITS(&ih->spi), + EXTRACT_BE_U_4(&ih->spi), ipaddr_string(ndo, &ih->src_ip), ipaddr_string(ndo, &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), + EXTRACT_BE_U_2(&ih->sa_index), ih->ttl, tok2str(juniper_ipsec_type_values,"Unknown",ih->type), ih->type, @@ -563,20 +570,24 @@ juniper_es_print(netdissect_options *ndo, ip_print(ndo, p, l2info.length); return l2info.header_len; + +trunc: + ND_PRINT((ndo, "[|juniper_services]")); + return 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) +juniper_monitor_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; struct juniper_monitor_header { - u_int8_t pkt_type; - u_int8_t padding; - u_int8_t iif[2]; - u_int8_t service_id[4]; + uint8_t pkt_type; + uint8_t padding; + uint8_t iif[2]; + uint8_t service_id[4]; }; const struct juniper_monitor_header *mh; @@ -585,32 +596,37 @@ juniper_monitor_print(netdissect_options *ndo, return l2info.header_len; p+=l2info.header_len; - mh = (struct juniper_monitor_header *)p; + mh = (const struct juniper_monitor_header *)p; + ND_TCHECK(*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), + EXTRACT_BE_U_4(&mh->service_id), + EXTRACT_BE_U_2(&mh->iif), 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; + +trunc: + ND_PRINT((ndo, "[|juniper_services]")); + return 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) +juniper_services_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; struct juniper_services_header { - u_int8_t svc_id; - u_int8_t flags_len; - u_int8_t svc_set_id[2]; - u_int8_t dir_iif[4]; + uint8_t svc_id; + uint8_t flags_len; + uint8_t svc_set_id[2]; + uint8_t dir_iif[4]; }; const struct juniper_services_header *sh; @@ -619,26 +635,31 @@ juniper_services_print(netdissect_options *ndo, return l2info.header_len; p+=l2info.header_len; - sh = (struct juniper_services_header *)p; + sh = (const struct juniper_services_header *)p; + ND_TCHECK(*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]))); + EXTRACT_BE_U_2(&sh->svc_set_id), + EXTRACT_BE_U_3(&sh->dir_iif[1]))); /* 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((ndo, "[|juniper_services]")); + return 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) +juniper_pppoe_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; @@ -655,8 +676,8 @@ juniper_pppoe_print(netdissect_options *ndo, #ifdef DLT_JUNIPER_ETHER u_int -juniper_ether_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_ether_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; @@ -673,8 +694,8 @@ juniper_ether_print(netdissect_options *ndo, #ifdef DLT_JUNIPER_PPP u_int -juniper_ppp_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_ppp_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; @@ -691,8 +712,8 @@ juniper_ppp_print(netdissect_options *ndo, #ifdef DLT_JUNIPER_FRELAY u_int -juniper_frelay_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_frelay_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; @@ -709,8 +730,8 @@ juniper_frelay_print(netdissect_options *ndo, #ifdef DLT_JUNIPER_CHDLC u_int -juniper_chdlc_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_chdlc_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; @@ -727,11 +748,11 @@ juniper_chdlc_print(netdissect_options *ndo, #ifdef DLT_JUNIPER_PPPOE_ATM u_int -juniper_pppoe_atm_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_pppoe_atm_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; - u_int16_t extracted_ethertype; + uint16_t extracted_ethertype; l2info.pictype = DLT_JUNIPER_PPPOE_ATM; if (juniper_parse_header(ndo, p, h, &l2info) == 0) @@ -739,24 +760,30 @@ juniper_pppoe_atm_print(netdissect_options *ndo, p+=l2info.header_len; - extracted_ethertype = EXTRACT_16BITS(p); + ND_TCHECK_2(p); + extracted_ethertype = EXTRACT_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)); return l2info.header_len; + +trunc: + ND_PRINT((ndo, "[|juniper_pppoe_atm]")); + return 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) +juniper_mlppp_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; @@ -767,8 +794,8 @@ juniper_mlppp_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 && - EXTRACT_16BITS(&l2info.cookie) != PPP_OSI && - EXTRACT_16BITS(&l2info.cookie) != (PPP_ADDRESS << 8 | PPP_CONTROL)) + EXTRACT_BE_U_2(&l2info.cookie) != PPP_OSI && + EXTRACT_BE_U_2(&l2info.cookie) != (PPP_ADDRESS << 8 | PPP_CONTROL)) ND_PRINT((ndo, "Bundle-ID %u: ", l2info.bundle)); p+=l2info.header_len; @@ -784,23 +811,21 @@ juniper_mlppp_print(netdissect_options *ndo, else ip_print(ndo, p, l2info.length); return l2info.header_len; -#ifdef INET6 case JUNIPER_LSQ_L3_PROTO_IPV6: ip6_print(ndo, p,l2info.length); return l2info.header_len; -#endif case JUNIPER_LSQ_L3_PROTO_MPLS: mpls_print(ndo, p, l2info.length); return l2info.header_len; case JUNIPER_LSQ_L3_PROTO_ISO: - isoclns_print(ndo, p, l2info.length, l2info.caplen); + isoclns_print(ndo, p, l2info.length); return l2info.header_len; default: break; } /* zero length cookie ? */ - switch (EXTRACT_16BITS(&l2info.cookie)) { + switch (EXTRACT_BE_U_2(&l2info.cookie)) { case PPP_OSI: ppp_print(ndo, p - 2, l2info.length + 2); break; @@ -817,11 +842,12 @@ juniper_mlppp_print(netdissect_options *ndo, #ifdef DLT_JUNIPER_MFR u_int -juniper_mfr_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_mfr_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_MFR; if (juniper_parse_header(ndo, p, h, &l2info) == 0) return l2info.header_len; @@ -840,16 +866,14 @@ juniper_mfr_print(netdissect_options *ndo, case JUNIPER_LSQ_L3_PROTO_IPV4: ip_print(ndo, p, l2info.length); return l2info.header_len; -#ifdef INET6 case JUNIPER_LSQ_L3_PROTO_IPV6: ip6_print(ndo, p,l2info.length); return l2info.header_len; -#endif case JUNIPER_LSQ_L3_PROTO_MPLS: mpls_print(ndo, p, l2info.length); return l2info.header_len; case JUNIPER_LSQ_L3_PROTO_ISO: - isoclns_print(ndo, p, l2info.length, l2info.caplen); + isoclns_print(ndo, p, l2info.length); return l2info.header_len; default: break; @@ -858,17 +882,17 @@ juniper_mfr_print(netdissect_options *ndo, } /* suppress Bundle-ID if frame was captured on a child-link */ - if (ndo->ndo_eflag && EXTRACT_32BITS(l2info.cookie) != 1) + if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1) ND_PRINT((ndo, "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); + 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)); @@ -880,8 +904,8 @@ juniper_mfr_print(netdissect_options *ndo, #ifdef DLT_JUNIPER_MLFR u_int -juniper_mlfr_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_mlfr_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { struct juniper_l2info_t l2info; @@ -892,18 +916,18 @@ juniper_mlfr_print(netdissect_options *ndo, p+=l2info.header_len; /* suppress Bundle-ID if frame was captured on a child-link */ - if (ndo->ndo_eflag && EXTRACT_32BITS(l2info.cookie) != 1) + if (ndo->ndo_eflag && EXTRACT_BE_U_4(l2info.cookie) != 1) ND_PRINT((ndo, "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)); @@ -923,10 +947,10 @@ juniper_mlfr_print(netdissect_options *ndo, #ifdef DLT_JUNIPER_ATM1 u_int -juniper_atm1_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_atm1_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { - u_int16_t extracted_ethertype; + int llc_hdrlen; struct juniper_l2info_t l2info; @@ -941,16 +965,17 @@ juniper_atm1_print(netdissect_options *ndo, return l2info.header_len; } - if (EXTRACT_24BITS(p) == 0xfefe03 || /* NLPID encaps ? */ - EXTRACT_24BITS(p) == 0xaaaa03) { /* SNAP encaps ? */ + ND_TCHECK_3(p); + if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */ + EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */ - if (llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL, - &extracted_ethertype) != 0) + llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL); + if (llc_hdrlen > 0) return l2info.header_len; } - if (p[0] == 0x03) { /* Cisco style NLPID encaps ? */ - isoclns_print(ndo, p + 1, l2info.length - 1, l2info.caplen - 1); + if (EXTRACT_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; } @@ -959,6 +984,10 @@ juniper_atm1_print(netdissect_options *ndo, return l2info.header_len; return l2info.header_len; + +trunc: + ND_PRINT((ndo, "[|juniper_atm1]")); + return l2info.header_len; } #endif @@ -972,10 +1001,10 @@ juniper_atm1_print(netdissect_options *ndo, #ifdef DLT_JUNIPER_ATM2 u_int -juniper_atm2_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, register const u_char *p) +juniper_atm2_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, register const u_char *p) { - u_int16_t extracted_ethertype; + int llc_hdrlen; struct juniper_l2info_t l2info; @@ -990,22 +1019,23 @@ juniper_atm2_print(netdissect_options *ndo, return l2info.header_len; } - if (EXTRACT_24BITS(p) == 0xfefe03 || /* NLPID encaps ? */ - EXTRACT_24BITS(p) == 0xaaaa03) { /* SNAP encaps ? */ + ND_TCHECK_3(p); + if (EXTRACT_BE_U_3(p) == 0xfefe03 || /* NLPID encaps ? */ + EXTRACT_BE_U_3(p) == 0xaaaa03) { /* SNAP encaps ? */ - if (llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL, - &extracted_ethertype) != 0) + llc_hdrlen = llc_print(ndo, p, l2info.length, l2info.caplen, NULL, NULL); + if (llc_hdrlen > 0) return l2info.header_len; } if (l2info.direction != JUNIPER_BPF_PKT_IN && /* ether-over-1483 encaps ? */ - (EXTRACT_32BITS(l2info.cookie) & ATM2_GAP_COUNT_MASK)) { + (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 (p[0] == 0x03) { /* Cisco style NLPID encaps ? */ - isoclns_print(ndo, p + 1, l2info.length - 1, l2info.caplen - 1); + if (EXTRACT_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,6 +1047,10 @@ juniper_atm2_print(netdissect_options *ndo, return l2info.header_len; return l2info.header_len; + +trunc: + ND_PRINT((ndo, "[|juniper_atm2]")); + return l2info.header_len; } #endif @@ -1025,9 +1059,9 @@ juniper_atm2_print(netdissect_options *ndo, * 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) { - - switch(EXTRACT_16BITS(p)) { + register const u_char *p, u_int length) +{ + switch(EXTRACT_BE_U_2(p)) { case PPP_IP : case PPP_OSI : case PPP_MPLS_UCAST : @@ -1039,10 +1073,8 @@ 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; @@ -1055,9 +1087,9 @@ juniper_ppp_heuristic_guess(netdissect_options *ndo, static int ip_heuristic_guess(netdissect_options *ndo, - register const u_char *p, u_int length) { - - switch(p[0]) { + register const u_char *p, u_int length) +{ + switch(EXTRACT_U_1(p)) { case 0x45: case 0x46: case 0x47: @@ -1071,7 +1103,6 @@ ip_heuristic_guess(netdissect_options *ndo, case 0x4f: ip_print(ndo, p, length); break; -#ifdef INET6 case 0x60: case 0x61: case 0x62: @@ -1090,7 +1121,6 @@ ip_heuristic_guess(netdissect_options *ndo, case 0x6f: ip6_print(ndo, p, length); break; -#endif default: return 0; /* did not find a ip header */ break; @@ -1099,8 +1129,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(const u_char *p, u_int tlv_type, u_int tlv_len) +{ int tlv_value; /* TLVs < 128 are little endian encoded */ @@ -1110,13 +1140,13 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) { tlv_value = *p; break; case 2: - tlv_value = EXTRACT_LE_16BITS(p); + tlv_value = EXTRACT_LE_U_2(p); break; case 3: - tlv_value = EXTRACT_LE_24BITS(p); + tlv_value = EXTRACT_LE_U_3(p); break; case 4: - tlv_value = EXTRACT_LE_32BITS(p); + tlv_value = EXTRACT_LE_U_4(p); break; default: tlv_value = -1; @@ -1129,13 +1159,13 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) { tlv_value = *p; break; case 2: - tlv_value = EXTRACT_16BITS(p); + tlv_value = EXTRACT_BE_U_2(p); break; case 3: - tlv_value = EXTRACT_24BITS(p); + tlv_value = EXTRACT_BE_U_3(p); break; case 4: - tlv_value = EXTRACT_32BITS(p); + tlv_value = EXTRACT_BE_U_4(p); break; default: tlv_value = -1; @@ -1147,12 +1177,12 @@ juniper_read_tlv_value(const u_char *p, u_int tlv_type, u_int tlv_len) { static int juniper_parse_header(netdissect_options *ndo, - const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info) { - + 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; - u_int8_t tlv_type,tlv_len; - u_int32_t control_word; + uint8_t tlv_type,tlv_len; + uint32_t control_word; int tlv_value; const u_char *tptr; @@ -1164,11 +1194,11 @@ juniper_parse_header(netdissect_options *ndo, l2info->length = h->len; l2info->caplen = h->caplen; - ND_TCHECK2(p[0], 4); + ND_TCHECK_4(p); l2info->flags = p[3]; l2info->direction = p[3]&JUNIPER_BPF_PKT_IN; - if (EXTRACT_24BITS(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */ + if (EXTRACT_BE_U_3(p) != JUNIPER_MGC_NUMBER) { /* magic number found ? */ ND_PRINT((ndo, "no magic-number found!")); return 0; } @@ -1189,8 +1219,8 @@ 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); + ND_TCHECK_2(tptr); + jnx_ext_len = EXTRACT_BE_U_2(tptr); jnx_header_len += 2; tptr +=2; @@ -1204,13 +1234,17 @@ juniper_parse_header(netdissect_options *ndo, ND_TCHECK2(tptr[0], jnx_ext_len); while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) { - tlv_type = *(tptr++); - tlv_len = *(tptr++); + tlv_type = EXTRACT_U_1(tptr); + tptr++; + tlv_len = EXTRACT_U_1(tptr); + tptr++; tlv_value = 0; - /* sanity check */ + /* sanity checks */ if (tlv_type == 0 || tlv_len == 0) break; + if (tlv_len+JUNIPER_EXT_TLV_OVERHEAD > jnx_ext_len) + goto trunc; if (ndo->ndo_vflag > 1) ND_PRINT((ndo, "\n\t %s Extension TLV #%u, length %u, value ", @@ -1268,7 +1302,7 @@ juniper_parse_header(netdissect_options *ndo, * 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!")); @@ -1283,12 +1317,13 @@ juniper_parse_header(netdissect_options *ndo, l2info->caplen -= l2info->header_len; /* search through the cookie table and copy values matching for our PIC type */ + ND_TCHECK(p[0]); while (lp->s != NULL) { if (lp->pictype == l2info->pictype) { l2info->cookie_len += lp->cookie_len; - switch (p[0]) { + switch (EXTRACT_U_1(p)) { case LS_COOKIE_ID: l2info->cookie_type = LS_COOKIE_ID; l2info->cookie_len += 2; @@ -1307,7 +1342,7 @@ juniper_parse_header(netdissect_options *ndo, #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) { + (EXTRACT_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) { l2info->cookie_len = 0; } #endif @@ -1327,14 +1362,15 @@ juniper_parse_header(netdissect_options *ndo, 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])); + if (ndo->ndo_eflag) ND_PRINT((ndo, "%02x", EXTRACT_U_1(p + idx))); } } if (ndo->ndo_eflag) ND_PRINT((ndo, ": ")); /* print demarc b/w L2/L3*/ - l2info->proto = EXTRACT_16BITS(p+l2info->cookie_len); + ND_TCHECK_2(p + l2info->cookie_len); + l2info->proto = EXTRACT_BE_U_2(p + l2info->cookie_len); break; } ++lp; @@ -1350,7 +1386,7 @@ 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; + l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff; l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK; break; default: @@ -1363,14 +1399,15 @@ juniper_parse_header(netdissect_options *ndo, case DLT_JUNIPER_MLFR: switch (l2info->cookie_type) { case LS_COOKIE_ID: + ND_TCHECK_2(p); l2info->bundle = l2info->cookie[1]; - l2info->proto = EXTRACT_16BITS(p); + l2info->proto = EXTRACT_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; + l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff; l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK; break; default: @@ -1386,14 +1423,15 @@ juniper_parse_header(netdissect_options *ndo, case DLT_JUNIPER_MFR: switch (l2info->cookie_type) { case LS_COOKIE_ID: + ND_TCHECK_2(p); l2info->bundle = l2info->cookie[1]; - l2info->proto = EXTRACT_16BITS(p); + l2info->proto = EXTRACT_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; + l2info->bundle = (EXTRACT_BE_U_2(&l2info->cookie[6])>>3)&0xfff; l2info->proto = (l2info->cookie[5])&JUNIPER_LSQ_L3_PROTO_MASK; break; default: @@ -1404,10 +1442,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 = EXTRACT_BE_U_4(p); /* some control word heuristics */ switch(control_word) { case 0: /* zero control word */