X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/228f225ca02da1ee61f169301cfa73c56a8265cf..296d466cd6bbf2f7e75e15bb6a01268e88c76ed0:/print-isoclns.c?ds=inline diff --git a/print-isoclns.c b/print-isoclns.c index 9e83e613..5b8c2c2d 100644 --- a/print-isoclns.c +++ b/print-isoclns.c @@ -34,9 +34,7 @@ * IS-IS: ISO 10589 */ -#ifdef HAVE_CONFIG_H #include -#endif #include "netdissect-stdinc.h" @@ -207,7 +205,7 @@ static const struct tok esis_option_values[] = { { ESIS_OPTION_SECURITY, "Security" }, { ESIS_OPTION_ES_CONF_TIME, "ES Configuration Time" }, { ESIS_OPTION_PRIORITY, "Priority" }, - { ESIS_OPTION_ADDRESS_MASK, "Addressk Mask" }, + { ESIS_OPTION_ADDRESS_MASK, "Address Mask" }, { ESIS_OPTION_SNPA_MASK, "SNPA Mask" }, { 0, NULL } }; @@ -612,7 +610,7 @@ static const struct tok isis_lsp_istype_values[] = { #define ISIS_PTP_ADJ_INIT 1 #define ISIS_PTP_ADJ_DOWN 2 -static const struct tok isis_ptp_adjancey_values[] = { +static const struct tok isis_ptp_adjacency_values[] = { { ISIS_PTP_ADJ_UP, "Up" }, { ISIS_PTP_ADJ_INIT, "Initializing" }, { ISIS_PTP_ADJ_DOWN, "Down" }, @@ -735,7 +733,6 @@ void isoclns_print(netdissect_options *ndo, const u_char *p, u_int length) { ndo->ndo_protocol = "isoclns"; - ND_TCHECK_1(p); /* enough bytes on the wire ? */ if (ndo->ndo_eflag) ND_PRINT("OSI NLPID %s (0x%02x): ", @@ -786,9 +783,6 @@ isoclns_print(netdissect_options *ndo, const u_char *p, u_int length) print_unknown_data(ndo, p, "\n\t", length); break; } - return; -trunc: - nd_print_trunc(ndo); } #define CLNP_PDU_ER 1 @@ -884,7 +878,6 @@ clnp_print(netdissect_options *ndo, ND_PRINT("li < size of fixed part of CLNP header and addresses"); return (0); } - ND_TCHECK_1(pptr); dest_address_length = GET_U_1(pptr); pptr += 1; li_remaining -= 1; @@ -901,7 +894,6 @@ clnp_print(netdissect_options *ndo, ND_PRINT("li < size of fixed part of CLNP header and addresses"); return (0); } - ND_TCHECK_1(pptr); source_address_length = GET_U_1(pptr); pptr += 1; li_remaining -= 1; @@ -970,7 +962,6 @@ clnp_print(netdissect_options *ndo, ND_PRINT(", bad opts/li"); return (0); } - ND_TCHECK_2(pptr); op = GET_U_1(pptr); opli = GET_U_1(pptr + 1); pptr += 2; @@ -1029,8 +1020,6 @@ clnp_print(netdissect_options *ndo, } if (source_address_length > 0) { source_address=(tptr+1); - ND_TCHECK_LEN(source_address, - source_address_length); ND_PRINT("\n\t NSAP address (length %u): %s", source_address_length, GET_ISONSAP_STRING(source_address, source_address_length)); @@ -1109,7 +1098,6 @@ clnp_print(netdissect_options *ndo, case CLNP_PDU_ER: /* fall through */ case CLNP_PDU_ERP: - ND_TCHECK_1(pptr); if (GET_U_1(pptr) == NLPID_CLNP) { ND_PRINT("\n\t-----original packet-----\n\t"); /* FIXME recursion protection */ @@ -1135,9 +1123,10 @@ clnp_print(netdissect_options *ndo, default: /* dump the PDU specific data */ - if (length > ND_BYTES_BETWEEN(pptr, optr)) { + if (length > ND_BYTES_BETWEEN(optr, pptr)) { ND_PRINT("\n\t undecoded non-header data, length %u", length-li); - print_unknown_data(ndo, pptr, "\n\t ", length - ND_BYTES_BETWEEN(pptr, optr)); + print_unknown_data(ndo, pptr, "\n\t ", + length - ND_BYTES_BETWEEN(optr, pptr)); } } @@ -1308,7 +1297,7 @@ esis_print(netdissect_options *ndo, pptr += netal; li -= netal; - if (snpal == 6) + if (snpal == MAC_ADDR_LEN) ND_PRINT("\n\t SNPA (length: %u): %s", snpal, GET_ETHERADDR_STRING(snpa)); @@ -1401,7 +1390,6 @@ esis_print(netdissect_options *ndo, ND_PRINT(", bad opts/li"); return; } - ND_TCHECK_2(pptr); op = GET_U_1(pptr); opli = GET_U_1(pptr + 1); pptr += 2; @@ -1430,7 +1418,6 @@ esis_print(netdissect_options *ndo, case ESIS_OPTION_PROTOCOLS: while (opli>0) { - ND_TCHECK_1(tptr); ND_PRINT("%s (0x%02x)", tok2str(nlpid_values, "unknown", @@ -1477,8 +1464,7 @@ isis_print_mcid(netdissect_options *ndo, ND_TCHECK_SIZE(mcid); ND_PRINT("ID: %u, Name: ", GET_U_1(mcid->format_id)); - if (nd_printzp(ndo, mcid->name, 32, ndo->ndo_snapend)) - goto trunc; + nd_printjnp(ndo, mcid->name, sizeof(mcid->name)); ND_PRINT("\n\t Lvl: %u", GET_BE_U_2(mcid->revision_lvl)); @@ -1500,9 +1486,7 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, const struct isis_subtlv_spb_mcid *subtlv_spb_mcid; int i; - while (len > 2) - { - ND_TCHECK_2(tptr); + while (len > 2) { stlv_type = GET_U_1(tptr); stlv_len = GET_U_1(tptr + 1); @@ -1522,8 +1506,7 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, /* Make sure the entire subTLV is in the captured data */ ND_TCHECK_LEN(tptr, stlv_len); - switch (stlv_type) - { + switch (stlv_type) { case ISIS_SUBTLV_SPB_MCID: { if (stlv_len < ISIS_SUBTLV_SPB_MCID_MIN_LEN) @@ -1564,8 +1547,7 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, ND_PRINT("\n\t Digest: "); - for(i=1;i<=8; i++) - { + for(i=1;i<=8; i++) { ND_PRINT("%08x ", GET_BE_U_4(tptr)); if (i%4 == 0 && i != 8) ND_PRINT("\n\t "); @@ -1580,8 +1562,7 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, case ISIS_SUBTLV_SPB_BVID: { - while (stlv_len != 0) - { + while (stlv_len != 0) { if (stlv_len < 4) goto subtlv_too_short; ND_PRINT("\n\t ECT: %08x", @@ -1633,9 +1614,7 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, { u_int stlv_type, stlv_len, treecount; - while (len > 2) - { - ND_TCHECK_2(tptr); + while (len > 2) { stlv_type = GET_U_1(tptr); stlv_len = GET_U_1(tptr + 1); tptr += 2; @@ -1653,8 +1632,7 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, /* Make sure the entire subTLV is in the captured data */ ND_TCHECK_LEN(tptr, stlv_len); - switch (stlv_type) - { + switch (stlv_type) { case ISIS_SUBTLV_SPB_INSTANCE: if (stlv_len < ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN) goto subtlv_too_short; @@ -1682,8 +1660,7 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, len -= ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN; stlv_len -= ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN; - while (treecount) - { + while (treecount) { if (stlv_len < ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN) goto trunc; @@ -1728,7 +1705,6 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, stlv_len -= 8; while (stlv_len >= 4) { - ND_TCHECK_4(tptr); ND_PRINT("\n\t T: %u, R: %u, RES: %u, ISID: %u", (GET_BE_U_4(tptr) >> 31), (GET_BE_U_4(tptr) >> 30) & 0x01, @@ -2261,7 +2237,6 @@ isis_print_mtid(netdissect_options *ndo, { if (tlv_remaining < 2) goto trunc; - ND_TCHECK_2(tptr); ND_PRINT("%s%s", ident, @@ -2293,13 +2268,11 @@ isis_print_extd_ip_reach(netdissect_options *ndo, uint8_t prefix[sizeof(nd_ipv6)]; /* shared copy buffer for IPv4 and IPv6 prefixes */ u_int metric, status_byte, bit_length, byte_length, sublen, processed, subtlvtype, subtlvlen; - ND_TCHECK_4(tptr); metric = GET_BE_U_4(tptr); processed=4; tptr+=4; if (afi == AF_INET) { - ND_TCHECK_1(tptr); status_byte=GET_U_1(tptr); tptr++; bit_length = status_byte&0x3f; @@ -2311,7 +2284,6 @@ isis_print_extd_ip_reach(netdissect_options *ndo, } processed++; } else if (afi == AF_INET6) { - ND_TCHECK_2(tptr); status_byte=GET_U_1(tptr); bit_length=GET_U_1(tptr + 1); if (bit_length > 128) { @@ -2327,9 +2299,8 @@ isis_print_extd_ip_reach(netdissect_options *ndo, byte_length = (bit_length + 7) / 8; /* prefix has variable length encoding */ - ND_TCHECK_LEN(tptr, byte_length); memset(prefix, 0, sizeof(prefix)); /* clear the copy buffer */ - memcpy(prefix,tptr,byte_length); /* copy as much as is stored in the TLV */ + GET_CPY_BYTES(prefix,tptr,byte_length); /* copy as much as is stored in the TLV */ tptr+=byte_length; processed+=byte_length; @@ -2362,14 +2333,12 @@ isis_print_extd_ip_reach(netdissect_options *ndo, than one subTLV - therefore the first byte must reflect the aggregate bytecount of the subTLVs for this prefix */ - ND_TCHECK_1(tptr); sublen=GET_U_1(tptr); tptr++; processed+=sublen+1; ND_PRINT(" (%u)", sublen); /* print out subTLV length */ while (sublen>0) { - ND_TCHECK_2(tptr); subtlvtype=GET_U_1(tptr); subtlvlen=GET_U_1(tptr + 1); tptr+=2; @@ -2382,8 +2351,6 @@ isis_print_extd_ip_reach(netdissect_options *ndo, } } return (processed); -trunc: - return 0; } static void @@ -2392,7 +2359,6 @@ isis_print_router_cap_subtlv(netdissect_options *ndo, const uint8_t *tptr, uint8 uint8_t subt, subl; while (tlen >= 2) { - ND_TCHECK_LEN(tptr, 2); subt = GET_U_1(tptr); subl = GET_U_1(tptr+1); tlen -= 2; @@ -2906,13 +2872,11 @@ isis_print(netdissect_options *ndo, switch (tlv_type) { case ISIS_TLV_AREA_ADDR: while (tlen != 0) { - ND_TCHECK_1(tptr); alen = GET_U_1(tptr); tptr++; tlen--; if (tlen < alen) goto tlv_trunc; - ND_TCHECK_LEN(tptr, alen); ND_PRINT("\n\t Area address (length: %u): %s", alen, GET_ISONSAP_STRING(tptr, alen)); @@ -3005,7 +2969,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_IS_REACH: if (tlen < 1) goto tlv_trunc; - ND_TCHECK_1(tptr); /* check if there is one byte left to read out the virtual flag */ ND_PRINT("\n\t %s", tok2str(isis_is_reach_virtual_values, "bogus virtual flag 0x%02x", @@ -3124,8 +3087,6 @@ isis_print(netdissect_options *ndo, while (tlen != 0) { if (tlen < sizeof(nd_ipv6)) goto tlv_trunc; - ND_TCHECK_LEN(tptr, sizeof(nd_ipv6)); - ND_PRINT("\n\t IPv6 interface address: %s", GET_IP6ADDR_STRING(tptr)); @@ -3136,7 +3097,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_AUTH: if (tlen < 1) goto tlv_trunc; - ND_TCHECK_1(tptr); auth_type = GET_U_1(tptr); tptr++; tlen--; @@ -3148,12 +3108,10 @@ isis_print(netdissect_options *ndo, switch (auth_type) { case ISIS_SUBTLV_AUTH_SIMPLE: - if (nd_printzp(ndo, tptr, tlen, ndo->ndo_snapend)) - goto trunc; + nd_printjnp(ndo, tptr, tlen); break; case ISIS_SUBTLV_AUTH_MD5: for(i=0;i=1) { - ND_TCHECK_1(tptr); ND_PRINT("\n\t Adjacency State: %s (%u)", - tok2str(isis_ptp_adjancey_values, "unknown", GET_U_1(tptr)), + tok2str(isis_ptp_adjacency_values, "unknown", GET_U_1(tptr)), GET_U_1(tptr)); tlen--; } if(tlen>sizeof(tlv_ptp_adj->extd_local_circuit_id)) { - ND_TCHECK_4(tlv_ptp_adj->extd_local_circuit_id); ND_PRINT("\n\t Extended Local circuit-ID: 0x%08x", GET_BE_U_4(tlv_ptp_adj->extd_local_circuit_id)); tlen-=sizeof(tlv_ptp_adj->extd_local_circuit_id); @@ -3208,7 +3162,6 @@ isis_print(netdissect_options *ndo, tlen-=SYSTEM_ID_LEN; } if(tlen>=sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)) { - ND_TCHECK_4(tlv_ptp_adj->neighbor_extd_local_circuit_id); ND_PRINT("\n\t Neighbor Extended Local circuit-ID: 0x%08x", GET_BE_U_4(tlv_ptp_adj->neighbor_extd_local_circuit_id)); } @@ -3217,7 +3170,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_PROTOCOLS: ND_PRINT("\n\t NLPID(s): "); while (tlen != 0) { - ND_TCHECK_1(tptr); ND_PRINT("%s (0x%02x)", tok2str(nlpid_values, "unknown", @@ -3234,7 +3186,6 @@ isis_print(netdissect_options *ndo, { if (tlen < 2) goto tlv_trunc; - ND_TCHECK_2(tptr); ND_PRINT("\n\t RES: %u, MTID(s): %u", (GET_BE_U_2(tptr) >> 12), @@ -3252,7 +3203,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_MT_CAPABILITY: if (tlen < 2) goto tlv_trunc; - ND_TCHECK_2(tptr); ND_PRINT("\n\t O: %u, RES: %u, MTID(s): %u", (GET_BE_U_2(tptr) >> 15) & 0x01, @@ -3270,7 +3220,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_TE_ROUTER_ID: if (tlen < sizeof(nd_ipv4)) goto tlv_trunc; - ND_TCHECK_LEN(pptr, sizeof(nd_ipv4)); ND_PRINT("\n\t Traffic Engineering Router ID: %s", GET_IPADDR_STRING(pptr)); break; @@ -3278,7 +3227,6 @@ isis_print(netdissect_options *ndo, while (tlen != 0) { if (tlen < sizeof(nd_ipv4)) goto tlv_trunc; - ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); ND_PRINT("\n\t IPv4 interface address: %s", GET_IPADDR_STRING(tptr)); tptr += sizeof(nd_ipv4); tlen -= sizeof(nd_ipv4); @@ -3287,8 +3235,7 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_HOSTNAME: ND_PRINT("\n\t Hostname: "); - if (nd_printzp(ndo, tptr, tlen, ndo->ndo_snapend)) - goto trunc; + nd_printjnp(ndo, tptr, tlen); break; case ISIS_TLV_SHARED_RISK_GROUP: @@ -3301,7 +3248,6 @@ isis_print(netdissect_options *ndo, if (tlen < 1) break; - ND_TCHECK_1(tptr); ND_PRINT(", Flags: [%s]", ISIS_MASK_TLV_SHARED_RISK_GROUP(GET_U_1(tptr)) ? "numbered" : "unnumbered"); tptr++; @@ -3309,14 +3255,12 @@ isis_print(netdissect_options *ndo, if (tlen < sizeof(nd_ipv4)) break; - ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); ND_PRINT("\n\t IPv4 interface address: %s", GET_IPADDR_STRING(tptr)); tptr+=sizeof(nd_ipv4); tlen-=sizeof(nd_ipv4); if (tlen < sizeof(nd_ipv4)) break; - ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); ND_PRINT("\n\t IPv4 neighbor address: %s", GET_IPADDR_STRING(tptr)); tptr+=sizeof(nd_ipv4); tlen-=sizeof(nd_ipv4); @@ -3324,7 +3268,6 @@ isis_print(netdissect_options *ndo, while (tlen != 0) { if (tlen < 4) goto tlv_trunc; - ND_TCHECK_4(tptr); ND_PRINT("\n\t Link-ID: 0x%08x", GET_BE_U_4(tptr)); tptr+=4; tlen-=4; @@ -3339,13 +3282,10 @@ isis_print(netdissect_options *ndo, ND_TCHECK_1(tlv_lsp->lsp_id + LSP_ID_LEN - 1); ND_PRINT("\n\t lsp-id: %s", isis_print_id(ndo, tlv_lsp->lsp_id, LSP_ID_LEN)); - ND_TCHECK_4(tlv_lsp->sequence_number); ND_PRINT(", seq: 0x%08x", GET_BE_U_4(tlv_lsp->sequence_number)); - ND_TCHECK_2(tlv_lsp->remaining_lifetime); ND_PRINT(", lifetime: %5ds", GET_BE_U_2(tlv_lsp->remaining_lifetime)); - ND_TCHECK_2(tlv_lsp->checksum); ND_PRINT(", chksum: 0x%04x", GET_BE_U_2(tlv_lsp->checksum)); tlen-=sizeof(struct isis_tlv_lsp); tlv_lsp++; @@ -3369,7 +3309,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_POI: if (tlen < 1) goto tlv_trunc; - ND_TCHECK_1(tptr); num_system_ids = GET_U_1(tptr); tptr++; tlen--; @@ -3445,7 +3384,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_IDRP_INFO: if (tlen < 1) break; - ND_TCHECK_1(tptr); isis_subtlv_idrp = GET_U_1(tptr); ND_PRINT("\n\t Inter-Domain Information Type: %s", tok2str(isis_subtlv_idrp_values, @@ -3457,7 +3395,6 @@ isis_print(netdissect_options *ndo, case ISIS_SUBTLV_IDRP_ASN: if (tlen < 2) goto tlv_trunc; - ND_TCHECK_2(tptr); /* fetch AS number */ ND_PRINT("AS Number: %u", GET_BE_U_2(tptr)); break; case ISIS_SUBTLV_IDRP_LOCAL: @@ -3472,7 +3409,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_LSP_BUFFERSIZE: if (tlen < 2) break; - ND_TCHECK_2(tptr); ND_PRINT("\n\t LSP Buffersize: %u", GET_BE_U_2(tptr)); break; @@ -3497,7 +3433,6 @@ isis_print(netdissect_options *ndo, tlen-=sizeof(struct isis_metric_block); while (tlen != 0) { - ND_TCHECK_1(tptr); prefix_len=GET_U_1(tptr); /* read out prefix length in semioctets*/ tptr++; tlen--; @@ -3507,7 +3442,6 @@ isis_print(netdissect_options *ndo, } if (tlen < prefix_len/2) break; - ND_TCHECK_LEN(tptr, prefix_len / 2); ND_PRINT("\n\t\tAddress: %s/%u", GET_ISONSAP_STRING(tptr, prefix_len / 2), prefix_len * 4); tptr+=prefix_len/2; @@ -3518,7 +3452,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_IIH_SEQNR: if (tlen < 4) break; - ND_TCHECK_4(tptr); /* check if four bytes are on the wire */ ND_PRINT("\n\t Sequence number: %u", GET_BE_U_4(tptr)); break; @@ -3528,7 +3461,6 @@ isis_print(netdissect_options *ndo, nd_print_invalid(ndo); break; } - ND_TCHECK_5(tptr); /* router-id + flags */ ND_PRINT("\n\t Router-ID %s", GET_IPADDR_STRING(tptr)); ND_PRINT(", Flags [%s]", bittok2str(isis_tlv_router_capability_flags, "none", GET_U_1(tptr+4))); @@ -3542,7 +3474,6 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_VENDOR_PRIVATE: if (tlen < 3) break; - ND_TCHECK_3(tptr); /* check if enough byte for a full oui */ vendor_id = GET_BE_U_3(tptr); ND_PRINT("\n\t Vendor: %s (%u)", tok2str(oui_values, "Unknown", vendor_id),