X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/5ef0bcb5edd748de9d9af13c40da0395dfdd94e8..HEAD:/print-juniper.c diff --git a/print-juniper.c b/print-juniper.c index 1560cee5..19480758 100644 --- a/print-juniper.c +++ b/print-juniper.c @@ -22,14 +22,13 @@ __RCSID("NetBSD: print-juniper.c,v 1.3 2007/07/25 06:31:32 dogcow Exp "); #endif -#ifdef HAVE_CONFIG_H #include -#endif #include "netdissect-stdinc.h" #include +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "addrtoname.h" #include "extract.h" @@ -484,6 +483,7 @@ juniper_ggsn_if_print(netdissect_options *ndo, uint8_t proto; ndo->ndo_protocol = "juniper_ggsn"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_GGSN; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -493,13 +493,13 @@ juniper_ggsn_if_print(netdissect_options *ndo, p+=l2info.header_len; gh = (struct juniper_ggsn_header *)&l2info.cookie; - ND_TCHECK_SIZE(gh); - proto = GET_U_1(gh->proto); + /* use EXTRACT_, not GET_ (not packet buffer pointer) */ + proto = EXTRACT_U_1(gh->proto); if (ndo->ndo_eflag) { ND_PRINT("proto %s (%u), vlan %u: ", tok2str(juniper_protocol_values,"Unknown",proto), proto, - GET_BE_U_2(gh->vlan_id)); + EXTRACT_BE_U_2(gh->vlan_id)); } switch (proto) { @@ -515,11 +515,6 @@ juniper_ggsn_if_print(netdissect_options *ndo, } ndo->ndo_ll_hdr_len += l2info.header_len; - return; - -trunc: - nd_print_trunc(ndo); - ndo->ndo_ll_hdr_len += l2info.header_len; } #endif @@ -541,6 +536,7 @@ juniper_es_if_print(netdissect_options *ndo, const struct juniper_ipsec_header *ih; ndo->ndo_protocol = "juniper_es"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_ES; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -597,11 +593,6 @@ juniper_es_if_print(netdissect_options *ndo, ip_print(ndo, p, l2info.length); ndo->ndo_ll_hdr_len += l2info.header_len; - return; - -trunc: - nd_print_trunc(ndo); - ndo->ndo_ll_hdr_len += l2info.header_len; } #endif @@ -620,6 +611,7 @@ juniper_monitor_if_print(netdissect_options *ndo, const struct juniper_monitor_header *mh; ndo->ndo_protocol = "juniper_monitor"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_MONITOR; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -640,11 +632,6 @@ juniper_monitor_if_print(netdissect_options *ndo, ip_heuristic_guess (ndo, p, l2info.length); ndo->ndo_ll_hdr_len += l2info.header_len; - return; - -trunc: - nd_print_trunc(ndo); - ndo->ndo_ll_hdr_len += l2info.header_len; } #endif @@ -664,6 +651,7 @@ juniper_services_if_print(netdissect_options *ndo, const struct juniper_services_header *sh; ndo->ndo_protocol = "juniper_services"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_SERVICES; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -685,11 +673,6 @@ juniper_services_if_print(netdissect_options *ndo, ip_heuristic_guess (ndo, p, l2info.length); ndo->ndo_ll_hdr_len += l2info.header_len; - return; - -trunc: - nd_print_trunc(ndo); - ndo->ndo_ll_hdr_len += l2info.header_len; } #endif @@ -701,6 +684,7 @@ juniper_pppoe_if_print(netdissect_options *ndo, struct juniper_l2info_t l2info; ndo->ndo_protocol = "juniper_pppoe"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_PPPOE; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -722,6 +706,7 @@ juniper_ether_if_print(netdissect_options *ndo, struct juniper_l2info_t l2info; ndo->ndo_protocol = "juniper_ether"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_ETHER; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -744,6 +729,7 @@ juniper_ppp_if_print(netdissect_options *ndo, struct juniper_l2info_t l2info; ndo->ndo_protocol = "juniper_ppp"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_PPP; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -765,6 +751,7 @@ juniper_frelay_if_print(netdissect_options *ndo, struct juniper_l2info_t l2info; ndo->ndo_protocol = "juniper_frelay"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_FRELAY; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -786,6 +773,7 @@ juniper_chdlc_if_print(netdissect_options *ndo, struct juniper_l2info_t l2info; ndo->ndo_protocol = "juniper_chdlc"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_CHDLC; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -808,6 +796,7 @@ juniper_pppoe_atm_if_print(netdissect_options *ndo, uint16_t extracted_ethertype; ndo->ndo_protocol = "juniper_pppoe_atm"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_PPPOE_ATM; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -839,6 +828,7 @@ juniper_mlppp_if_print(netdissect_options *ndo, struct juniper_l2info_t l2info; ndo->ndo_protocol = "juniper_mlppp"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_MLPPP; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -900,7 +890,6 @@ juniper_mlppp_if_print(netdissect_options *ndo, } #endif - #ifdef DLT_JUNIPER_MFR void juniper_mfr_if_print(netdissect_options *ndo, @@ -957,6 +946,8 @@ juniper_mfr_if_print(netdissect_options *ndo, ND_PRINT("Bundle-ID %u, ", l2info.bundle); switch (l2info.proto) { case (LLCSAP_ISONS<<8 | LLCSAP_ISONS): + /* 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): @@ -981,6 +972,7 @@ juniper_mlfr_if_print(netdissect_options *ndo, struct juniper_l2info_t l2info; ndo->ndo_protocol = "juniper_mlfr"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_MLFR; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -1016,7 +1008,7 @@ juniper_mlfr_if_print(netdissect_options *ndo, * ATM1 PIC cookie format * * +-----+-------------------------+-------------------------------+ - * |fmtid| vc index | channel ID | + * |fmtid| vc index | channel ID | * +-----+-------------------------+-------------------------------+ */ @@ -1030,6 +1022,7 @@ juniper_atm1_if_print(netdissect_options *ndo, struct juniper_l2info_t l2info; ndo->ndo_protocol = "juniper_atm1"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_ATM1; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -1055,6 +1048,8 @@ juniper_atm1_if_print(netdissect_options *ndo, } if (GET_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */ + /* At least one byte is required */ + ND_TCHECK_1(p); isoclns_print(ndo, p + 1, l2info.length - 1); /* FIXME check if frame was recognized */ ndo->ndo_ll_hdr_len += l2info.header_len; @@ -1074,7 +1069,7 @@ juniper_atm1_if_print(netdissect_options *ndo, * ATM2 PIC cookie format * * +-------------------------------+---------+---+-----+-----------+ - * | channel ID | reserv |AAL| CCRQ| gap cnt | + * | channel ID |reserved |AAL| CCRQ| gap count | * +-------------------------------+---------+---+-----+-----------+ */ @@ -1088,6 +1083,7 @@ juniper_atm2_if_print(netdissect_options *ndo, struct juniper_l2info_t l2info; ndo->ndo_protocol = "juniper_atm2"; + memset(&l2info, 0, sizeof(l2info)); l2info.pictype = DLT_JUNIPER_ATM2; if (juniper_parse_header(ndo, p, h, &l2info) == 0) { ndo->ndo_ll_hdr_len += l2info.header_len; @@ -1121,6 +1117,8 @@ juniper_atm2_if_print(netdissect_options *ndo, } if (GET_U_1(p) == 0x03) { /* Cisco style NLPID encaps ? */ + /* At least one byte is required */ + ND_TCHECK_1(p); isoclns_print(ndo, p + 1, l2info.length - 1); /* FIXME check if frame was recognized */ ndo->ndo_ll_hdr_len += l2info.header_len; @@ -1165,7 +1163,6 @@ juniper_ppp_heuristic_guess(netdissect_options *ndo, default: return 0; /* did not find a ppp header */ - break; } return 1; /* we printed a ppp packet */ } @@ -1209,7 +1206,6 @@ 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 */ } @@ -1266,8 +1262,8 @@ static int juniper_parse_header(netdissect_options *ndo, const u_char *p, const struct pcap_pkthdr *h, struct juniper_l2info_t *l2info) { - 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; @@ -1275,12 +1271,10 @@ juniper_parse_header(netdissect_options *ndo, 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; l2info->flags = GET_U_1(p + 3); @@ -1307,20 +1301,20 @@ juniper_parse_header(netdissect_options *ndo, tptr = p+jnx_header_len; /* ok to read extension length ? */ - jnx_ext_len = GET_BE_U_2(tptr); + extension_length = GET_BE_U_2(tptr); jnx_header_len += 2; tptr +=2; /* nail up the total length - * just in case something goes wrong * with TLV parsing */ - jnx_header_len += jnx_ext_len; + jnx_header_len += extension_length; if (ndo->ndo_vflag > 1) - ND_PRINT(", PCAP Extension(s) total length %u", jnx_ext_len); + ND_PRINT(", PCAP Extension(s) total length %u", extension_length); - ND_TCHECK_LEN(tptr, jnx_ext_len); - while (jnx_ext_len > JUNIPER_EXT_TLV_OVERHEAD) { + ND_TCHECK_LEN(tptr, extension_length); + while (extension_length > JUNIPER_EXT_TLV_OVERHEAD) { tlv_type = GET_U_1(tptr); tptr++; tlv_len = GET_U_1(tptr); @@ -1330,8 +1324,8 @@ juniper_parse_header(netdissect_options *ndo, /* sanity checks */ if (tlv_type == 0 || tlv_len == 0) break; - if (tlv_len+JUNIPER_EXT_TLV_OVERHEAD > jnx_ext_len) - goto trunc; + ND_ICHECK_U(extension_length, <, + tlv_len + JUNIPER_EXT_TLV_OVERHEAD); if (ndo->ndo_vflag > 1) ND_PRINT("\n\t %s Extension TLV #%u, length %u, value ", @@ -1374,7 +1368,7 @@ juniper_parse_header(netdissect_options *ndo, } 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) @@ -1403,68 +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 */ - ND_TCHECK_1(p); - 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 (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; + /* 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 && - (GET_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) { - l2info->cookie_len = 0; - } + /* MFR child links don't carry cookies */ + if (l2info->pictype == DLT_JUNIPER_MFR && + (GET_U_1(p) & MFR_BE_MASK) == MFR_BE_MASK) { + l2info->cookie_len = 0; + } #endif - l2info->header_len += l2info->cookie_len; - l2info->length -= l2info->cookie_len; - l2info->caplen -= l2info->cookie_len; + l2info->header_len += l2info->cookie_len; + l2info->length -= l2info->cookie_len; + l2info->caplen -= l2info->cookie_len; - if (ndo->ndo_eflag) - ND_PRINT("%s-PIC, cookie-len %u", - lp->s, - l2info->cookie_len); + if (ndo->ndo_eflag) + ND_PRINT("%s-PIC, cookie-len %u", + lp->s, + l2info->cookie_len); - if (l2info->cookie_len > 8) { - nd_print_invalid(ndo); - return 0; - } + ND_ICHECKMSG_U("cookie length", l2info->cookie_len, >, 8); - if (l2info->cookie_len > 0) { - ND_TCHECK_LEN(p, l2info->cookie_len); - if (ndo->ndo_eflag) - ND_PRINT(", cookie 0x"); - for (idx = 0; idx < l2info->cookie_len; idx++) { - l2info->cookie[idx] = GET_U_1(p + idx); /* copy cookie data */ - if (ndo->ndo_eflag) ND_PRINT("%02x", GET_U_1(p + idx)); - } + if (l2info->cookie_len > 0) { + ND_TCHECK_LEN(p, l2info->cookie_len); + if (ndo->ndo_eflag) + ND_PRINT(", cookie 0x"); + for (idx = 0; idx < l2info->cookie_len; idx++) { + l2info->cookie[idx] = GET_U_1(p + idx); /* copy cookie data */ + if (ndo->ndo_eflag) ND_PRINT("%02x", GET_U_1(p + idx)); } + } - if (ndo->ndo_eflag) ND_PRINT(": "); /* print demarc b/w L2/L3*/ - + if (ndo->ndo_eflag) ND_PRINT(": "); /* print demarc b/w L2/L3*/ - l2info->proto = GET_BE_U_2(p + l2info->cookie_len); - break; - } - ++lp; + l2info->proto = GET_BE_U_2(p + l2info->cookie_len); } p+=l2info->cookie_len; @@ -1554,10 +1547,18 @@ juniper_parse_header(netdissect_options *ndo, } 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; @@ -1578,18 +1579,30 @@ 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("Unknown Juniper DLT_ type %u: ", l2info->pictype); break; } - if (ndo->ndo_eflag > 1) + if (ndo->ndo_eflag) ND_PRINT("hlen %u, proto 0x%04x, ", l2info->header_len, l2info->proto); return 1; /* everything went ok so far. continue parsing */ -trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); return 0; } #endif /* defined(DLT_JUNIPER_GGSN) || defined(DLT_JUNIPER_ES) || \