X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f085c93f59fb2332e09f3da20eef5fb2bbd04431..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-isoclns.c diff --git a/print-isoclns.c b/print-isoclns.c index 8ec06584..b9935ebd 100644 --- a/print-isoclns.c +++ b/print-isoclns.c @@ -26,30 +26,36 @@ /* \summary: ISO CLNS, ESIS, and ISIS printer */ +/* + * specification: + * + * CLNP: ISO 8473 (respective ITU version is at http://www.itu.int/rec/T-REC-X.233/en/) + * ES-IS: ISO 9542 + * IS-IS: ISO 10589 + */ + #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include #include "netdissect.h" #include "addrtoname.h" -#include "ether.h" #include "nlpid.h" #include "extract.h" #include "gmpls.h" #include "oui.h" #include "signature.h" -static const char tstr[] = " [|isis]"; /* * IS-IS is defined in ISO 10589. Look there for protocol definitions. */ -#define SYSTEM_ID_LEN ETHER_ADDR_LEN +#define SYSTEM_ID_LEN MAC_ADDR_LEN #define NODE_ID_LEN (SYSTEM_ID_LEN+1) #define LSP_ID_LEN (SYSTEM_ID_LEN+2) @@ -110,7 +116,7 @@ static const struct tok isis_pdu_values[] = { #define ISIS_TLV_LSP_BUFFERSIZE 14 /* iso10589 rev2 */ #define ISIS_TLV_LSP_BUFFERSIZE_MINLEN 2 #define ISIS_TLV_EXT_IS_REACH 22 /* rfc5305 */ -#define ISIS_TLV_IS_ALIAS_ID 24 /* draft-ietf-isis-ext-lsp-frags-02 */ +#define ISIS_TLV_IS_ALIAS_ID 24 /* rfc5311 */ #define ISIS_TLV_DECNET_PHASE4 42 #define ISIS_TLV_LUCENT_PRIVATE 66 #define ISIS_TLV_INT_IP_REACH 128 /* rfc1195, rfc2966 */ @@ -451,10 +457,10 @@ static const struct tok isis_mt_capability_subtlv_values[] = { }; struct isis_spb_mcid { - uint8_t format_id; - uint8_t name[32]; - uint8_t revision_lvl[2]; - uint8_t digest[16]; + nd_uint8_t format_id; + nd_byte name[32]; + nd_uint16_t revision_lvl; + nd_byte digest[16]; }; struct isis_subtlv_spb_mcid { @@ -463,11 +469,11 @@ struct isis_subtlv_spb_mcid { }; struct isis_subtlv_spb_instance { - uint8_t cist_root_id[8]; - uint8_t cist_external_root_path_cost[4]; - uint8_t bridge_priority[2]; - uint8_t spsourceid[4]; - uint8_t no_of_trees; + nd_byte cist_root_id[8]; + nd_uint32_t cist_external_root_path_cost; + nd_uint16_t bridge_priority; + nd_uint32_t spsourceid; + nd_uint8_t no_of_trees; }; #define CLNP_SEGMENT_PART 0x80 @@ -481,14 +487,14 @@ static const struct tok clnp_flag_values[] = { { 0, NULL} }; -#define ISIS_MASK_LSP_OL_BIT(x) ((x)&0x4) -#define ISIS_MASK_LSP_ISTYPE_BITS(x) ((x)&0x3) -#define ISIS_MASK_LSP_PARTITION_BIT(x) ((x)&0x80) -#define ISIS_MASK_LSP_ATT_BITS(x) ((x)&0x78) -#define ISIS_MASK_LSP_ATT_ERROR_BIT(x) ((x)&0x40) -#define ISIS_MASK_LSP_ATT_EXPENSE_BIT(x) ((x)&0x20) -#define ISIS_MASK_LSP_ATT_DELAY_BIT(x) ((x)&0x10) -#define ISIS_MASK_LSP_ATT_DEFAULT_BIT(x) ((x)&0x8) +#define ISIS_MASK_LSP_OL_BIT(x) (EXTRACT_U_1(x)&0x4) +#define ISIS_MASK_LSP_ISTYPE_BITS(x) (EXTRACT_U_1(x)&0x3) +#define ISIS_MASK_LSP_PARTITION_BIT(x) (EXTRACT_U_1(x)&0x80) +#define ISIS_MASK_LSP_ATT_BITS(x) (EXTRACT_U_1(x)&0x78) +#define ISIS_MASK_LSP_ATT_ERROR_BIT(x) (EXTRACT_U_1(x)&0x40) +#define ISIS_MASK_LSP_ATT_EXPENSE_BIT(x) (EXTRACT_U_1(x)&0x20) +#define ISIS_MASK_LSP_ATT_DELAY_BIT(x) (EXTRACT_U_1(x)&0x10) +#define ISIS_MASK_LSP_ATT_DEFAULT_BIT(x) (EXTRACT_U_1(x)&0x8) #define ISIS_MASK_MTID(x) ((x)&0x0fff) #define ISIS_MASK_MTFLAGS(x) ((x)&0xf000) @@ -505,10 +511,10 @@ static const struct tok isis_mt_flag_values[] = { #define ISIS_MASK_TLV_EXTD_IP6_IE(x) ((x)&0x40) #define ISIS_MASK_TLV_EXTD_IP6_SUBTLV(x) ((x)&0x20) -#define ISIS_LSP_TLV_METRIC_SUPPORTED(x) ((x)&0x80) -#define ISIS_LSP_TLV_METRIC_IE(x) ((x)&0x40) -#define ISIS_LSP_TLV_METRIC_UPDOWN(x) ((x)&0x80) -#define ISIS_LSP_TLV_METRIC_VALUE(x) ((x)&0x3f) +#define ISIS_LSP_TLV_METRIC_SUPPORTED(x) (EXTRACT_U_1(x)&0x80) +#define ISIS_LSP_TLV_METRIC_IE(x) (EXTRACT_U_1(x)&0x40) +#define ISIS_LSP_TLV_METRIC_UPDOWN(x) (EXTRACT_U_1(x)&0x80) +#define ISIS_LSP_TLV_METRIC_VALUE(x) (EXTRACT_U_1(x)&0x3f) #define ISIS_MASK_TLV_SHARED_RISK_GROUP(x) ((x)&0x1) @@ -558,10 +564,10 @@ static const struct tok isis_ptp_adjancey_values[] = { }; struct isis_tlv_ptp_adj { - uint8_t adjacency_state; - uint8_t extd_local_circuit_id[4]; - uint8_t neighbor_sysid[SYSTEM_ID_LEN]; - uint8_t neighbor_extd_local_circuit_id[4]; + nd_uint8_t adjacency_state; + nd_uint32_t extd_local_circuit_id; + nd_byte neighbor_sysid[SYSTEM_ID_LEN]; + nd_uint32_t neighbor_extd_local_circuit_id; }; static void osi_print_cksum(netdissect_options *, const uint8_t *pptr, @@ -571,26 +577,26 @@ static void esis_print(netdissect_options *, const uint8_t *, u_int); static int isis_print(netdissect_options *, const uint8_t *, u_int); struct isis_metric_block { - uint8_t metric_default; - uint8_t metric_delay; - uint8_t metric_expense; - uint8_t metric_error; + nd_uint8_t metric_default; + nd_uint8_t metric_delay; + nd_uint8_t metric_expense; + nd_uint8_t metric_error; }; struct isis_tlv_is_reach { struct isis_metric_block isis_metric_block; - uint8_t neighbor_nodeid[NODE_ID_LEN]; + nd_byte neighbor_nodeid[NODE_ID_LEN]; }; struct isis_tlv_es_reach { struct isis_metric_block isis_metric_block; - uint8_t neighbor_sysid[SYSTEM_ID_LEN]; + nd_byte neighbor_sysid[SYSTEM_ID_LEN]; }; struct isis_tlv_ip_reach { struct isis_metric_block isis_metric_block; - uint8_t prefix[4]; - uint8_t mask[4]; + nd_ipv4 prefix; + nd_ipv4 mask; }; static const struct tok isis_is_reach_virtual_values[] = { @@ -607,59 +613,59 @@ static const struct tok isis_restart_flag_values[] = { }; struct isis_common_header { - uint8_t nlpid; - uint8_t fixed_len; - uint8_t version; /* Protocol version */ - uint8_t id_length; - uint8_t pdu_type; /* 3 MSbits are reserved */ - uint8_t pdu_version; /* Packet format version */ - uint8_t reserved; - uint8_t max_area; + nd_uint8_t nlpid; + nd_uint8_t fixed_len; + nd_uint8_t version; /* Protocol version */ + nd_uint8_t id_length; + nd_uint8_t pdu_type; /* 3 MSbits are reserved */ + nd_uint8_t pdu_version; /* Packet format version */ + nd_byte reserved; + nd_uint8_t max_area; }; struct isis_iih_lan_header { - uint8_t circuit_type; - uint8_t source_id[SYSTEM_ID_LEN]; - uint8_t holding_time[2]; - uint8_t pdu_len[2]; - uint8_t priority; - uint8_t lan_id[NODE_ID_LEN]; + nd_uint8_t circuit_type; + nd_byte source_id[SYSTEM_ID_LEN]; + nd_uint16_t holding_time; + nd_uint16_t pdu_len; + nd_uint8_t priority; + nd_byte lan_id[NODE_ID_LEN]; }; struct isis_iih_ptp_header { - uint8_t circuit_type; - uint8_t source_id[SYSTEM_ID_LEN]; - uint8_t holding_time[2]; - uint8_t pdu_len[2]; - uint8_t circuit_id; + nd_uint8_t circuit_type; + nd_byte source_id[SYSTEM_ID_LEN]; + nd_uint16_t holding_time; + nd_uint16_t pdu_len; + nd_uint8_t circuit_id; }; struct isis_lsp_header { - uint8_t pdu_len[2]; - uint8_t remaining_lifetime[2]; - uint8_t lsp_id[LSP_ID_LEN]; - uint8_t sequence_number[4]; - uint8_t checksum[2]; - uint8_t typeblock; + nd_uint16_t pdu_len; + nd_uint16_t remaining_lifetime; + nd_byte lsp_id[LSP_ID_LEN]; + nd_uint32_t sequence_number; + nd_uint16_t checksum; + nd_uint8_t typeblock; }; struct isis_csnp_header { - uint8_t pdu_len[2]; - uint8_t source_id[NODE_ID_LEN]; - uint8_t start_lsp_id[LSP_ID_LEN]; - uint8_t end_lsp_id[LSP_ID_LEN]; + nd_uint16_t pdu_len; + nd_byte source_id[NODE_ID_LEN]; + nd_byte start_lsp_id[LSP_ID_LEN]; + nd_byte end_lsp_id[LSP_ID_LEN]; }; struct isis_psnp_header { - uint8_t pdu_len[2]; - uint8_t source_id[NODE_ID_LEN]; + nd_uint16_t pdu_len; + nd_byte source_id[NODE_ID_LEN]; }; struct isis_tlv_lsp { - uint8_t remaining_lifetime[2]; - uint8_t lsp_id[LSP_ID_LEN]; - uint8_t sequence_number[4]; - uint8_t checksum[2]; + nd_uint16_t remaining_lifetime; + nd_byte lsp_id[LSP_ID_LEN]; + nd_uint32_t sequence_number; + nd_uint16_t checksum; }; #define ISIS_COMMON_HEADER_SIZE (sizeof(struct isis_common_header)) @@ -670,17 +676,15 @@ struct isis_tlv_lsp { #define ISIS_PSNP_HEADER_SIZE (sizeof(struct isis_psnp_header)) void -isoclns_print(netdissect_options *ndo, const uint8_t *p, u_int length) +isoclns_print(netdissect_options *ndo, const u_char *p, u_int length) { - if (!ND_TTEST(*p)) { /* enough bytes on the wire ? */ - ND_PRINT((ndo, "|OSI")); - return; - } + ndo->ndo_protocol = "isoclns"; + ND_TCHECK_1(p); /* enough bytes on the wire ? */ if (ndo->ndo_eflag) - ND_PRINT((ndo, "OSI NLPID %s (0x%02x): ", tok2str(nlpid_values, "Unknown", EXTRACT_U_1(p)), EXTRACT_U_1(p))); + ND_PRINT("OSI NLPID %s (0x%02x): ", tok2str(nlpid_values, "Unknown", EXTRACT_U_1(p)), EXTRACT_U_1(p)); - switch (*p) { + switch (EXTRACT_U_1(p)) { case NLPID_CLNP: if (!clnp_print(ndo, p, length)) @@ -697,7 +701,7 @@ isoclns_print(netdissect_options *ndo, const uint8_t *p, u_int length) break; case NLPID_NULLNS: - ND_PRINT((ndo, "%slength: %u", ndo->ndo_eflag ? "" : ", ", length)); + ND_PRINT("%slength: %u", ndo->ndo_eflag ? "" : ", ", length); break; case NLPID_Q933: @@ -718,12 +722,15 @@ isoclns_print(netdissect_options *ndo, const uint8_t *p, u_int length) default: if (!ndo->ndo_eflag) - ND_PRINT((ndo, "OSI NLPID 0x%02x unknown", EXTRACT_U_1(p))); - ND_PRINT((ndo, "%slength: %u", ndo->ndo_eflag ? "" : ", ", length)); + ND_PRINT("OSI NLPID 0x%02x unknown", EXTRACT_U_1(p)); + ND_PRINT("%slength: %u", ndo->ndo_eflag ? "" : ", ", length); if (length > 1) print_unknown_data(ndo, p, "\n\t", length); break; } + return; +trunc: + nd_print_trunc(ndo); } #define CLNP_PDU_ER 1 @@ -742,19 +749,19 @@ static const struct tok clnp_pdu_values[] = { }; struct clnp_header_t { - uint8_t nlpid; - uint8_t length_indicator; - uint8_t version; - uint8_t lifetime; /* units of 500ms */ - uint8_t type; - uint8_t segment_length[2]; - uint8_t cksum[2]; + nd_uint8_t nlpid; + nd_uint8_t length_indicator; + nd_uint8_t version; + nd_uint8_t lifetime; /* units of 500ms */ + nd_uint8_t type; + nd_uint16_t segment_length; + nd_uint16_t cksum; }; struct clnp_segment_header_t { - uint8_t data_unit_id[2]; - uint8_t segment_offset[2]; - uint8_t total_length[2]; + nd_uint16_t data_unit_id; + nd_uint16_t segment_offset; + nd_uint16_t total_length; }; /* @@ -767,38 +774,40 @@ clnp_print(netdissect_options *ndo, const uint8_t *pptr, u_int length) { const uint8_t *optr,*source_address,*dest_address; - u_int li,tlen,nsap_offset,source_address_length,dest_address_length, clnp_pdu_type, clnp_flags; + u_int li,li_remaining,tlen,nsap_offset,source_address_length,dest_address_length, clnp_pdu_type, clnp_flags; const struct clnp_header_t *clnp_header; const struct clnp_segment_header_t *clnp_segment_header; uint8_t rfd_error,rfd_error_major,rfd_error_minor; + ndo->ndo_protocol = "clnp"; clnp_header = (const struct clnp_header_t *) pptr; - ND_TCHECK(*clnp_header); + ND_TCHECK_SIZE(clnp_header); - li = clnp_header->length_indicator; + li = EXTRACT_U_1(clnp_header->length_indicator); + li_remaining = li; optr = pptr; if (!ndo->ndo_eflag) - ND_PRINT((ndo, "CLNP")); + ND_PRINT("CLNP"); /* * Sanity checking of the header. */ - if (clnp_header->version != CLNP_VERSION) { - ND_PRINT((ndo, "version %d packet not supported", clnp_header->version)); + if (EXTRACT_U_1(clnp_header->version) != CLNP_VERSION) { + ND_PRINT("version %u packet not supported", EXTRACT_U_1(clnp_header->version)); return (0); } if (li > length) { - ND_PRINT((ndo, " length indicator(%u) > PDU size (%u)!", li, length)); + ND_PRINT(" length indicator(%u) > PDU size (%u)!", li, length); return (0); } if (li < sizeof(struct clnp_header_t)) { - ND_PRINT((ndo, " length indicator %u < min PDU size:", li)); + ND_PRINT(" length indicator %u < min PDU size:", li); while (pptr < ndo->ndo_snapend) { - ND_PRINT((ndo, "%02X", EXTRACT_U_1(pptr))); + ND_PRINT("%02X", EXTRACT_U_1(pptr)); pptr++; } return (0); @@ -806,125 +815,125 @@ clnp_print(netdissect_options *ndo, /* FIXME further header sanity checking */ - clnp_pdu_type = clnp_header->type & CLNP_PDU_TYPE_MASK; - clnp_flags = clnp_header->type & CLNP_FLAG_MASK; + clnp_pdu_type = EXTRACT_U_1(clnp_header->type) & CLNP_PDU_TYPE_MASK; + clnp_flags = EXTRACT_U_1(clnp_header->type) & CLNP_FLAG_MASK; pptr += sizeof(struct clnp_header_t); - li -= sizeof(struct clnp_header_t); + li_remaining -= sizeof(struct clnp_header_t); - if (li < 1) { - ND_PRINT((ndo, "li < size of fixed part of CLNP header and addresses")); + if (li_remaining < 1) { + ND_PRINT("li < size of fixed part of CLNP header and addresses"); return (0); } - ND_TCHECK(*pptr); + ND_TCHECK_1(pptr); dest_address_length = EXTRACT_U_1(pptr); pptr += 1; - li -= 1; - if (li < dest_address_length) { - ND_PRINT((ndo, "li < size of fixed part of CLNP header and addresses")); + li_remaining -= 1; + if (li_remaining < dest_address_length) { + ND_PRINT("li < size of fixed part of CLNP header and addresses"); return (0); } - ND_TCHECK2(*pptr, dest_address_length); + ND_TCHECK_LEN(pptr, dest_address_length); dest_address = pptr; pptr += dest_address_length; - li -= dest_address_length; + li_remaining -= dest_address_length; - if (li < 1) { - ND_PRINT((ndo, "li < size of fixed part of CLNP header and addresses")); + if (li_remaining < 1) { + ND_PRINT("li < size of fixed part of CLNP header and addresses"); return (0); } - ND_TCHECK(*pptr); + ND_TCHECK_1(pptr); source_address_length = EXTRACT_U_1(pptr); pptr += 1; - li -= 1; - if (li < source_address_length) { - ND_PRINT((ndo, "li < size of fixed part of CLNP header and addresses")); + li_remaining -= 1; + if (li_remaining < source_address_length) { + ND_PRINT("li < size of fixed part of CLNP header and addresses"); return (0); } - ND_TCHECK2(*pptr, source_address_length); + ND_TCHECK_LEN(pptr, source_address_length); source_address = pptr; pptr += source_address_length; - li -= source_address_length; + li_remaining -= source_address_length; if (ndo->ndo_vflag < 1) { - ND_PRINT((ndo, "%s%s > %s, %s, length %u", + ND_PRINT("%s%s > %s, %s, length %u", ndo->ndo_eflag ? "" : ", ", isonsap_string(ndo, source_address, source_address_length), isonsap_string(ndo, dest_address, dest_address_length), tok2str(clnp_pdu_values,"unknown (%u)",clnp_pdu_type), - length)); + length); return (1); } - ND_PRINT((ndo, "%slength %u", ndo->ndo_eflag ? "" : ", ", length)); + ND_PRINT("%slength %u", ndo->ndo_eflag ? "" : ", ", length); - ND_PRINT((ndo, "\n\t%s PDU, hlen: %u, v: %u, lifetime: %u.%us, Segment PDU length: %u, checksum: 0x%04x", + ND_PRINT("\n\t%s PDU, hlen: %u, v: %u, lifetime: %u.%us, Segment PDU length: %u, checksum: 0x%04x", tok2str(clnp_pdu_values, "unknown (%u)",clnp_pdu_type), - clnp_header->length_indicator, - clnp_header->version, - clnp_header->lifetime/2, - (clnp_header->lifetime%2)*5, + EXTRACT_U_1(clnp_header->length_indicator), + EXTRACT_U_1(clnp_header->version), + EXTRACT_U_1(clnp_header->lifetime)/2, + (EXTRACT_U_1(clnp_header->lifetime)%2)*5, EXTRACT_BE_U_2(clnp_header->segment_length), - EXTRACT_BE_U_2(clnp_header->cksum))); + EXTRACT_BE_U_2(clnp_header->cksum)); osi_print_cksum(ndo, optr, EXTRACT_BE_U_2(clnp_header->cksum), 7, - clnp_header->length_indicator); + EXTRACT_U_1(clnp_header->length_indicator)); - ND_PRINT((ndo, "\n\tFlags [%s]", - bittok2str(clnp_flag_values, "none", clnp_flags))); + ND_PRINT("\n\tFlags [%s]", + bittok2str(clnp_flag_values, "none", clnp_flags)); - ND_PRINT((ndo, "\n\tsource address (length %u): %s\n\tdest address (length %u): %s", + ND_PRINT("\n\tsource address (length %u): %s\n\tdest address (length %u): %s", source_address_length, isonsap_string(ndo, source_address, source_address_length), dest_address_length, - isonsap_string(ndo, dest_address, dest_address_length))); + isonsap_string(ndo, dest_address, dest_address_length)); if (clnp_flags & CLNP_SEGMENT_PART) { - if (li < sizeof(struct clnp_segment_header_t)) { - ND_PRINT((ndo, "li < size of fixed part of CLNP header, addresses, and segment part")); + if (li_remaining < sizeof(struct clnp_segment_header_t)) { + ND_PRINT("li < size of fixed part of CLNP header, addresses, and segment part"); return (0); } clnp_segment_header = (const struct clnp_segment_header_t *) pptr; - ND_TCHECK(*clnp_segment_header); - ND_PRINT((ndo, "\n\tData Unit ID: 0x%04x, Segment Offset: %u, Total PDU Length: %u", + ND_TCHECK_SIZE(clnp_segment_header); + ND_PRINT("\n\tData Unit ID: 0x%04x, Segment Offset: %u, Total PDU Length: %u", EXTRACT_BE_U_2(clnp_segment_header->data_unit_id), EXTRACT_BE_U_2(clnp_segment_header->segment_offset), - EXTRACT_BE_U_2(clnp_segment_header->total_length))); + EXTRACT_BE_U_2(clnp_segment_header->total_length)); pptr+=sizeof(struct clnp_segment_header_t); - li-=sizeof(struct clnp_segment_header_t); + li_remaining-=sizeof(struct clnp_segment_header_t); } /* now walk the options */ - while (li >= 2) { + while (li_remaining != 0) { u_int op, opli; const uint8_t *tptr; - if (li < 2) { - ND_PRINT((ndo, ", bad opts/li")); + if (li_remaining < 2) { + ND_PRINT(", bad opts/li"); return (0); } ND_TCHECK_2(pptr); op = EXTRACT_U_1(pptr); opli = EXTRACT_U_1(pptr + 1); pptr += 2; - li -= 2; - if (opli > li) { - ND_PRINT((ndo, ", opt (%d) too long", op)); + li_remaining -= 2; + if (opli > li_remaining) { + ND_PRINT(", opt (%u) too long", op); return (0); } - ND_TCHECK2(*pptr, opli); - li -= opli; + ND_TCHECK_LEN(pptr, opli); + li_remaining -= opli; tptr = pptr; tlen = opli; - ND_PRINT((ndo, "\n\t %s Option #%u, length %u, value: ", + ND_PRINT("\n\t %s Option #%u, length %u, value: ", tok2str(clnp_option_values,"Unknown",op), op, - opli)); + opli); /* * We've already checked that the entire option is present - * in the captured packet with the ND_TCHECK2() call. - * Therefore, we don't need to do ND_TCHECK()/ND_TCHECK2() + * in the captured packet with the ND_TCHECK_LEN() call. + * Therefore, we don't need to do ND_TCHECK()/ND_TCHECK_LEN() * checks. * We do, however, need to check tlen, to make sure we * don't run past the end of the option. @@ -935,20 +944,20 @@ clnp_print(netdissect_options *ndo, case CLNP_OPTION_ROUTE_RECORDING: /* those two options share the format */ case CLNP_OPTION_SOURCE_ROUTING: if (tlen < 2) { - ND_PRINT((ndo, ", bad opt len")); + ND_PRINT(", bad opt len"); return (0); } - ND_PRINT((ndo, "%s %s", + ND_PRINT("%s %s", tok2str(clnp_option_sr_rr_values,"Unknown",EXTRACT_U_1(tptr)), - tok2str(clnp_option_sr_rr_string_values, "Unknown Option %u", op))); + tok2str(clnp_option_sr_rr_string_values, "Unknown Option %u", op)); nsap_offset=EXTRACT_U_1(tptr + 1); if (nsap_offset == 0) { - ND_PRINT((ndo, " Bad NSAP offset (0)")); + ND_PRINT(" Bad NSAP offset (0)"); break; } nsap_offset-=1; /* offset to nsap list */ if (nsap_offset > tlen) { - ND_PRINT((ndo, " Bad NSAP offset (past end of option)")); + ND_PRINT(" Bad NSAP offset (past end of option)"); break; } tptr+=nsap_offset; @@ -956,15 +965,16 @@ clnp_print(netdissect_options *ndo, while (tlen > 0) { source_address_length=EXTRACT_U_1(tptr); if (tlen < source_address_length+1) { - ND_PRINT((ndo, "\n\t NSAP address goes past end of option")); + ND_PRINT("\n\t NSAP address goes past end of option"); break; } if (source_address_length > 0) { source_address=(tptr+1); - ND_TCHECK2(*source_address, source_address_length); - ND_PRINT((ndo, "\n\t NSAP address (length %u): %s", + ND_TCHECK_LEN(source_address, + source_address_length); + ND_PRINT("\n\t NSAP address (length %u): %s", source_address_length, - isonsap_string(ndo, source_address, source_address_length))); + isonsap_string(ndo, source_address, source_address_length)); } tlen-=source_address_length+1; } @@ -972,54 +982,54 @@ clnp_print(netdissect_options *ndo, case CLNP_OPTION_PRIORITY: if (tlen < 1) { - ND_PRINT((ndo, ", bad opt len")); + ND_PRINT(", bad opt len"); return (0); } - ND_PRINT((ndo, "0x%1x", EXTRACT_U_1(tptr)&0x0f)); + ND_PRINT("0x%1x", EXTRACT_U_1(tptr)&0x0f); break; case CLNP_OPTION_QOS_MAINTENANCE: if (tlen < 1) { - ND_PRINT((ndo, ", bad opt len")); + ND_PRINT(", bad opt len"); return (0); } - ND_PRINT((ndo, "\n\t Format Code: %s", - tok2str(clnp_option_scope_values, "Reserved", EXTRACT_U_1(tptr) & CLNP_OPTION_SCOPE_MASK))); + ND_PRINT("\n\t Format Code: %s", + tok2str(clnp_option_scope_values, "Reserved", EXTRACT_U_1(tptr) & CLNP_OPTION_SCOPE_MASK)); if ((EXTRACT_U_1(tptr)&CLNP_OPTION_SCOPE_MASK) == CLNP_OPTION_SCOPE_GLOBAL) - ND_PRINT((ndo, "\n\t QoS Flags [%s]", + ND_PRINT("\n\t QoS Flags [%s]", bittok2str(clnp_option_qos_global_values, "none", - EXTRACT_U_1(tptr)&CLNP_OPTION_OPTION_QOS_MASK))); + EXTRACT_U_1(tptr)&CLNP_OPTION_OPTION_QOS_MASK)); break; case CLNP_OPTION_SECURITY: if (tlen < 2) { - ND_PRINT((ndo, ", bad opt len")); + ND_PRINT(", bad opt len"); return (0); } - ND_PRINT((ndo, "\n\t Format Code: %s, Security-Level %u", + ND_PRINT("\n\t Format Code: %s, Security-Level %u", tok2str(clnp_option_scope_values,"Reserved",EXTRACT_U_1(tptr)&CLNP_OPTION_SCOPE_MASK), - EXTRACT_U_1(tptr + 1))); + EXTRACT_U_1(tptr + 1)); break; case CLNP_OPTION_DISCARD_REASON: if (tlen < 1) { - ND_PRINT((ndo, ", bad opt len")); + ND_PRINT(", bad opt len"); return (0); } rfd_error = EXTRACT_U_1(tptr); rfd_error_major = (rfd_error&0xf0) >> 4; rfd_error_minor = rfd_error&0x0f; - ND_PRINT((ndo, "\n\t Class: %s Error (0x%01x), %s (0x%01x)", + ND_PRINT("\n\t Class: %s Error (0x%01x), %s (0x%01x)", tok2str(clnp_option_rfd_class_values,"Unknown",rfd_error_major), rfd_error_major, tok2str(clnp_option_rfd_error_class[rfd_error_major],"Unknown",rfd_error_minor), - rfd_error_minor)); + rfd_error_minor); break; case CLNP_OPTION_PADDING: - ND_PRINT((ndo, "padding data")); + ND_PRINT("padding data"); break; /* @@ -1040,14 +1050,26 @@ clnp_print(netdissect_options *ndo, case CLNP_PDU_ER: /* fall through */ case CLNP_PDU_ERP: - ND_TCHECK(*pptr); + ND_TCHECK_1(pptr); if (EXTRACT_U_1(pptr) == NLPID_CLNP) { - ND_PRINT((ndo, "\n\t-----original packet-----\n\t")); + ND_PRINT("\n\t-----original packet-----\n\t"); /* FIXME recursion protection */ - clnp_print(ndo, pptr, length - clnp_header->length_indicator); + clnp_print(ndo, pptr, length - li); break; } + /* The cases above break from the switch block if they see and print + * a CLNP header in the Data part. For an Error Report PDU this is + * described in Section 7.9.6 of ITU X.233 (1997 E), also known as + * ISO/IEC 8473-1:1998(E). It is not clear why in this code the same + * applies to an Echo Response PDU, as the standard does not specify + * the contents -- could be a proprietary extension or a bug. In either + * case, if the Data part does not contain a CLNP header, its structure + * is considered unknown and the decoding falls through to print the + * contents as-is. + */ + ND_FALL_THROUGH; + case CLNP_PDU_DT: case CLNP_PDU_MD: case CLNP_PDU_ERQ: @@ -1055,7 +1077,7 @@ clnp_print(netdissect_options *ndo, default: /* dump the PDU specific data */ if (length-(pptr-optr) > 0) { - ND_PRINT((ndo, "\n\t undecoded non-header data, length %u", length-clnp_header->length_indicator)); + ND_PRINT("\n\t undecoded non-header data, length %u", length-li); print_unknown_data(ndo, pptr, "\n\t ", length - (pptr - optr)); } } @@ -1063,7 +1085,7 @@ clnp_print(netdissect_options *ndo, return (1); trunc: - ND_PRINT((ndo, "[|clnp]")); + nd_print_trunc(ndo); return (1); } @@ -1081,13 +1103,13 @@ static const struct tok esis_pdu_values[] = { }; struct esis_header_t { - uint8_t nlpid; - uint8_t length_indicator; - uint8_t version; - uint8_t reserved; - uint8_t type; - uint8_t holdtime[2]; - uint8_t cksum[2]; + nd_uint8_t nlpid; + nd_uint8_t length_indicator; + nd_uint8_t version; + nd_byte reserved; + nd_uint8_t type; + nd_uint16_t holdtime; + nd_uint16_t cksum; }; static void @@ -1095,73 +1117,75 @@ esis_print(netdissect_options *ndo, const uint8_t *pptr, u_int length) { const uint8_t *optr; - u_int li,esis_pdu_type,source_address_length, source_address_number; + u_int li, version, esis_pdu_type, source_address_length, source_address_number; const struct esis_header_t *esis_header; + ndo->ndo_protocol = "esis"; if (!ndo->ndo_eflag) - ND_PRINT((ndo, "ES-IS")); + ND_PRINT("ES-IS"); if (length <= 2) { - ND_PRINT((ndo, ndo->ndo_qflag ? "bad pkt!" : "no header at all!")); + ND_PRINT(ndo->ndo_qflag ? "bad pkt!" : "no header at all!"); return; } esis_header = (const struct esis_header_t *) pptr; - ND_TCHECK(*esis_header); - li = esis_header->length_indicator; + ND_TCHECK_SIZE(esis_header); + li = EXTRACT_U_1(esis_header->length_indicator); optr = pptr; /* * Sanity checking of the header. */ - if (esis_header->nlpid != NLPID_ESIS) { - ND_PRINT((ndo, " nlpid 0x%02x packet not supported", esis_header->nlpid)); + if (EXTRACT_U_1(esis_header->nlpid) != NLPID_ESIS) { + ND_PRINT(" nlpid 0x%02x packet not supported", EXTRACT_U_1(esis_header->nlpid)); return; } - if (esis_header->version != ESIS_VERSION) { - ND_PRINT((ndo, " version %d packet not supported", esis_header->version)); + version = EXTRACT_U_1(esis_header->version); + if (version != ESIS_VERSION) { + ND_PRINT(" version %u packet not supported", version); return; } if (li > length) { - ND_PRINT((ndo, " length indicator(%u) > PDU size (%u)!", li, length)); + ND_PRINT(" length indicator(%u) > PDU size (%u)!", li, length); return; } if (li < sizeof(struct esis_header_t) + 2) { - ND_PRINT((ndo, " length indicator %u < min PDU size:", li)); + ND_PRINT(" length indicator %u < min PDU size:", li); while (pptr < ndo->ndo_snapend) { - ND_PRINT((ndo, "%02X", EXTRACT_U_1(pptr))); + ND_PRINT("%02X", EXTRACT_U_1(pptr)); pptr++; } return; } - esis_pdu_type = esis_header->type & ESIS_PDU_TYPE_MASK; + esis_pdu_type = EXTRACT_U_1(esis_header->type) & ESIS_PDU_TYPE_MASK; if (ndo->ndo_vflag < 1) { - ND_PRINT((ndo, "%s%s, length %u", + ND_PRINT("%s%s, length %u", ndo->ndo_eflag ? "" : ", ", tok2str(esis_pdu_values,"unknown type (%u)",esis_pdu_type), - length)); + length); return; } else - ND_PRINT((ndo, "%slength %u\n\t%s (%u)", + ND_PRINT("%slength %u\n\t%s (%u)", ndo->ndo_eflag ? "" : ", ", length, tok2str(esis_pdu_values,"unknown type: %u", esis_pdu_type), - esis_pdu_type)); + esis_pdu_type); - ND_PRINT((ndo, ", v: %u%s", esis_header->version, esis_header->version == ESIS_VERSION ? "" : "unsupported" )); - ND_PRINT((ndo, ", checksum: 0x%04x", EXTRACT_BE_U_2(esis_header->cksum))); + ND_PRINT(", v: %u%s", version, version == ESIS_VERSION ? "" : "unsupported" ); + ND_PRINT(", checksum: 0x%04x", EXTRACT_BE_U_2(esis_header->cksum)); osi_print_cksum(ndo, pptr, EXTRACT_BE_U_2(esis_header->cksum), 7, li); - ND_PRINT((ndo, ", holding time: %us, length indicator: %u", - EXTRACT_BE_U_2(esis_header->holdtime), li)); + ND_PRINT(", holding time: %us, length indicator: %u", + EXTRACT_BE_U_2(esis_header->holdtime), li); if (ndo->ndo_vflag > 1) print_unknown_data(ndo, optr, "\n\t", sizeof(struct esis_header_t)); @@ -1174,50 +1198,50 @@ esis_print(netdissect_options *ndo, const uint8_t *dst, *snpa, *neta; u_int dstl, snpal, netal; - ND_TCHECK(*pptr); + ND_TCHECK_1(pptr); if (li < 1) { - ND_PRINT((ndo, ", bad redirect/li")); + ND_PRINT(", bad redirect/li"); return; } dstl = EXTRACT_U_1(pptr); pptr++; li--; - ND_TCHECK2(*pptr, dstl); + ND_TCHECK_LEN(pptr, dstl); if (li < dstl) { - ND_PRINT((ndo, ", bad redirect/li")); + ND_PRINT(", bad redirect/li"); return; } dst = pptr; pptr += dstl; li -= dstl; - ND_PRINT((ndo, "\n\t %s", isonsap_string(ndo, dst, dstl))); + ND_PRINT("\n\t %s", isonsap_string(ndo, dst, dstl)); - ND_TCHECK(*pptr); + ND_TCHECK_1(pptr); if (li < 1) { - ND_PRINT((ndo, ", bad redirect/li")); + ND_PRINT(", bad redirect/li"); return; } snpal = EXTRACT_U_1(pptr); pptr++; li--; - ND_TCHECK2(*pptr, snpal); + ND_TCHECK_LEN(pptr, snpal); if (li < snpal) { - ND_PRINT((ndo, ", bad redirect/li")); + ND_PRINT(", bad redirect/li"); return; } snpa = pptr; pptr += snpal; li -= snpal; - ND_TCHECK(*pptr); + ND_TCHECK_1(pptr); if (li < 1) { - ND_PRINT((ndo, ", bad redirect/li")); + ND_PRINT(", bad redirect/li"); return; } netal = EXTRACT_U_1(pptr); pptr++; - ND_TCHECK2(*pptr, netal); + ND_TCHECK_LEN(pptr, netal); if (li < netal) { - ND_PRINT((ndo, ", bad redirect/li")); + ND_PRINT(", bad redirect/li"); return; } neta = pptr; @@ -1225,50 +1249,50 @@ esis_print(netdissect_options *ndo, li -= netal; if (snpal == 6) - ND_PRINT((ndo, "\n\t SNPA (length: %u): %s", + ND_PRINT("\n\t SNPA (length: %u): %s", snpal, - etheraddr_string(ndo, snpa))); + etheraddr_string(ndo, snpa)); else - ND_PRINT((ndo, "\n\t SNPA (length: %u): %s", + ND_PRINT("\n\t SNPA (length: %u): %s", snpal, - linkaddr_string(ndo, snpa, LINKADDR_OTHER, snpal))); + linkaddr_string(ndo, snpa, LINKADDR_OTHER, snpal)); if (netal != 0) - ND_PRINT((ndo, "\n\t NET (length: %u) %s", + ND_PRINT("\n\t NET (length: %u) %s", netal, - isonsap_string(ndo, neta, netal))); + isonsap_string(ndo, neta, netal)); break; } case ESIS_PDU_ESH: - ND_TCHECK(*pptr); + ND_TCHECK_1(pptr); if (li < 1) { - ND_PRINT((ndo, ", bad esh/li")); + ND_PRINT(", bad esh/li"); return; } source_address_number = EXTRACT_U_1(pptr); pptr++; li--; - ND_PRINT((ndo, "\n\t Number of Source Addresses: %u", source_address_number)); + ND_PRINT("\n\t Number of Source Addresses: %u", source_address_number); while (source_address_number > 0) { - ND_TCHECK(*pptr); + ND_TCHECK_1(pptr); if (li < 1) { - ND_PRINT((ndo, ", bad esh/li")); + ND_PRINT(", bad esh/li"); return; } source_address_length = EXTRACT_U_1(pptr); pptr++; li--; - ND_TCHECK2(*pptr, source_address_length); + ND_TCHECK_LEN(pptr, source_address_length); if (li < source_address_length) { - ND_PRINT((ndo, ", bad esh/li")); + ND_PRINT(", bad esh/li"); return; } - ND_PRINT((ndo, "\n\t NET (length: %u): %s", + ND_PRINT("\n\t NET (length: %u): %s", source_address_length, - isonsap_string(ndo, pptr, source_address_length))); + isonsap_string(ndo, pptr, source_address_length)); pptr += source_address_length; li -= source_address_length; source_address_number--; @@ -1277,20 +1301,20 @@ esis_print(netdissect_options *ndo, break; case ESIS_PDU_ISH: { - ND_TCHECK(*pptr); + ND_TCHECK_1(pptr); if (li < 1) { - ND_PRINT((ndo, ", bad ish/li")); + ND_PRINT(", bad ish/li"); return; } source_address_length = EXTRACT_U_1(pptr); pptr++; li--; - ND_TCHECK2(*pptr, source_address_length); + ND_TCHECK_LEN(pptr, source_address_length); if (li < source_address_length) { - ND_PRINT((ndo, ", bad ish/li")); + ND_PRINT(", bad ish/li"); return; } - ND_PRINT((ndo, "\n\t NET (length: %u): %s", source_address_length, isonsap_string(ndo, pptr, source_address_length))); + ND_PRINT("\n\t NET (length: %u): %s", source_address_length, isonsap_string(ndo, pptr, source_address_length)); pptr += source_address_length; li -= source_address_length; break; @@ -1310,7 +1334,7 @@ esis_print(netdissect_options *ndo, const uint8_t *tptr; if (li < 2) { - ND_PRINT((ndo, ", bad opts/li")); + ND_PRINT(", bad opts/li"); return; } ND_TCHECK_2(pptr); @@ -1319,37 +1343,37 @@ esis_print(netdissect_options *ndo, pptr += 2; li -= 2; if (opli > li) { - ND_PRINT((ndo, ", opt (%d) too long", op)); + ND_PRINT(", opt (%u) too long", op); return; } li -= opli; tptr = pptr; - ND_PRINT((ndo, "\n\t %s Option #%u, length %u, value: ", + ND_PRINT("\n\t %s Option #%u, length %u, value: ", tok2str(esis_option_values,"Unknown",op), op, - opli)); + opli); switch (op) { case ESIS_OPTION_ES_CONF_TIME: if (opli == 2) { ND_TCHECK_2(pptr); - ND_PRINT((ndo, "%us", EXTRACT_BE_U_2(tptr))); + ND_PRINT("%us", EXTRACT_BE_U_2(tptr)); } else - ND_PRINT((ndo, "(bad length)")); + ND_PRINT("(bad length)"); break; case ESIS_OPTION_PROTOCOLS: while (opli>0) { ND_TCHECK_1(tptr); - ND_PRINT((ndo, "%s (0x%02x)", + ND_PRINT("%s (0x%02x)", tok2str(nlpid_values, "unknown", EXTRACT_U_1(tptr)), - EXTRACT_U_1(tptr))); + EXTRACT_U_1(tptr)); if (opli>1) /* further NPLIDs ? - put comma */ - ND_PRINT((ndo, ", ")); + ND_PRINT(", "); tptr++; opli--; } @@ -1374,8 +1398,10 @@ esis_print(netdissect_options *ndo, print_unknown_data(ndo, pptr, "\n\t ", opli); pptr += opli; } + return; + trunc: - ND_PRINT((ndo, "[|esis]")); + nd_print_trunc(ndo); } static void @@ -1384,28 +1410,29 @@ isis_print_mcid(netdissect_options *ndo, { int i; - ND_TCHECK(*mcid); - ND_PRINT((ndo, "ID: %d, Name: ", mcid->format_id)); + ND_TCHECK_SIZE(mcid); + ND_PRINT("ID: %u, Name: ", EXTRACT_U_1(mcid->format_id)); - if (fn_printzp(ndo, mcid->name, 32, ndo->ndo_snapend)) + if (nd_printzp(ndo, mcid->name, 32, ndo->ndo_snapend)) goto trunc; - ND_PRINT((ndo, "\n\t Lvl: %d", EXTRACT_BE_U_2(mcid->revision_lvl))); + ND_PRINT("\n\t Lvl: %u", EXTRACT_BE_U_2(mcid->revision_lvl)); - ND_PRINT((ndo, ", Digest: ")); + ND_PRINT(", Digest: "); for(i=0;i<16;i++) - ND_PRINT((ndo, "%.2x ", mcid->digest[i])); + ND_PRINT("%.2x ", mcid->digest[i]); + return; trunc: - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); } static int isis_print_mt_port_cap_subtlv(netdissect_options *ndo, - const uint8_t *tptr, int len) + const uint8_t *tptr, u_int len) { - int stlv_type, stlv_len; + u_int stlv_type, stlv_len; const struct isis_subtlv_spb_mcid *subtlv_spb_mcid; int i; @@ -1416,10 +1443,10 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, stlv_len = EXTRACT_U_1(tptr + 1); /* first lets see if we know the subTLVs name*/ - ND_PRINT((ndo, "\n\t %s subTLV #%u, length: %u", + ND_PRINT("\n\t %s subTLV #%u, length: %u", tok2str(isis_mt_port_cap_subtlv_values, "unknown", stlv_type), stlv_type, - stlv_len)); + stlv_len); tptr = tptr + 2; /*len -= TLV_TYPE_LEN_OFFSET;*/ @@ -1429,7 +1456,7 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, if (len < stlv_len) goto trunc; /* Make sure the entire subTLV is in the captured data */ - ND_TCHECK2(*(tptr), stlv_len); + ND_TCHECK_LEN(tptr, stlv_len); switch (stlv_type) { @@ -1440,13 +1467,13 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, subtlv_spb_mcid = (const struct isis_subtlv_spb_mcid *)tptr; - ND_PRINT((ndo, "\n\t MCID: ")); + ND_PRINT("\n\t MCID: "); isis_print_mcid(ndo, &(subtlv_spb_mcid->mcid)); /*tptr += SPB_MCID_MIN_LEN; len -= SPB_MCID_MIN_LEN; */ - ND_PRINT((ndo, "\n\t AUX-MCID: ")); + ND_PRINT("\n\t AUX-MCID: "); isis_print_mcid(ndo, &(subtlv_spb_mcid->aux_mcid)); /*tptr += SPB_MCID_MIN_LEN; @@ -1463,21 +1490,21 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, if (stlv_len < ISIS_SUBTLV_SPB_DIGEST_MIN_LEN) goto trunc; - ND_PRINT((ndo, "\n\t RES: %d V: %d A: %d D: %d", + ND_PRINT("\n\t RES: %u V: %u A: %u D: %u", (EXTRACT_U_1(tptr) >> 5), ((EXTRACT_U_1(tptr) >> 4) & 0x01), ((EXTRACT_U_1(tptr) >> 2) & 0x03), - (EXTRACT_U_1(tptr) & 0x03))); + (EXTRACT_U_1(tptr) & 0x03)); tptr++; - ND_PRINT((ndo, "\n\t Digest: ")); + ND_PRINT("\n\t Digest: "); for(i=1;i<=8; i++) { - ND_PRINT((ndo, "%08x ", EXTRACT_BE_U_4(tptr))); + ND_PRINT("%08x ", EXTRACT_BE_U_4(tptr)); if (i%4 == 0 && i != 8) - ND_PRINT((ndo, "\n\t ")); + ND_PRINT("\n\t "); tptr = tptr + 4; } @@ -1491,15 +1518,15 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, { while (stlv_len >= ISIS_SUBTLV_SPB_BVID_MIN_LEN) { - ND_PRINT((ndo, "\n\t ECT: %08x", - EXTRACT_BE_U_4(tptr))); + ND_PRINT("\n\t ECT: %08x", + EXTRACT_BE_U_4(tptr)); tptr = tptr+4; - ND_PRINT((ndo, " BVID: %d, U:%01x M:%01x ", + ND_PRINT(" BVID: %u, U:%01x M:%01x ", (EXTRACT_BE_U_2(tptr) >> 4) , (EXTRACT_BE_U_2(tptr) >> 3) & 0x01, - (EXTRACT_BE_U_2(tptr) >> 2) & 0x01)); + (EXTRACT_BE_U_2(tptr) >> 2) & 0x01); tptr = tptr + 2; len = len - ISIS_SUBTLV_SPB_BVID_MIN_LEN; @@ -1519,16 +1546,15 @@ isis_print_mt_port_cap_subtlv(netdissect_options *ndo, return 0; trunc: - ND_PRINT((ndo, "\n\t\t")); - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); return(1); } static int isis_print_mt_capability_subtlv(netdissect_options *ndo, - const uint8_t *tptr, int len) + const uint8_t *tptr, u_int len) { - int stlv_type, stlv_len, tmp; + u_int stlv_type, stlv_len, tmp; while (len > 2) { @@ -1539,16 +1565,16 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, len = len - 2; /* first lets see if we know the subTLVs name*/ - ND_PRINT((ndo, "\n\t %s subTLV #%u, length: %u", + ND_PRINT("\n\t %s subTLV #%u, length: %u", tok2str(isis_mt_capability_subtlv_values, "unknown", stlv_type), stlv_type, - stlv_len)); + stlv_len); /* Make sure the subTLV fits within the space left */ if (len < stlv_len) goto trunc; /* Make sure the entire subTLV is in the captured data */ - ND_TCHECK2(*(tptr), stlv_len); + ND_TCHECK_LEN(tptr, stlv_len); switch (stlv_type) { @@ -1556,22 +1582,22 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, if (stlv_len < ISIS_SUBTLV_SPB_INSTANCE_MIN_LEN) goto trunc; - ND_PRINT((ndo, "\n\t CIST Root-ID: %08x", EXTRACT_BE_U_4(tptr))); + ND_PRINT("\n\t CIST Root-ID: %08x", EXTRACT_BE_U_4(tptr)); tptr = tptr+4; - ND_PRINT((ndo, " %08x", EXTRACT_BE_U_4(tptr))); + ND_PRINT(" %08x", EXTRACT_BE_U_4(tptr)); tptr = tptr+4; - ND_PRINT((ndo, ", Path Cost: %08x", EXTRACT_BE_U_4(tptr))); + ND_PRINT(", Path Cost: %08x", EXTRACT_BE_U_4(tptr)); tptr = tptr+4; - ND_PRINT((ndo, ", Prio: %d", EXTRACT_BE_U_2(tptr))); + ND_PRINT(", Prio: %u", EXTRACT_BE_U_2(tptr)); tptr = tptr + 2; - ND_PRINT((ndo, "\n\t RES: %d", - EXTRACT_BE_U_2(tptr) >> 5)); - ND_PRINT((ndo, ", V: %d", - (EXTRACT_BE_U_2(tptr) >> 4) & 0x0001)); - ND_PRINT((ndo, ", SPSource-ID: %d", - (EXTRACT_BE_U_4(tptr) & 0x000fffff))); + ND_PRINT("\n\t RES: %u", + EXTRACT_BE_U_2(tptr) >> 5); + ND_PRINT(", V: %u", + (EXTRACT_BE_U_2(tptr) >> 4) & 0x0001); + ND_PRINT(", SPSource-ID: %u", + (EXTRACT_BE_U_4(tptr) & 0x000fffff)); tptr = tptr+4; - ND_PRINT((ndo, ", No of Trees: %x", EXTRACT_U_1(tptr))); + ND_PRINT(", No of Trees: %x", EXTRACT_U_1(tptr)); tmp = EXTRACT_U_1(tptr); tptr++; @@ -1584,21 +1610,21 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, if (stlv_len < ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN) goto trunc; - ND_PRINT((ndo, "\n\t U:%d, M:%d, A:%d, RES:%d", + ND_PRINT("\n\t U:%u, M:%u, A:%u, RES:%u", EXTRACT_U_1(tptr) >> 7, (EXTRACT_U_1(tptr) >> 6) & 0x01, (EXTRACT_U_1(tptr) >> 5) & 0x01, - (EXTRACT_U_1(tptr) & 0x1f))); + (EXTRACT_U_1(tptr) & 0x1f)); tptr++; - ND_PRINT((ndo, ", ECT: %08x", EXTRACT_BE_U_4(tptr))); + ND_PRINT(", ECT: %08x", EXTRACT_BE_U_4(tptr)); tptr = tptr + 4; - ND_PRINT((ndo, ", BVID: %d, SPVID: %d", + ND_PRINT(", BVID: %u, SPVID: %u", (EXTRACT_BE_U_3(tptr) >> 12) & 0x000fff, - EXTRACT_BE_U_3(tptr) & 0x000fff)); + EXTRACT_BE_U_3(tptr) & 0x000fff); tptr = tptr + 3; len = len - ISIS_SUBTLV_SPB_INSTANCE_VLAN_TUPLE_LEN; @@ -1612,13 +1638,13 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, if (stlv_len < 8) goto trunc; - ND_PRINT((ndo, "\n\t BMAC: %08x", EXTRACT_BE_U_4(tptr))); + ND_PRINT("\n\t BMAC: %08x", EXTRACT_BE_U_4(tptr)); tptr = tptr+4; - ND_PRINT((ndo, "%04x", EXTRACT_BE_U_2(tptr))); + ND_PRINT("%04x", EXTRACT_BE_U_2(tptr)); tptr = tptr+2; - ND_PRINT((ndo, ", RES: %d, VID: %d", EXTRACT_BE_U_2(tptr) >> 12, - (EXTRACT_BE_U_2(tptr)) & 0x0fff)); + ND_PRINT(", RES: %u, VID: %u", EXTRACT_BE_U_2(tptr) >> 12, + (EXTRACT_BE_U_2(tptr)) & 0x0fff); tptr = tptr+2; len = len - 8; @@ -1626,11 +1652,11 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, while (stlv_len >= 4) { ND_TCHECK_4(tptr); - ND_PRINT((ndo, "\n\t T: %d, R: %d, RES: %d, ISID: %d", + ND_PRINT("\n\t T: %u, R: %u, RES: %u, ISID: %u", (EXTRACT_BE_U_4(tptr) >> 31), (EXTRACT_BE_U_4(tptr) >> 30) & 0x01, (EXTRACT_BE_U_4(tptr) >> 24) & 0x03f, - (EXTRACT_BE_U_4(tptr)) & 0x0ffffff)); + (EXTRACT_BE_U_4(tptr)) & 0x0ffffff); tptr = tptr + 4; len = len - 4; @@ -1648,35 +1674,36 @@ isis_print_mt_capability_subtlv(netdissect_options *ndo, return 0; trunc: - ND_PRINT((ndo, "\n\t\t")); - ND_PRINT((ndo, "%s", tstr)); + nd_print_trunc(ndo); return(1); } /* shared routine for printing system, node and lsp-ids */ static char * -isis_print_id(const uint8_t *cp, int id_len) +isis_print_id(const uint8_t *cp, u_int id_len) { - int i; + u_int i; static char id[sizeof("xxxx.xxxx.xxxx.yy-zz")]; char *pos = id; - int sysid_len; + u_int sysid_len; sysid_len = SYSTEM_ID_LEN; if (sysid_len > id_len) sysid_len = id_len; for (i = 1; i <= sysid_len; i++) { - snprintf(pos, sizeof(id) - (pos - id), "%02x", *cp++); + nd_snprintf(pos, sizeof(id) - (pos - id), "%02x", EXTRACT_U_1(cp)); + cp++; pos += strlen(pos); if (i == 2 || i == 4) *pos++ = '.'; } if (id_len >= NODE_ID_LEN) { - snprintf(pos, sizeof(id) - (pos - id), ".%02x", *cp++); + nd_snprintf(pos, sizeof(id) - (pos - id), ".%02x", EXTRACT_U_1(cp)); + cp++; pos += strlen(pos); } if (id_len == LSP_ID_LEN) - snprintf(pos, sizeof(id) - (pos - id), "-%02x", *cp); + nd_snprintf(pos, sizeof(id) - (pos - id), "-%02x", EXTRACT_U_1(cp)); return (id); } @@ -1685,28 +1712,28 @@ static int isis_print_metric_block(netdissect_options *ndo, const struct isis_metric_block *isis_metric_block) { - ND_PRINT((ndo, ", Default Metric: %d, %s", + ND_PRINT(", Default Metric: %u, %s", ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_default), - ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_default) ? "External" : "Internal")); + ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_default) ? "External" : "Internal"); if (!ISIS_LSP_TLV_METRIC_SUPPORTED(isis_metric_block->metric_delay)) - ND_PRINT((ndo, "\n\t\t Delay Metric: %d, %s", + ND_PRINT("\n\t\t Delay Metric: %u, %s", ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_delay), - ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_delay) ? "External" : "Internal")); + ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_delay) ? "External" : "Internal"); if (!ISIS_LSP_TLV_METRIC_SUPPORTED(isis_metric_block->metric_expense)) - ND_PRINT((ndo, "\n\t\t Expense Metric: %d, %s", + ND_PRINT("\n\t\t Expense Metric: %u, %s", ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_expense), - ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_expense) ? "External" : "Internal")); + ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_expense) ? "External" : "Internal"); if (!ISIS_LSP_TLV_METRIC_SUPPORTED(isis_metric_block->metric_error)) - ND_PRINT((ndo, "\n\t\t Error Metric: %d, %s", + ND_PRINT("\n\t\t Error Metric: %u, %s", ISIS_LSP_TLV_METRIC_VALUE(isis_metric_block->metric_error), - ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_error) ? "External" : "Internal")); + ISIS_LSP_TLV_METRIC_IE(isis_metric_block->metric_error) ? "External" : "Internal"); return(1); /* everything is ok */ } static int isis_print_tlv_ip_reach(netdissect_options *ndo, - const uint8_t *cp, const char *ident, int length) + const uint8_t *cp, const char *ident, u_int length) { int prefix_len; const struct isis_tlv_ip_reach *tlv_ip_reach; @@ -1715,50 +1742,50 @@ isis_print_tlv_ip_reach(netdissect_options *ndo, while (length > 0) { if ((size_t)length < sizeof(*tlv_ip_reach)) { - ND_PRINT((ndo, "short IPv4 Reachability (%d vs %lu)", + ND_PRINT("short IPv4 Reachability (%u vs %lu)", length, - (unsigned long)sizeof(*tlv_ip_reach))); + (unsigned long)sizeof(*tlv_ip_reach)); return (0); } - if (!ND_TTEST(*tlv_ip_reach)) + if (!ND_TTEST_SIZE(tlv_ip_reach)) return (0); - prefix_len = mask2plen(EXTRACT_BE_U_4(tlv_ip_reach->mask)); + prefix_len = mask2plen(EXTRACT_IPV4_TO_HOST_ORDER(tlv_ip_reach->mask)); if (prefix_len == -1) - ND_PRINT((ndo, "%sIPv4 prefix: %s mask %s", + ND_PRINT("%sIPv4 prefix: %s mask %s", ident, ipaddr_string(ndo, (tlv_ip_reach->prefix)), - ipaddr_string(ndo, (tlv_ip_reach->mask)))); + ipaddr_string(ndo, (tlv_ip_reach->mask))); else - ND_PRINT((ndo, "%sIPv4 prefix: %15s/%u", + ND_PRINT("%sIPv4 prefix: %15s/%u", ident, ipaddr_string(ndo, (tlv_ip_reach->prefix)), - prefix_len)); + prefix_len); - ND_PRINT((ndo, ", Distribution: %s, Metric: %u, %s", + ND_PRINT(", Distribution: %s, Metric: %u, %s", ISIS_LSP_TLV_METRIC_UPDOWN(tlv_ip_reach->isis_metric_block.metric_default) ? "down" : "up", ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_default), - ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_default) ? "External" : "Internal")); + ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_default) ? "External" : "Internal"); if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_delay)) - ND_PRINT((ndo, "%s Delay Metric: %u, %s", + ND_PRINT("%s Delay Metric: %u, %s", ident, ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_delay), - ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_delay) ? "External" : "Internal")); + ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_delay) ? "External" : "Internal"); if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_expense)) - ND_PRINT((ndo, "%s Expense Metric: %u, %s", + ND_PRINT("%s Expense Metric: %u, %s", ident, ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_expense), - ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_expense) ? "External" : "Internal")); + ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_expense) ? "External" : "Internal"); if (!ISIS_LSP_TLV_METRIC_SUPPORTED(tlv_ip_reach->isis_metric_block.metric_error)) - ND_PRINT((ndo, "%s Error Metric: %u, %s", + ND_PRINT("%s Error Metric: %u, %s", ident, ISIS_LSP_TLV_METRIC_VALUE(tlv_ip_reach->isis_metric_block.metric_error), - ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_error) ? "External" : "Internal")); + ISIS_LSP_TLV_METRIC_IE(tlv_ip_reach->isis_metric_block.metric_error) ? "External" : "Internal"); length -= sizeof(struct isis_tlv_ip_reach); tlv_ip_reach++; @@ -1773,32 +1800,32 @@ isis_print_tlv_ip_reach(netdissect_options *ndo, static int isis_print_ip_reach_subtlv(netdissect_options *ndo, - const uint8_t *tptr, int subt, int subl, + const uint8_t *tptr, u_int subt, u_int subl, const char *ident) { /* first lets see if we know the subTLVs name*/ - ND_PRINT((ndo, "%s%s subTLV #%u, length: %u", + ND_PRINT("%s%s subTLV #%u, length: %u", ident, tok2str(isis_ext_ip_reach_subtlv_values, "unknown", subt), - subt, subl)); + subt, subl); - ND_TCHECK2(*tptr,subl); + ND_TCHECK_LEN(tptr, subl); switch(subt) { case ISIS_SUBTLV_EXTD_IP_REACH_MGMT_PREFIX_COLOR: /* fall through */ case ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG32: while (subl >= 4) { - ND_PRINT((ndo, ", 0x%08x (=%u)", + ND_PRINT(", 0x%08x (=%u)", EXTRACT_BE_U_4(tptr), - EXTRACT_BE_U_4(tptr))); + EXTRACT_BE_U_4(tptr)); tptr+=4; subl-=4; } break; case ISIS_SUBTLV_EXTD_IP_REACH_ADMIN_TAG64: while (subl >= 8) { - ND_PRINT((ndo, ", 0x%08x%08x", + ND_PRINT(", 0x%08x%08x", EXTRACT_BE_U_4(tptr), - EXTRACT_BE_U_4(tptr + 4))); + EXTRACT_BE_U_4(tptr + 4)); tptr+=8; subl-=8; } @@ -1811,172 +1838,7 @@ isis_print_ip_reach_subtlv(netdissect_options *ndo, return(1); trunc: - ND_PRINT((ndo, "%s", ident)); - ND_PRINT((ndo, "%s", tstr)); - return(0); -} - -/* - * this is the common IS-REACH subTLV decoder it is called - * from isis_print_ext_is_reach() - */ - -static int -isis_print_is_reach_subtlv(netdissect_options *ndo, - const uint8_t *tptr, u_int subt, u_int subl, - const char *ident) -{ - u_int te_class,priority_level,gmpls_switch_cap; - union { /* int to float conversion buffer for several subTLVs */ - float f; - uint32_t i; - } bw; - - /* first lets see if we know the subTLVs name*/ - ND_PRINT((ndo, "%s%s subTLV #%u, length: %u", - ident, tok2str(isis_ext_is_reach_subtlv_values, "unknown", subt), - subt, subl)); - - ND_TCHECK2(*tptr, subl); - - switch(subt) { - case ISIS_SUBTLV_EXT_IS_REACH_ADMIN_GROUP: - case ISIS_SUBTLV_EXT_IS_REACH_LINK_LOCAL_REMOTE_ID: - case ISIS_SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID: - if (subl >= 4) { - ND_PRINT((ndo, ", 0x%08x", EXTRACT_BE_U_4(tptr))); - if (subl == 8) /* rfc4205 */ - ND_PRINT((ndo, ", 0x%08x", EXTRACT_BE_U_4(tptr + 4))); - } - break; - case ISIS_SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR: - case ISIS_SUBTLV_EXT_IS_REACH_IPV4_NEIGHBOR_ADDR: - if (subl >= sizeof(struct in_addr)) - ND_PRINT((ndo, ", %s", ipaddr_string(ndo, tptr))); - break; - case ISIS_SUBTLV_EXT_IS_REACH_MAX_LINK_BW : - case ISIS_SUBTLV_EXT_IS_REACH_RESERVABLE_BW: - if (subl >= 4) { - bw.i = EXTRACT_BE_U_4(tptr); - ND_PRINT((ndo, ", %.3f Mbps", bw.f * 8 / 1000000)); - } - break; - case ISIS_SUBTLV_EXT_IS_REACH_UNRESERVED_BW : - if (subl >= 32) { - for (te_class = 0; te_class < 8; te_class++) { - bw.i = EXTRACT_BE_U_4(tptr); - ND_PRINT((ndo, "%s TE-Class %u: %.3f Mbps", - ident, - te_class, - bw.f * 8 / 1000000)); - tptr+=4; - } - } - break; - case ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS: /* fall through */ - case ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS_OLD: - if (subl == 0) - break; - ND_PRINT((ndo, "%sBandwidth Constraints Model ID: %s (%u)", - ident, - tok2str(diffserv_te_bc_values, "unknown", EXTRACT_U_1(tptr)), - EXTRACT_U_1(tptr))); - tptr++; - /* decode BCs until the subTLV ends */ - for (te_class = 0; te_class < (subl-1)/4; te_class++) { - bw.i = EXTRACT_BE_U_4(tptr); - ND_PRINT((ndo, "%s Bandwidth constraint CT%u: %.3f Mbps", - ident, - te_class, - bw.f * 8 / 1000000)); - tptr+=4; - } - break; - case ISIS_SUBTLV_EXT_IS_REACH_TE_METRIC: - if (subl >= 3) - ND_PRINT((ndo, ", %u", EXTRACT_BE_U_3(tptr))); - break; - case ISIS_SUBTLV_EXT_IS_REACH_LINK_ATTRIBUTE: - if (subl == 2) { - ND_PRINT((ndo, ", [ %s ] (0x%04x)", - bittok2str(isis_subtlv_link_attribute_values, - "Unknown", - EXTRACT_BE_U_2(tptr)), - EXTRACT_BE_U_2(tptr))); - } - break; - case ISIS_SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE: - if (subl >= 2) { - ND_PRINT((ndo, ", %s, Priority %u", - bittok2str(gmpls_link_prot_values, "none", EXTRACT_U_1(tptr)), - EXTRACT_U_1(tptr + 1))); - } - break; - case ISIS_SUBTLV_SPB_METRIC: - if (subl >= 6) { - ND_PRINT((ndo, ", LM: %u", EXTRACT_BE_U_3(tptr))); - tptr=tptr+3; - ND_PRINT((ndo, ", P: %u", EXTRACT_U_1(tptr))); - tptr++; - ND_PRINT((ndo, ", P-ID: %u", EXTRACT_BE_U_2(tptr))); - } - break; - case ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR: - if (subl >= 36) { - gmpls_switch_cap = EXTRACT_U_1(tptr); - ND_PRINT((ndo, "%s Interface Switching Capability:%s", - ident, - tok2str(gmpls_switch_cap_values, "Unknown", gmpls_switch_cap))); - ND_PRINT((ndo, ", LSP Encoding: %s", - tok2str(gmpls_encoding_values, "Unknown", EXTRACT_U_1((tptr + 1))))); - tptr+=4; - ND_PRINT((ndo, "%s Max LSP Bandwidth:", ident)); - for (priority_level = 0; priority_level < 8; priority_level++) { - bw.i = EXTRACT_BE_U_4(tptr); - ND_PRINT((ndo, "%s priority level %d: %.3f Mbps", - ident, - priority_level, - bw.f * 8 / 1000000)); - tptr+=4; - } - subl-=36; - switch (gmpls_switch_cap) { - case GMPLS_PSC1: - case GMPLS_PSC2: - case GMPLS_PSC3: - case GMPLS_PSC4: - if (subl < 6) - break; - bw.i = EXTRACT_BE_U_4(tptr); - ND_PRINT((ndo, "%s Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000)); - ND_PRINT((ndo, "%s Interface MTU: %u", ident, EXTRACT_BE_U_2(tptr + 4))); - break; - case GMPLS_TSC: - if (subl < 8) - break; - bw.i = EXTRACT_BE_U_4(tptr); - ND_PRINT((ndo, "%s Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000)); - ND_PRINT((ndo, "%s Indication %s", ident, - tok2str(gmpls_switch_cap_tsc_indication_values, "Unknown (%u)", EXTRACT_U_1((tptr + 4))))); - break; - default: - /* there is some optional stuff left to decode but this is as of yet - not specified so just lets hexdump what is left */ - if(subl>0){ - if (!print_unknown_data(ndo, tptr, "\n\t\t ", subl)) - return(0); - } - } - } - break; - default: - if (!print_unknown_data(ndo, tptr, "\n\t\t ", subl)) - return(0); - break; - } - return(1); - -trunc: + nd_print_trunc(ndo); return(0); } @@ -1987,49 +1849,256 @@ trunc: static int isis_print_ext_is_reach(netdissect_options *ndo, - const uint8_t *tptr, const char *ident, int tlv_type) + const uint8_t *tptr, const char *ident, u_int tlv_type, + u_int tlv_remaining) { char ident_buffer[20]; - int subtlv_type,subtlv_len,subtlv_sum_len; + u_int subtlv_type,subtlv_len,subtlv_sum_len; int proc_bytes = 0; /* how many bytes did we process ? */ + u_int te_class,priority_level,gmpls_switch_cap; + union { /* int to float conversion buffer for several subTLVs */ + float f; + uint32_t i; + } bw; - if (!ND_TTEST2(*tptr, NODE_ID_LEN)) + if (!ND_TTEST_LEN(tptr, NODE_ID_LEN)) + return(0); + if (tlv_remaining < NODE_ID_LEN) return(0); - ND_PRINT((ndo, "%sIS Neighbor: %s", ident, isis_print_id(tptr, NODE_ID_LEN))); + ND_PRINT("%sIS Neighbor: %s", ident, isis_print_id(tptr, NODE_ID_LEN)); tptr+=NODE_ID_LEN; + tlv_remaining-=NODE_ID_LEN; if (tlv_type != ISIS_TLV_IS_ALIAS_ID) { /* the Alias TLV Metric field is implicit 0 */ if (!ND_TTEST_3(tptr)) /* and is therefore skipped */ return(0); - ND_PRINT((ndo, ", Metric: %d", EXTRACT_BE_U_3(tptr))); + if (tlv_remaining < 3) + return(0); + ND_PRINT(", Metric: %u", EXTRACT_BE_U_3(tptr)); tptr+=3; + tlv_remaining-=3; } if (!ND_TTEST_1(tptr)) return(0); + if (tlv_remaining < 1) + return(0); subtlv_sum_len=EXTRACT_U_1(tptr); /* read out subTLV length */ tptr++; + tlv_remaining--; proc_bytes=NODE_ID_LEN+3+1; - ND_PRINT((ndo, ", %ssub-TLVs present",subtlv_sum_len ? "" : "no ")); + ND_PRINT(", %ssub-TLVs present",subtlv_sum_len ? "" : "no "); if (subtlv_sum_len) { - ND_PRINT((ndo, " (%u)", subtlv_sum_len)); - while (subtlv_sum_len>0) { + ND_PRINT(" (%u)", subtlv_sum_len); + /* prepend the indent string */ + nd_snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident); + ident = ident_buffer; + while (subtlv_sum_len != 0) { if (!ND_TTEST_2(tptr)) return(0); + if (tlv_remaining < 2) { + ND_PRINT("%sRemaining data in TLV shorter than a subTLV header",ident); + proc_bytes += tlv_remaining; + break; + } + if (subtlv_sum_len < 2) { + ND_PRINT("%sRemaining data in subTLVs shorter than a subTLV header",ident); + proc_bytes += subtlv_sum_len; + break; + } subtlv_type=EXTRACT_U_1(tptr); subtlv_len=EXTRACT_U_1(tptr + 1); - tptr+=2; - /* prepend the indent string */ - snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident); - if (!isis_print_is_reach_subtlv(ndo, tptr, subtlv_type, subtlv_len, ident_buffer)) - return(0); - tptr+=subtlv_len; - subtlv_sum_len-=(subtlv_len+2); - proc_bytes+=(subtlv_len+2); + tptr += 2; + tlv_remaining -= 2; + subtlv_sum_len -= 2; + proc_bytes += 2; + ND_PRINT("%s%s subTLV #%u, length: %u", + ident, tok2str(isis_ext_is_reach_subtlv_values, "unknown", subtlv_type), + subtlv_type, subtlv_len); + + if (subtlv_sum_len < subtlv_len) { + ND_PRINT(" (remaining data in subTLVs shorter than the current subTLV)"); + proc_bytes += subtlv_sum_len; + break; + } + + if (tlv_remaining < subtlv_len) { + ND_PRINT(" (> remaining tlv length)"); + proc_bytes += tlv_remaining; + break; + } + + ND_TCHECK_LEN(tptr, subtlv_len); + + switch(subtlv_type) { + case ISIS_SUBTLV_EXT_IS_REACH_ADMIN_GROUP: + case ISIS_SUBTLV_EXT_IS_REACH_LINK_LOCAL_REMOTE_ID: + case ISIS_SUBTLV_EXT_IS_REACH_LINK_REMOTE_ID: + if (subtlv_len >= 4) { + ND_PRINT(", 0x%08x", EXTRACT_BE_U_4(tptr)); + if (subtlv_len == 8) /* rfc4205 */ + ND_PRINT(", 0x%08x", EXTRACT_BE_U_4(tptr + 4)); + } + break; + case ISIS_SUBTLV_EXT_IS_REACH_IPV4_INTF_ADDR: + case ISIS_SUBTLV_EXT_IS_REACH_IPV4_NEIGHBOR_ADDR: + if (subtlv_len >= sizeof(nd_ipv4)) + ND_PRINT(", %s", ipaddr_string(ndo, tptr)); + break; + case ISIS_SUBTLV_EXT_IS_REACH_MAX_LINK_BW : + case ISIS_SUBTLV_EXT_IS_REACH_RESERVABLE_BW: + if (subtlv_len >= 4) { + bw.i = EXTRACT_BE_U_4(tptr); + ND_PRINT(", %.3f Mbps", bw.f * 8 / 1000000); + } + break; + case ISIS_SUBTLV_EXT_IS_REACH_UNRESERVED_BW : + if (subtlv_len >= 32) { + for (te_class = 0; te_class < 8; te_class++) { + bw.i = EXTRACT_BE_U_4(tptr); + ND_PRINT("%s TE-Class %u: %.3f Mbps", + ident, + te_class, + bw.f * 8 / 1000000); + tptr += 4; + subtlv_len -= 4; + subtlv_sum_len -= 4; + proc_bytes += 4; + } + } + break; + case ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS: /* fall through */ + case ISIS_SUBTLV_EXT_IS_REACH_BW_CONSTRAINTS_OLD: + if (subtlv_len == 0) + break; + ND_PRINT("%sBandwidth Constraints Model ID: %s (%u)", + ident, + tok2str(diffserv_te_bc_values, "unknown", EXTRACT_U_1(tptr)), + EXTRACT_U_1(tptr)); + tptr++; + subtlv_len--; + subtlv_sum_len--; + proc_bytes++; + /* decode BCs until the subTLV ends */ + for (te_class = 0; subtlv_len != 0; te_class++) { + if (subtlv_len < 4) + break; + bw.i = EXTRACT_BE_U_4(tptr); + ND_PRINT("%s Bandwidth constraint CT%u: %.3f Mbps", + ident, + te_class, + bw.f * 8 / 1000000); + tptr += 4; + subtlv_len -= 4; + subtlv_sum_len -= 4; + proc_bytes += 4; + } + break; + case ISIS_SUBTLV_EXT_IS_REACH_TE_METRIC: + if (subtlv_len >= 3) + ND_PRINT(", %u", EXTRACT_BE_U_3(tptr)); + break; + case ISIS_SUBTLV_EXT_IS_REACH_LINK_ATTRIBUTE: + if (subtlv_len == 2) { + ND_PRINT(", [ %s ] (0x%04x)", + bittok2str(isis_subtlv_link_attribute_values, + "Unknown", + EXTRACT_BE_U_2(tptr)), + EXTRACT_BE_U_2(tptr)); + } + break; + case ISIS_SUBTLV_EXT_IS_REACH_LINK_PROTECTION_TYPE: + if (subtlv_len >= 2) { + ND_PRINT(", %s, Priority %u", + bittok2str(gmpls_link_prot_values, "none", EXTRACT_U_1(tptr)), + EXTRACT_U_1(tptr + 1)); + } + break; + case ISIS_SUBTLV_SPB_METRIC: + if (subtlv_len >= 6) { + ND_PRINT(", LM: %u", EXTRACT_BE_U_3(tptr)); + tptr += 3; + subtlv_len -= 3; + subtlv_sum_len -= 3; + proc_bytes += 3; + ND_PRINT(", P: %u", EXTRACT_U_1(tptr)); + tptr++; + subtlv_len--; + subtlv_sum_len--; + proc_bytes++; + ND_PRINT(", P-ID: %u", EXTRACT_BE_U_2(tptr)); + } + break; + case ISIS_SUBTLV_EXT_IS_REACH_INTF_SW_CAP_DESCR: + if (subtlv_len >= 36) { + gmpls_switch_cap = EXTRACT_U_1(tptr); + ND_PRINT("%s Interface Switching Capability:%s", + ident, + tok2str(gmpls_switch_cap_values, "Unknown", gmpls_switch_cap)); + ND_PRINT(", LSP Encoding: %s", + tok2str(gmpls_encoding_values, "Unknown", EXTRACT_U_1((tptr + 1)))); + tptr += 4; + subtlv_len -= 4; + subtlv_sum_len -= 4; + proc_bytes += 4; + ND_PRINT("%s Max LSP Bandwidth:", ident); + for (priority_level = 0; priority_level < 8; priority_level++) { + bw.i = EXTRACT_BE_U_4(tptr); + ND_PRINT("%s priority level %u: %.3f Mbps", + ident, + priority_level, + bw.f * 8 / 1000000); + tptr += 4; + subtlv_len -= 4; + subtlv_sum_len -= 4; + proc_bytes += 4; + } + switch (gmpls_switch_cap) { + case GMPLS_PSC1: + case GMPLS_PSC2: + case GMPLS_PSC3: + case GMPLS_PSC4: + if (subtlv_len < 6) + break; + bw.i = EXTRACT_BE_U_4(tptr); + ND_PRINT("%s Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000); + ND_PRINT("%s Interface MTU: %u", ident, EXTRACT_BE_U_2(tptr + 4)); + break; + case GMPLS_TSC: + if (subtlv_len < 8) + break; + bw.i = EXTRACT_BE_U_4(tptr); + ND_PRINT("%s Min LSP Bandwidth: %.3f Mbps", ident, bw.f * 8 / 1000000); + ND_PRINT("%s Indication %s", ident, + tok2str(gmpls_switch_cap_tsc_indication_values, "Unknown (%u)", EXTRACT_U_1((tptr + 4)))); + break; + default: + /* there is some optional stuff left to decode but this is as of yet + not specified so just lets hexdump what is left */ + if (subtlv_len != 0) { + if (!print_unknown_data(ndo, tptr, "\n\t\t ", subtlv_len)) + return(0); + } + } + } + break; + default: + if (!print_unknown_data(ndo, tptr, "\n\t\t ", subtlv_len)) + return(0); + break; + } + + tptr += subtlv_len; + tlv_remaining -= subtlv_len; + subtlv_sum_len -= subtlv_len; + proc_bytes += subtlv_len; } } return(proc_bytes); + +trunc: + return(0); } /* @@ -2044,15 +2113,15 @@ isis_print_mtid(netdissect_options *ndo, if (!ND_TTEST_2(tptr)) return(0); - ND_PRINT((ndo, "%s%s", + ND_PRINT("%s%s", ident, tok2str(isis_mt_values, "Reserved for IETF Consensus", - ISIS_MASK_MTID(EXTRACT_BE_U_2(tptr))))); + ISIS_MASK_MTID(EXTRACT_BE_U_2(tptr)))); - ND_PRINT((ndo, " Topology (0x%03x), Flags: [%s]", + ND_PRINT(" Topology (0x%03x), Flags: [%s]", ISIS_MASK_MTID(EXTRACT_BE_U_2(tptr)), - bittok2str(isis_mt_flag_values, "none",ISIS_MASK_MTFLAGS(EXTRACT_BE_U_2(tptr))))); + bittok2str(isis_mt_flag_values, "none",ISIS_MASK_MTFLAGS(EXTRACT_BE_U_2(tptr)))); return(2); } @@ -2069,7 +2138,7 @@ isis_print_extd_ip_reach(netdissect_options *ndo, const uint8_t *tptr, const char *ident, uint16_t afi) { char ident_buffer[20]; - uint8_t prefix[sizeof(struct in6_addr)]; /* shared copy buffer for IPv4 and IPv6 prefixes */ + 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; if (!ND_TTEST_4(tptr)) @@ -2085,9 +2154,9 @@ isis_print_extd_ip_reach(netdissect_options *ndo, tptr++; bit_length = status_byte&0x3f; if (bit_length > 32) { - ND_PRINT((ndo, "%sIPv4 prefix: bad bit length %u", + ND_PRINT("%sIPv4 prefix: bad bit length %u", ident, - bit_length)); + bit_length); return (0); } processed++; @@ -2097,9 +2166,9 @@ isis_print_extd_ip_reach(netdissect_options *ndo, status_byte=EXTRACT_U_1(tptr); bit_length=EXTRACT_U_1(tptr + 1); if (bit_length > 128) { - ND_PRINT((ndo, "%sIPv6 prefix: bad bit length %u", + ND_PRINT("%sIPv6 prefix: bad bit length %u", ident, - bit_length)); + bit_length); return (0); } tptr+=2; @@ -2109,38 +2178,38 @@ isis_print_extd_ip_reach(netdissect_options *ndo, byte_length = (bit_length + 7) / 8; /* prefix has variable length encoding */ - if (!ND_TTEST2(*tptr, byte_length)) + if (!ND_TTEST_LEN(tptr, byte_length)) return (0); - memset(prefix, 0, sizeof prefix); /* clear the copy buffer */ + memset(prefix, 0, sizeof(prefix)); /* clear the copy buffer */ memcpy(prefix,tptr,byte_length); /* copy as much as is stored in the TLV */ tptr+=byte_length; processed+=byte_length; if (afi == AF_INET) - ND_PRINT((ndo, "%sIPv4 prefix: %15s/%u", + ND_PRINT("%sIPv4 prefix: %15s/%u", ident, ipaddr_string(ndo, prefix), - bit_length)); + bit_length); else if (afi == AF_INET6) - ND_PRINT((ndo, "%sIPv6 prefix: %s/%u", + ND_PRINT("%sIPv6 prefix: %s/%u", ident, ip6addr_string(ndo, prefix), - bit_length)); + bit_length); - ND_PRINT((ndo, ", Distribution: %s, Metric: %u", + ND_PRINT(", Distribution: %s, Metric: %u", ISIS_MASK_TLV_EXTD_IP_UPDOWN(status_byte) ? "down" : "up", - metric)); + metric); if (afi == AF_INET && ISIS_MASK_TLV_EXTD_IP_SUBTLV(status_byte)) - ND_PRINT((ndo, ", sub-TLVs present")); + ND_PRINT(", sub-TLVs present"); else if (afi == AF_INET6) - ND_PRINT((ndo, ", %s%s", + ND_PRINT(", %s%s", ISIS_MASK_TLV_EXTD_IP6_IE(status_byte) ? "External" : "Internal", - ISIS_MASK_TLV_EXTD_IP6_SUBTLV(status_byte) ? ", sub-TLVs present" : "")); + ISIS_MASK_TLV_EXTD_IP6_SUBTLV(status_byte) ? ", sub-TLVs present" : ""); if ((afi == AF_INET && ISIS_MASK_TLV_EXTD_IP_SUBTLV(status_byte)) || (afi == AF_INET6 && ISIS_MASK_TLV_EXTD_IP6_SUBTLV(status_byte)) - ) { + ) { /* assume that one prefix can hold more than one subTLV - therefore the first byte must reflect the aggregate bytecount of the subTLVs for this prefix @@ -2150,7 +2219,7 @@ isis_print_extd_ip_reach(netdissect_options *ndo, sublen=EXTRACT_U_1(tptr); tptr++; processed+=sublen+1; - ND_PRINT((ndo, " (%u)", sublen)); /* print out subTLV length */ + ND_PRINT(" (%u)", sublen); /* print out subTLV length */ while (sublen>0) { if (!ND_TTEST_2(tptr)) @@ -2159,7 +2228,7 @@ isis_print_extd_ip_reach(netdissect_options *ndo, subtlvlen=EXTRACT_U_1(tptr + 1); tptr+=2; /* prepend the indent string */ - snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident); + nd_snprintf(ident_buffer, sizeof(ident_buffer), "%s ",ident); if (!isis_print_ip_reach_subtlv(ndo, tptr, subtlvtype, subtlvlen, ident_buffer)) return(0); tptr+=subtlvlen; @@ -2205,7 +2274,8 @@ isis_print(netdissect_options *ndo, const struct isis_tlv_is_reach *tlv_is_reach; const struct isis_tlv_es_reach *tlv_es_reach; - uint8_t pdu_type, max_area, id_length, tlv_type, tlv_len, tmp, alen, lan_alen, prefix_len; + uint8_t version, pdu_version, fixed_len; + uint8_t pdu_type, pdu_max_area, max_area, pdu_id_length, id_length, tlv_type, tlv_len, tmp, alen, lan_alen, prefix_len; uint8_t ext_is_len, ext_ip_len, mt_len; uint8_t isis_subtlv_idrp; const uint8_t *optr, *pptr, *tptr; @@ -2213,12 +2283,13 @@ isis_print(netdissect_options *ndo, u_int i,vendor_id; int sigcheck; + ndo->ndo_protocol = "isis"; packet_len=length; optr = p; /* initialize the _o_riginal pointer to the packet start - need it for parsing the checksum TLV and authentication TLV verification */ isis_header = (const struct isis_common_header *)p; - ND_TCHECK(*isis_header); + ND_TCHECK_SIZE(isis_header); if (length < ISIS_COMMON_HEADER_SIZE) goto trunc; pptr = p+(ISIS_COMMON_HEADER_SIZE); @@ -2229,52 +2300,56 @@ isis_print(netdissect_options *ndo, header_psnp = (const struct isis_psnp_header *)pptr; if (!ndo->ndo_eflag) - ND_PRINT((ndo, "IS-IS")); + ND_PRINT("IS-IS"); /* * Sanity checking of the header. */ - if (isis_header->version != ISIS_VERSION) { - ND_PRINT((ndo, "version %d packet not supported", isis_header->version)); + version = EXTRACT_U_1(isis_header->version); + if (version != ISIS_VERSION) { + ND_PRINT("version %u packet not supported", version); return (0); } - if ((isis_header->id_length != SYSTEM_ID_LEN) && (isis_header->id_length != 0)) { - ND_PRINT((ndo, "system ID length of %d is not supported", - isis_header->id_length)); + pdu_id_length = EXTRACT_U_1(isis_header->id_length); + if ((pdu_id_length != SYSTEM_ID_LEN) && (pdu_id_length != 0)) { + ND_PRINT("system ID length of %u is not supported", + pdu_id_length); return (0); } - if (isis_header->pdu_version != ISIS_VERSION) { - ND_PRINT((ndo, "version %d packet not supported", isis_header->pdu_version)); + pdu_version = EXTRACT_U_1(isis_header->pdu_version); + if (pdu_version != ISIS_VERSION) { + ND_PRINT("version %u packet not supported", pdu_version); return (0); } - if (length < isis_header->fixed_len) { - ND_PRINT((ndo, "fixed header length %u > packet length %u", isis_header->fixed_len, length)); + fixed_len = EXTRACT_U_1(isis_header->fixed_len); + if (length < fixed_len) { + ND_PRINT("fixed header length %u > packet length %u", fixed_len, length); return (0); } - if (isis_header->fixed_len < ISIS_COMMON_HEADER_SIZE) { - ND_PRINT((ndo, "fixed header length %u < minimum header size %u", isis_header->fixed_len, (u_int)ISIS_COMMON_HEADER_SIZE)); + if (fixed_len < ISIS_COMMON_HEADER_SIZE) { + ND_PRINT("fixed header length %u < minimum header size %u", fixed_len, (u_int)ISIS_COMMON_HEADER_SIZE); return (0); } - max_area = isis_header->max_area; - switch(max_area) { + pdu_max_area = EXTRACT_U_1(isis_header->max_area); + switch(pdu_max_area) { case 0: max_area = 3; /* silly shit */ break; case 255: - ND_PRINT((ndo, "bad packet -- 255 areas")); + ND_PRINT("bad packet -- 255 areas"); return (0); default: + max_area = pdu_max_area; break; } - id_length = isis_header->id_length; - switch(id_length) { + switch(pdu_id_length) { case 0: id_length = 6; /* silly shit again */ break; @@ -2286,42 +2361,44 @@ isis_print(netdissect_options *ndo, case 6: case 7: case 8: + id_length = pdu_id_length; break; case 255: id_length = 0; /* entirely useless */ break; default: + id_length = pdu_id_length; break; } /* toss any non 6-byte sys-ID len PDUs */ if (id_length != 6 ) { - ND_PRINT((ndo, "bad packet -- illegal sys-ID length (%u)", id_length)); + ND_PRINT("bad packet -- illegal sys-ID length (%u)", id_length); return (0); } - pdu_type=isis_header->pdu_type; + pdu_type = EXTRACT_U_1(isis_header->pdu_type); /* in non-verbose mode print the basic PDU Type plus PDU specific brief information*/ if (ndo->ndo_vflag == 0) { - ND_PRINT((ndo, "%s%s", + ND_PRINT("%s%s", ndo->ndo_eflag ? "" : ", ", - tok2str(isis_pdu_values, "unknown PDU-Type %u", pdu_type))); + tok2str(isis_pdu_values, "unknown PDU-Type %u", pdu_type)); } else { /* ok they seem to want to know everything - lets fully decode it */ - ND_PRINT((ndo, "%slength %u", ndo->ndo_eflag ? "" : ", ", length)); + ND_PRINT("%slength %u", ndo->ndo_eflag ? "" : ", ", length); - ND_PRINT((ndo, "\n\t%s, hlen: %u, v: %u, pdu-v: %u, sys-id-len: %u (%u), max-area: %u (%u)", + ND_PRINT("\n\t%s, hlen: %u, v: %u, pdu-v: %u, sys-id-len: %u (%u), max-area: %u (%u)", tok2str(isis_pdu_values, "unknown, type %u", pdu_type), - isis_header->fixed_len, - isis_header->version, - isis_header->pdu_version, + fixed_len, + version, + pdu_version, id_length, - isis_header->id_length, + pdu_id_length, max_area, - isis_header->max_area)); + pdu_max_area); if (ndo->ndo_vflag > 1) { if (!print_unknown_data(ndo, optr, "\n\t", 8)) /* provide the _o_riginal pointer */ @@ -2333,21 +2410,21 @@ isis_print(netdissect_options *ndo, case ISIS_PDU_L1_LAN_IIH: case ISIS_PDU_L2_LAN_IIH: - if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE)) { - ND_PRINT((ndo, ", bogus fixed header length %u should be %lu", - isis_header->fixed_len, (unsigned long)(ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE))); + if (fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE)) { + ND_PRINT(", bogus fixed header length %u should be %lu", + fixed_len, (unsigned long)(ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE)); return (0); } - ND_TCHECK(*header_iih_lan); + ND_TCHECK_SIZE(header_iih_lan); if (length < ISIS_COMMON_HEADER_SIZE+ISIS_IIH_LAN_HEADER_SIZE) goto trunc; if (ndo->ndo_vflag == 0) { - ND_PRINT((ndo, ", src-id %s", - isis_print_id(header_iih_lan->source_id, SYSTEM_ID_LEN))); - ND_PRINT((ndo, ", lan-id %s, prio %u", + ND_PRINT(", src-id %s", + isis_print_id(header_iih_lan->source_id, SYSTEM_ID_LEN)); + ND_PRINT(", lan-id %s, prio %u", isis_print_id(header_iih_lan->lan_id,NODE_ID_LEN), - header_iih_lan->priority)); - ND_PRINT((ndo, ", length %u", length)); + EXTRACT_U_1(header_iih_lan->priority)); + ND_PRINT(", length %u", length); return (1); } pdu_len=EXTRACT_BE_U_2(header_iih_lan->pdu_len); @@ -2356,17 +2433,17 @@ isis_print(netdissect_options *ndo, length=pdu_len; } - ND_PRINT((ndo, "\n\t source-id: %s, holding time: %us, Flags: [%s]", + ND_PRINT("\n\t source-id: %s, holding time: %us, Flags: [%s]", isis_print_id(header_iih_lan->source_id,SYSTEM_ID_LEN), EXTRACT_BE_U_2(header_iih_lan->holding_time), tok2str(isis_iih_circuit_type_values, "unknown circuit type 0x%02x", - header_iih_lan->circuit_type))); + EXTRACT_U_1(header_iih_lan->circuit_type))); - ND_PRINT((ndo, "\n\t lan-id: %s, Priority: %u, PDU length: %u", + ND_PRINT("\n\t lan-id: %s, Priority: %u, PDU length: %u", isis_print_id(header_iih_lan->lan_id, NODE_ID_LEN), - (header_iih_lan->priority) & ISIS_LAN_PRIORITY_MASK, - pdu_len)); + EXTRACT_U_1(header_iih_lan->priority) & ISIS_LAN_PRIORITY_MASK, + pdu_len); if (ndo->ndo_vflag > 1) { if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_IIH_LAN_HEADER_SIZE)) @@ -2378,17 +2455,17 @@ isis_print(netdissect_options *ndo, break; case ISIS_PDU_PTP_IIH: - if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE)) { - ND_PRINT((ndo, ", bogus fixed header length %u should be %lu", - isis_header->fixed_len, (unsigned long)(ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE))); + if (fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE)) { + ND_PRINT(", bogus fixed header length %u should be %lu", + fixed_len, (unsigned long)(ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE)); return (0); } - ND_TCHECK(*header_iih_ptp); + ND_TCHECK_SIZE(header_iih_ptp); if (length < ISIS_COMMON_HEADER_SIZE+ISIS_IIH_PTP_HEADER_SIZE) goto trunc; if (ndo->ndo_vflag == 0) { - ND_PRINT((ndo, ", src-id %s", isis_print_id(header_iih_ptp->source_id, SYSTEM_ID_LEN))); - ND_PRINT((ndo, ", length %u", length)); + ND_PRINT(", src-id %s", isis_print_id(header_iih_ptp->source_id, SYSTEM_ID_LEN)); + ND_PRINT(", length %u", length); return (1); } pdu_len=EXTRACT_BE_U_2(header_iih_ptp->pdu_len); @@ -2397,16 +2474,16 @@ isis_print(netdissect_options *ndo, length=pdu_len; } - ND_PRINT((ndo, "\n\t source-id: %s, holding time: %us, Flags: [%s]", + ND_PRINT("\n\t source-id: %s, holding time: %us, Flags: [%s]", isis_print_id(header_iih_ptp->source_id,SYSTEM_ID_LEN), EXTRACT_BE_U_2(header_iih_ptp->holding_time), tok2str(isis_iih_circuit_type_values, "unknown circuit type 0x%02x", - header_iih_ptp->circuit_type))); + EXTRACT_U_1(header_iih_ptp->circuit_type))); - ND_PRINT((ndo, "\n\t circuit-id: 0x%02x, PDU length: %u", - header_iih_ptp->circuit_id, - pdu_len)); + ND_PRINT("\n\t circuit-id: 0x%02x, PDU length: %u", + EXTRACT_U_1(header_iih_ptp->circuit_id), + pdu_len); if (ndo->ndo_vflag > 1) { if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_IIH_PTP_HEADER_SIZE)) @@ -2419,20 +2496,20 @@ isis_print(netdissect_options *ndo, case ISIS_PDU_L1_LSP: case ISIS_PDU_L2_LSP: - if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_LSP_HEADER_SIZE)) { - ND_PRINT((ndo, ", bogus fixed header length %u should be %lu", - isis_header->fixed_len, (unsigned long)ISIS_LSP_HEADER_SIZE)); + if (fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_LSP_HEADER_SIZE)) { + ND_PRINT(", bogus fixed header length %u should be %lu", + fixed_len, (unsigned long)ISIS_LSP_HEADER_SIZE); return (0); } - ND_TCHECK(*header_lsp); + ND_TCHECK_SIZE(header_lsp); if (length < ISIS_COMMON_HEADER_SIZE+ISIS_LSP_HEADER_SIZE) goto trunc; if (ndo->ndo_vflag == 0) { - ND_PRINT((ndo, ", lsp-id %s, seq 0x%08x, lifetime %5us", + ND_PRINT(", lsp-id %s, seq 0x%08x, lifetime %5us", isis_print_id(header_lsp->lsp_id, LSP_ID_LEN), EXTRACT_BE_U_4(header_lsp->sequence_number), - EXTRACT_BE_U_2(header_lsp->remaining_lifetime))); - ND_PRINT((ndo, ", length %u", length)); + EXTRACT_BE_U_2(header_lsp->remaining_lifetime)); + ND_PRINT(", length %u", length); return (1); } pdu_len=EXTRACT_BE_U_2(header_lsp->pdu_len); @@ -2441,30 +2518,30 @@ isis_print(netdissect_options *ndo, length=pdu_len; } - ND_PRINT((ndo, "\n\t lsp-id: %s, seq: 0x%08x, lifetime: %5us\n\t chksum: 0x%04x", + ND_PRINT("\n\t lsp-id: %s, seq: 0x%08x, lifetime: %5us\n\t chksum: 0x%04x", isis_print_id(header_lsp->lsp_id, LSP_ID_LEN), EXTRACT_BE_U_4(header_lsp->sequence_number), EXTRACT_BE_U_2(header_lsp->remaining_lifetime), - EXTRACT_BE_U_2(header_lsp->checksum))); + EXTRACT_BE_U_2(header_lsp->checksum)); osi_print_cksum(ndo, (const uint8_t *)header_lsp->lsp_id, EXTRACT_BE_U_2(header_lsp->checksum), 12, length-12); - ND_PRINT((ndo, ", PDU length: %u, Flags: [ %s", + ND_PRINT(", PDU length: %u, Flags: [ %s", pdu_len, - ISIS_MASK_LSP_OL_BIT(header_lsp->typeblock) ? "Overload bit set, " : "")); + ISIS_MASK_LSP_OL_BIT(header_lsp->typeblock) ? "Overload bit set, " : ""); if (ISIS_MASK_LSP_ATT_BITS(header_lsp->typeblock)) { - ND_PRINT((ndo, "%s", ISIS_MASK_LSP_ATT_DEFAULT_BIT(header_lsp->typeblock) ? "default " : "")); - ND_PRINT((ndo, "%s", ISIS_MASK_LSP_ATT_DELAY_BIT(header_lsp->typeblock) ? "delay " : "")); - ND_PRINT((ndo, "%s", ISIS_MASK_LSP_ATT_EXPENSE_BIT(header_lsp->typeblock) ? "expense " : "")); - ND_PRINT((ndo, "%s", ISIS_MASK_LSP_ATT_ERROR_BIT(header_lsp->typeblock) ? "error " : "")); - ND_PRINT((ndo, "ATT bit set, ")); + ND_PRINT("%s", ISIS_MASK_LSP_ATT_DEFAULT_BIT(header_lsp->typeblock) ? "default " : ""); + ND_PRINT("%s", ISIS_MASK_LSP_ATT_DELAY_BIT(header_lsp->typeblock) ? "delay " : ""); + ND_PRINT("%s", ISIS_MASK_LSP_ATT_EXPENSE_BIT(header_lsp->typeblock) ? "expense " : ""); + ND_PRINT("%s", ISIS_MASK_LSP_ATT_ERROR_BIT(header_lsp->typeblock) ? "error " : ""); + ND_PRINT("ATT bit set, "); } - ND_PRINT((ndo, "%s", ISIS_MASK_LSP_PARTITION_BIT(header_lsp->typeblock) ? "P bit set, " : "")); - ND_PRINT((ndo, "%s ]", tok2str(isis_lsp_istype_values, "Unknown(0x%x)", - ISIS_MASK_LSP_ISTYPE_BITS(header_lsp->typeblock)))); + ND_PRINT("%s", ISIS_MASK_LSP_PARTITION_BIT(header_lsp->typeblock) ? "P bit set, " : ""); + ND_PRINT("%s ]", tok2str(isis_lsp_istype_values, "Unknown(0x%x)", + ISIS_MASK_LSP_ISTYPE_BITS(header_lsp->typeblock))); if (ndo->ndo_vflag > 1) { if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_LSP_HEADER_SIZE)) @@ -2477,17 +2554,17 @@ isis_print(netdissect_options *ndo, case ISIS_PDU_L1_CSNP: case ISIS_PDU_L2_CSNP: - if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE)) { - ND_PRINT((ndo, ", bogus fixed header length %u should be %lu", - isis_header->fixed_len, (unsigned long)(ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE))); + if (fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE)) { + ND_PRINT(", bogus fixed header length %u should be %lu", + fixed_len, (unsigned long)(ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE)); return (0); } - ND_TCHECK(*header_csnp); + ND_TCHECK_SIZE(header_csnp); if (length < ISIS_COMMON_HEADER_SIZE+ISIS_CSNP_HEADER_SIZE) goto trunc; if (ndo->ndo_vflag == 0) { - ND_PRINT((ndo, ", src-id %s", isis_print_id(header_csnp->source_id, NODE_ID_LEN))); - ND_PRINT((ndo, ", length %u", length)); + ND_PRINT(", src-id %s", isis_print_id(header_csnp->source_id, NODE_ID_LEN)); + ND_PRINT(", length %u", length); return (1); } pdu_len=EXTRACT_BE_U_2(header_csnp->pdu_len); @@ -2496,13 +2573,13 @@ isis_print(netdissect_options *ndo, length=pdu_len; } - ND_PRINT((ndo, "\n\t source-id: %s, PDU length: %u", + ND_PRINT("\n\t source-id: %s, PDU length: %u", isis_print_id(header_csnp->source_id, NODE_ID_LEN), - pdu_len)); - ND_PRINT((ndo, "\n\t start lsp-id: %s", - isis_print_id(header_csnp->start_lsp_id, LSP_ID_LEN))); - ND_PRINT((ndo, "\n\t end lsp-id: %s", - isis_print_id(header_csnp->end_lsp_id, LSP_ID_LEN))); + pdu_len); + ND_PRINT("\n\t start lsp-id: %s", + isis_print_id(header_csnp->start_lsp_id, LSP_ID_LEN)); + ND_PRINT("\n\t end lsp-id: %s", + isis_print_id(header_csnp->end_lsp_id, LSP_ID_LEN)); if (ndo->ndo_vflag > 1) { if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_CSNP_HEADER_SIZE)) @@ -2515,17 +2592,17 @@ isis_print(netdissect_options *ndo, case ISIS_PDU_L1_PSNP: case ISIS_PDU_L2_PSNP: - if (isis_header->fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE)) { - ND_PRINT((ndo, "- bogus fixed header length %u should be %lu", - isis_header->fixed_len, (unsigned long)(ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE))); + if (fixed_len != (ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE)) { + ND_PRINT("- bogus fixed header length %u should be %lu", + fixed_len, (unsigned long)(ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE)); return (0); } - ND_TCHECK(*header_psnp); + ND_TCHECK_SIZE(header_psnp); if (length < ISIS_COMMON_HEADER_SIZE+ISIS_PSNP_HEADER_SIZE) goto trunc; if (ndo->ndo_vflag == 0) { - ND_PRINT((ndo, ", src-id %s", isis_print_id(header_psnp->source_id, NODE_ID_LEN))); - ND_PRINT((ndo, ", length %u", length)); + ND_PRINT(", src-id %s", isis_print_id(header_psnp->source_id, NODE_ID_LEN)); + ND_PRINT(", length %u", length); return (1); } pdu_len=EXTRACT_BE_U_2(header_psnp->pdu_len); @@ -2534,9 +2611,9 @@ isis_print(netdissect_options *ndo, length=pdu_len; } - ND_PRINT((ndo, "\n\t source-id: %s, PDU length: %u", + ND_PRINT("\n\t source-id: %s, PDU length: %u", isis_print_id(header_psnp->source_id, NODE_ID_LEN), - pdu_len)); + pdu_len); if (ndo->ndo_vflag > 1) { if (!print_unknown_data(ndo, pptr, "\n\t ", ISIS_PSNP_HEADER_SIZE)) @@ -2549,7 +2626,7 @@ isis_print(netdissect_options *ndo, default: if (ndo->ndo_vflag == 0) { - ND_PRINT((ndo, ", length %u", length)); + ND_PRINT(", length %u", length); return (1); } (void)print_unknown_data(ndo, pptr, "\n\t ", length); @@ -2572,12 +2649,12 @@ isis_print(netdissect_options *ndo, tptr = pptr; /* first lets see if we know the TLVs name*/ - ND_PRINT((ndo, "\n\t %s TLV #%u, length: %u", + ND_PRINT("\n\t %s TLV #%u, length: %u", tok2str(isis_tlv_values, "unknown", tlv_type), tlv_type, - tlv_len)); + tlv_len); if (tlv_len == 0) /* something is invalid */ continue; @@ -2592,10 +2669,10 @@ isis_print(netdissect_options *ndo, alen = EXTRACT_U_1(tptr); tptr++; while (tmp && alen < tmp) { - ND_TCHECK2(*tptr, alen); - ND_PRINT((ndo, "\n\t Area address (length: %u): %s", + ND_TCHECK_LEN(tptr, alen); + ND_PRINT("\n\t Area address (length: %u): %s", alen, - isonsap_string(ndo, tptr, alen))); + isonsap_string(ndo, tptr, alen)); tptr += alen; tmp -= alen + 1; if (tmp==0) /* if this is the last area address do not attemt a boundary check */ @@ -2606,28 +2683,28 @@ isis_print(netdissect_options *ndo, } break; case ISIS_TLV_ISNEIGH: - while (tmp >= ETHER_ADDR_LEN) { - ND_TCHECK2(*tptr, ETHER_ADDR_LEN); - ND_PRINT((ndo, "\n\t SNPA: %s", isis_print_id(tptr, ETHER_ADDR_LEN))); - tmp -= ETHER_ADDR_LEN; - tptr += ETHER_ADDR_LEN; + while (tmp >= MAC_ADDR_LEN) { + ND_TCHECK_LEN(tptr, MAC_ADDR_LEN); + ND_PRINT("\n\t SNPA: %s", isis_print_id(tptr, MAC_ADDR_LEN)); + tmp -= MAC_ADDR_LEN; + tptr += MAC_ADDR_LEN; } break; case ISIS_TLV_ISNEIGH_VARLEN: if (!ND_TTEST_1(tptr) || tmp < 3) /* min. TLV length */ - goto trunctlv; + goto trunc; lan_alen = EXTRACT_U_1(tptr); /* LAN address length */ tptr++; if (lan_alen == 0) { - ND_PRINT((ndo, "\n\t LAN address length 0 bytes (invalid)")); + ND_PRINT("\n\t LAN address length 0 bytes (invalid)"); break; } tmp --; - ND_PRINT((ndo, "\n\t LAN address length %u bytes ", lan_alen)); + ND_PRINT("\n\t LAN address length %u bytes ", lan_alen); while (tmp >= lan_alen) { - ND_TCHECK2(*tptr, lan_alen); - ND_PRINT((ndo, "\n\t\tIS Neighbor: %s", isis_print_id(tptr, lan_alen))); + ND_TCHECK_LEN(tptr, lan_alen); + ND_PRINT("\n\t\tIS Neighbor: %s", isis_print_id(tptr, lan_alen)); tmp -= lan_alen; tptr +=lan_alen; } @@ -2639,13 +2716,13 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_MT_IS_REACH: mt_len = isis_print_mtid(ndo, tptr, "\n\t "); if (mt_len == 0) /* did something go wrong ? */ - goto trunctlv; + goto trunc; tptr+=mt_len; tmp-=mt_len; while (tmp >= 2+NODE_ID_LEN+3+1) { - ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t ", tlv_type); + ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t ", tlv_type, tmp); if (ext_is_len == 0) /* did something go wrong ? */ - goto trunctlv; + goto trunc; tmp-=ext_is_len; tptr+=ext_is_len; @@ -2654,9 +2731,9 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_IS_ALIAS_ID: while (tmp >= NODE_ID_LEN+1) { /* is it worth attempting a decode ? */ - ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t ", tlv_type); + ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t ", tlv_type, tmp); if (ext_is_len == 0) /* did something go wrong ? */ - goto trunctlv; + goto trunc; tmp-=ext_is_len; tptr+=ext_is_len; } @@ -2664,25 +2741,25 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_EXT_IS_REACH: while (tmp >= NODE_ID_LEN+3+1) { /* is it worth attempting a decode ? */ - ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t ", tlv_type); + ext_is_len = isis_print_ext_is_reach(ndo, tptr, "\n\t ", tlv_type, tmp); if (ext_is_len == 0) /* did something go wrong ? */ - goto trunctlv; + goto trunc; tmp-=ext_is_len; tptr+=ext_is_len; } break; case ISIS_TLV_IS_REACH: ND_TCHECK_1(tptr); /* check if there is one byte left to read out the virtual flag */ - ND_PRINT((ndo, "\n\t %s", + ND_PRINT("\n\t %s", tok2str(isis_is_reach_virtual_values, "bogus virtual flag 0x%02x", - EXTRACT_U_1(tptr)))); + EXTRACT_U_1(tptr))); tptr++; tlv_is_reach = (const struct isis_tlv_is_reach *)tptr; while (tmp >= sizeof(struct isis_tlv_is_reach)) { - ND_TCHECK(*tlv_is_reach); - ND_PRINT((ndo, "\n\t IS Neighbor: %s", - isis_print_id(tlv_is_reach->neighbor_nodeid, NODE_ID_LEN))); + ND_TCHECK_SIZE(tlv_is_reach); + ND_PRINT("\n\t IS Neighbor: %s", + isis_print_id(tlv_is_reach->neighbor_nodeid, NODE_ID_LEN)); isis_print_metric_block(ndo, &tlv_is_reach->isis_metric_block); tmp -= sizeof(struct isis_tlv_is_reach); tlv_is_reach++; @@ -2692,9 +2769,9 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_ESNEIGH: tlv_es_reach = (const struct isis_tlv_es_reach *)tptr; while (tmp >= sizeof(struct isis_tlv_es_reach)) { - ND_TCHECK(*tlv_es_reach); - ND_PRINT((ndo, "\n\t ES Neighbor: %s", - isis_print_id(tlv_es_reach->neighbor_sysid, SYSTEM_ID_LEN))); + ND_TCHECK_SIZE(tlv_es_reach); + ND_PRINT("\n\t ES Neighbor: %s", + isis_print_id(tlv_es_reach->neighbor_sysid, SYSTEM_ID_LEN)); isis_print_metric_block(ndo, &tlv_es_reach->isis_metric_block); tmp -= sizeof(struct isis_tlv_es_reach); tlv_es_reach++; @@ -2712,7 +2789,7 @@ isis_print(netdissect_options *ndo, while (tmp>0) { ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t ", AF_INET); if (ext_ip_len == 0) /* did something go wrong ? */ - goto trunctlv; + goto trunc; tptr+=ext_ip_len; tmp-=ext_ip_len; } @@ -2721,7 +2798,7 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_MT_IP_REACH: mt_len = isis_print_mtid(ndo, tptr, "\n\t "); if (mt_len == 0) { /* did something go wrong ? */ - goto trunctlv; + goto trunc; } tptr+=mt_len; tmp-=mt_len; @@ -2729,7 +2806,7 @@ isis_print(netdissect_options *ndo, while (tmp>0) { ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t ", AF_INET); if (ext_ip_len == 0) /* did something go wrong ? */ - goto trunctlv; + goto trunc; tptr+=ext_ip_len; tmp-=ext_ip_len; } @@ -2739,7 +2816,7 @@ isis_print(netdissect_options *ndo, while (tmp>0) { ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t ", AF_INET6); if (ext_ip_len == 0) /* did something go wrong ? */ - goto trunctlv; + goto trunc; tptr+=ext_ip_len; tmp-=ext_ip_len; } @@ -2748,7 +2825,7 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_MT_IP6_REACH: mt_len = isis_print_mtid(ndo, tptr, "\n\t "); if (mt_len == 0) { /* did something go wrong ? */ - goto trunctlv; + goto trunc; } tptr+=mt_len; tmp-=mt_len; @@ -2756,57 +2833,57 @@ isis_print(netdissect_options *ndo, while (tmp>0) { ext_ip_len = isis_print_extd_ip_reach(ndo, tptr, "\n\t ", AF_INET6); if (ext_ip_len == 0) /* did something go wrong ? */ - goto trunctlv; + goto trunc; tptr+=ext_ip_len; tmp-=ext_ip_len; } break; case ISIS_TLV_IP6ADDR: - while (tmp>=sizeof(struct in6_addr)) { - ND_TCHECK2(*tptr, sizeof(struct in6_addr)); + while (tmp>=sizeof(nd_ipv6)) { + ND_TCHECK_LEN(tptr, sizeof(nd_ipv6)); - ND_PRINT((ndo, "\n\t IPv6 interface address: %s", - ip6addr_string(ndo, tptr))); + ND_PRINT("\n\t IPv6 interface address: %s", + ip6addr_string(ndo, tptr)); - tptr += sizeof(struct in6_addr); - tmp -= sizeof(struct in6_addr); + tptr += sizeof(nd_ipv6); + tmp -= sizeof(nd_ipv6); } break; case ISIS_TLV_AUTH: ND_TCHECK_1(tptr); - ND_PRINT((ndo, "\n\t %s: ", + ND_PRINT("\n\t %s: ", tok2str(isis_subtlv_auth_values, "unknown Authentication type 0x%02x", - EXTRACT_U_1(tptr)))); + EXTRACT_U_1(tptr))); switch (EXTRACT_U_1(tptr)) { case ISIS_SUBTLV_AUTH_SIMPLE: - if (fn_printzp(ndo, tptr + 1, tlv_len - 1, ndo->ndo_snapend)) - goto trunctlv; + if (nd_printzp(ndo, tptr + 1, tlv_len - 1, ndo->ndo_snapend)) + goto trunc; break; case ISIS_SUBTLV_AUTH_MD5: for(i=1;i=1) { ND_TCHECK_1(tptr); - ND_PRINT((ndo, "\n\t Adjacency State: %s (%u)", + ND_PRINT("\n\t Adjacency State: %s (%u)", tok2str(isis_ptp_adjancey_values, "unknown", EXTRACT_U_1(tptr)), - EXTRACT_U_1(tptr))); + EXTRACT_U_1(tptr)); tmp--; } if(tmp>sizeof(tlv_ptp_adj->extd_local_circuit_id)) { - ND_TCHECK(tlv_ptp_adj->extd_local_circuit_id); - ND_PRINT((ndo, "\n\t Extended Local circuit-ID: 0x%08x", - EXTRACT_BE_U_4(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", + EXTRACT_BE_U_4(tlv_ptp_adj->extd_local_circuit_id)); tmp-=sizeof(tlv_ptp_adj->extd_local_circuit_id); } if(tmp>=SYSTEM_ID_LEN) { - ND_TCHECK2(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN); - ND_PRINT((ndo, "\n\t Neighbor System-ID: %s", - isis_print_id(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN))); + ND_TCHECK_LEN(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN); + ND_PRINT("\n\t Neighbor System-ID: %s", + isis_print_id(tlv_ptp_adj->neighbor_sysid, SYSTEM_ID_LEN)); tmp-=SYSTEM_ID_LEN; } if(tmp>=sizeof(tlv_ptp_adj->neighbor_extd_local_circuit_id)) { - ND_TCHECK(tlv_ptp_adj->neighbor_extd_local_circuit_id); - ND_PRINT((ndo, "\n\t Neighbor Extended Local circuit-ID: 0x%08x", - EXTRACT_BE_U_4(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", + EXTRACT_BE_U_4(tlv_ptp_adj->neighbor_extd_local_circuit_id)); } break; case ISIS_TLV_PROTOCOLS: - ND_PRINT((ndo, "\n\t NLPID(s): ")); + ND_PRINT("\n\t NLPID(s): "); while (tmp>0) { ND_TCHECK_1(tptr); - ND_PRINT((ndo, "%s (0x%02x)", + ND_PRINT("%s (0x%02x)", tok2str(nlpid_values, "unknown", EXTRACT_U_1(tptr)), - EXTRACT_U_1(tptr))); + EXTRACT_U_1(tptr)); if (tmp>1) /* further NPLIDs ? - put comma */ - ND_PRINT((ndo, ", ")); + ND_PRINT(", "); tptr++; tmp--; } @@ -2865,9 +2942,9 @@ isis_print(netdissect_options *ndo, { ND_TCHECK_2(tptr); - ND_PRINT((ndo, "\n\t RES: %d, MTID(s): %d", + ND_PRINT("\n\t RES: %u, MTID(s): %u", (EXTRACT_BE_U_2(tptr) >> 12), - (EXTRACT_BE_U_2(tptr) & 0x0fff))); + (EXTRACT_BE_U_2(tptr) & 0x0fff)); tmp = tmp-2; tptr = tptr+2; @@ -2882,10 +2959,10 @@ isis_print(netdissect_options *ndo, ND_TCHECK_2(tptr); - ND_PRINT((ndo, "\n\t O: %d, RES: %d, MTID(s): %d", + ND_PRINT("\n\t O: %u, RES: %u, MTID(s): %u", (EXTRACT_BE_U_2(tptr) >> 15) & 0x01, (EXTRACT_BE_U_2(tptr) >> 12) & 0x07, - EXTRACT_BE_U_2(tptr) & 0x0fff)); + EXTRACT_BE_U_2(tptr) & 0x0fff); tmp = tmp-2; tptr = tptr+2; @@ -2896,57 +2973,57 @@ isis_print(netdissect_options *ndo, break; case ISIS_TLV_TE_ROUTER_ID: - ND_TCHECK2(*pptr, sizeof(struct in_addr)); - ND_PRINT((ndo, "\n\t Traffic Engineering Router ID: %s", ipaddr_string(ndo, pptr))); + ND_TCHECK_LEN(pptr, sizeof(nd_ipv4)); + ND_PRINT("\n\t Traffic Engineering Router ID: %s", ipaddr_string(ndo, pptr)); break; case ISIS_TLV_IPADDR: - while (tmp>=sizeof(struct in_addr)) { - ND_TCHECK2(*tptr, sizeof(struct in_addr)); - ND_PRINT((ndo, "\n\t IPv4 interface address: %s", ipaddr_string(ndo, tptr))); - tptr += sizeof(struct in_addr); - tmp -= sizeof(struct in_addr); + while (tmp>=sizeof(nd_ipv4)) { + ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); + ND_PRINT("\n\t IPv4 interface address: %s", ipaddr_string(ndo, tptr)); + tptr += sizeof(nd_ipv4); + tmp -= sizeof(nd_ipv4); } break; case ISIS_TLV_HOSTNAME: - ND_PRINT((ndo, "\n\t Hostname: ")); - if (fn_printzp(ndo, tptr, tmp, ndo->ndo_snapend)) - goto trunctlv; + ND_PRINT("\n\t Hostname: "); + if (nd_printzp(ndo, tptr, tmp, ndo->ndo_snapend)) + goto trunc; break; case ISIS_TLV_SHARED_RISK_GROUP: if (tmp < NODE_ID_LEN) break; - ND_TCHECK2(*tptr, NODE_ID_LEN); - ND_PRINT((ndo, "\n\t IS Neighbor: %s", isis_print_id(tptr, NODE_ID_LEN))); + ND_TCHECK_LEN(tptr, NODE_ID_LEN); + ND_PRINT("\n\t IS Neighbor: %s", isis_print_id(tptr, NODE_ID_LEN)); tptr+=NODE_ID_LEN; tmp-=NODE_ID_LEN; if (tmp < 1) break; ND_TCHECK_1(tptr); - ND_PRINT((ndo, ", Flags: [%s]", ISIS_MASK_TLV_SHARED_RISK_GROUP(EXTRACT_U_1(tptr)) ? "numbered" : "unnumbered")); + ND_PRINT(", Flags: [%s]", ISIS_MASK_TLV_SHARED_RISK_GROUP(EXTRACT_U_1(tptr)) ? "numbered" : "unnumbered"); tptr++; tmp--; - if (tmp < sizeof(struct in_addr)) + if (tmp < sizeof(nd_ipv4)) break; - ND_TCHECK2(*tptr, sizeof(struct in_addr)); - ND_PRINT((ndo, "\n\t IPv4 interface address: %s", ipaddr_string(ndo, tptr))); - tptr+=sizeof(struct in_addr); - tmp-=sizeof(struct in_addr); + ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); + ND_PRINT("\n\t IPv4 interface address: %s", ipaddr_string(ndo, tptr)); + tptr+=sizeof(nd_ipv4); + tmp-=sizeof(nd_ipv4); - if (tmp < sizeof(struct in_addr)) + if (tmp < sizeof(nd_ipv4)) break; - ND_TCHECK2(*tptr, sizeof(struct in_addr)); - ND_PRINT((ndo, "\n\t IPv4 neighbor address: %s", ipaddr_string(ndo, tptr))); - tptr+=sizeof(struct in_addr); - tmp-=sizeof(struct in_addr); + ND_TCHECK_LEN(tptr, sizeof(nd_ipv4)); + ND_PRINT("\n\t IPv4 neighbor address: %s", ipaddr_string(ndo, tptr)); + tptr+=sizeof(nd_ipv4); + tmp-=sizeof(nd_ipv4); while (tmp>=4) { ND_TCHECK_4(tptr); - ND_PRINT((ndo, "\n\t Link-ID: 0x%08x", EXTRACT_BE_U_4(tptr))); + ND_PRINT("\n\t Link-ID: 0x%08x", EXTRACT_BE_U_4(tptr)); tptr+=4; tmp-=4; } @@ -2955,15 +3032,15 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_LSP: tlv_lsp = (const struct isis_tlv_lsp *)tptr; while(tmp>=sizeof(struct isis_tlv_lsp)) { - ND_TCHECK((tlv_lsp->lsp_id)[LSP_ID_LEN-1]); - ND_PRINT((ndo, "\n\t lsp-id: %s", - isis_print_id(tlv_lsp->lsp_id, LSP_ID_LEN))); - ND_TCHECK2(tlv_lsp->sequence_number, 4); - ND_PRINT((ndo, ", seq: 0x%08x", EXTRACT_BE_U_4(tlv_lsp->sequence_number))); - ND_TCHECK2(tlv_lsp->remaining_lifetime, 2); - ND_PRINT((ndo, ", lifetime: %5ds", EXTRACT_BE_U_2(tlv_lsp->remaining_lifetime))); - ND_TCHECK2(tlv_lsp->checksum, 2); - ND_PRINT((ndo, ", chksum: 0x%04x", EXTRACT_BE_U_2(tlv_lsp->checksum))); + ND_TCHECK_1(tlv_lsp->lsp_id + LSP_ID_LEN - 1); + ND_PRINT("\n\t lsp-id: %s", + isis_print_id(tlv_lsp->lsp_id, LSP_ID_LEN)); + ND_TCHECK_4(tlv_lsp->sequence_number); + ND_PRINT(", seq: 0x%08x", EXTRACT_BE_U_4(tlv_lsp->sequence_number)); + ND_TCHECK_2(tlv_lsp->remaining_lifetime); + ND_PRINT(", lifetime: %5ds", EXTRACT_BE_U_2(tlv_lsp->remaining_lifetime)); + ND_TCHECK_2(tlv_lsp->checksum); + ND_PRINT(", chksum: 0x%04x", EXTRACT_BE_U_2(tlv_lsp->checksum)); tmp-=sizeof(struct isis_tlv_lsp); tlv_lsp++; } @@ -2972,8 +3049,8 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_CHECKSUM: if (tmp < ISIS_TLV_CHECKSUM_MINLEN) break; - ND_TCHECK2(*tptr, ISIS_TLV_CHECKSUM_MINLEN); - ND_PRINT((ndo, "\n\t checksum: 0x%04x ", EXTRACT_BE_U_2(tptr))); + ND_TCHECK_LEN(tptr, ISIS_TLV_CHECKSUM_MINLEN); + ND_PRINT("\n\t checksum: 0x%04x ", EXTRACT_BE_U_2(tptr)); /* do not attempt to verify the checksum if it is zero * most likely a HMAC-MD5 TLV is also present and * to avoid conflicts the checksum TLV is zeroed. @@ -2985,15 +3062,15 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_POI: if (tlv_len >= SYSTEM_ID_LEN + 1) { - ND_TCHECK2(*tptr, SYSTEM_ID_LEN + 1); - ND_PRINT((ndo, "\n\t Purge Originator System-ID: %s", - isis_print_id(tptr + 1, SYSTEM_ID_LEN))); + ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN + 1); + ND_PRINT("\n\t Purge Originator System-ID: %s", + isis_print_id(tptr + 1, SYSTEM_ID_LEN)); } if (tlv_len == 2 * SYSTEM_ID_LEN + 1) { - ND_TCHECK2(*tptr, 2 * SYSTEM_ID_LEN + 1); - ND_PRINT((ndo, "\n\t Received from System-ID: %s", - isis_print_id(tptr + SYSTEM_ID_LEN + 1, SYSTEM_ID_LEN))); + ND_TCHECK_LEN(tptr, 2 * SYSTEM_ID_LEN + 1); + ND_PRINT("\n\t Received from System-ID: %s", + isis_print_id(tptr + SYSTEM_ID_LEN + 1, SYSTEM_ID_LEN)); } break; @@ -3006,11 +3083,11 @@ isis_print(netdissect_options *ndo, if (tmp!=1) { mt_len = isis_print_mtid(ndo, tptr, "\n\t "); if (mt_len == 0) /* did something go wrong ? */ - goto trunctlv; + goto trunc; tptr+=mt_len; tmp-=mt_len; } else { - ND_PRINT((ndo, "\n\t invalid MT-ID")); + ND_PRINT("\n\t invalid MT-ID"); break; } } @@ -3020,9 +3097,9 @@ isis_print(netdissect_options *ndo, /* first attempt to decode the flags */ if (tmp < ISIS_TLV_RESTART_SIGNALING_FLAGLEN) break; - ND_TCHECK2(*tptr, ISIS_TLV_RESTART_SIGNALING_FLAGLEN); - ND_PRINT((ndo, "\n\t Flags [%s]", - bittok2str(isis_restart_flag_values, "none", EXTRACT_U_1(tptr)))); + ND_TCHECK_LEN(tptr, ISIS_TLV_RESTART_SIGNALING_FLAGLEN); + ND_PRINT("\n\t Flags [%s]", + bittok2str(isis_restart_flag_values, "none", EXTRACT_U_1(tptr))); tptr+=ISIS_TLV_RESTART_SIGNALING_FLAGLEN; tmp-=ISIS_TLV_RESTART_SIGNALING_FLAGLEN; @@ -3032,33 +3109,33 @@ isis_print(netdissect_options *ndo, if (tmp < ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN) break; - ND_TCHECK2(*tptr, ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN); + ND_TCHECK_LEN(tptr, ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN); - ND_PRINT((ndo, ", Remaining holding time %us", EXTRACT_BE_U_2(tptr))); + ND_PRINT(", Remaining holding time %us", EXTRACT_BE_U_2(tptr)); tptr+=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN; tmp-=ISIS_TLV_RESTART_SIGNALING_HOLDTIMELEN; /* is there an additional sysid field present ?*/ if (tmp == SYSTEM_ID_LEN) { - ND_TCHECK2(*tptr, SYSTEM_ID_LEN); - ND_PRINT((ndo, ", for %s", isis_print_id(tptr,SYSTEM_ID_LEN))); + ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN); + ND_PRINT(", for %s", isis_print_id(tptr,SYSTEM_ID_LEN)); } break; case ISIS_TLV_IDRP_INFO: if (tmp < ISIS_TLV_IDRP_INFO_MINLEN) break; - ND_TCHECK2(*tptr, ISIS_TLV_IDRP_INFO_MINLEN); - ND_PRINT((ndo, "\n\t Inter-Domain Information Type: %s", + ND_TCHECK_LEN(tptr, ISIS_TLV_IDRP_INFO_MINLEN); + ND_PRINT("\n\t Inter-Domain Information Type: %s", tok2str(isis_subtlv_idrp_values, "Unknown (0x%02x)", - EXTRACT_U_1(tptr)))); + EXTRACT_U_1(tptr))); isis_subtlv_idrp = EXTRACT_U_1(tptr); tptr++; switch (isis_subtlv_idrp) { case ISIS_SUBTLV_IDRP_ASN: ND_TCHECK_2(tptr); /* fetch AS number */ - ND_PRINT((ndo, "AS Number: %u", EXTRACT_BE_U_2(tptr))); + ND_PRINT("AS Number: %u", EXTRACT_BE_U_2(tptr)); break; case ISIS_SUBTLV_IDRP_LOCAL: case ISIS_SUBTLV_IDRP_RES: @@ -3072,14 +3149,14 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_LSP_BUFFERSIZE: if (tmp < ISIS_TLV_LSP_BUFFERSIZE_MINLEN) break; - ND_TCHECK2(*tptr, ISIS_TLV_LSP_BUFFERSIZE_MINLEN); - ND_PRINT((ndo, "\n\t LSP Buffersize: %u", EXTRACT_BE_U_2(tptr))); + ND_TCHECK_LEN(tptr, ISIS_TLV_LSP_BUFFERSIZE_MINLEN); + ND_PRINT("\n\t LSP Buffersize: %u", EXTRACT_BE_U_2(tptr)); break; case ISIS_TLV_PART_DIS: while (tmp >= SYSTEM_ID_LEN) { - ND_TCHECK2(*tptr, SYSTEM_ID_LEN); - ND_PRINT((ndo, "\n\t %s", isis_print_id(tptr, SYSTEM_ID_LEN))); + ND_TCHECK_LEN(tptr, SYSTEM_ID_LEN); + ND_PRINT("\n\t %s", isis_print_id(tptr, SYSTEM_ID_LEN)); tptr+=SYSTEM_ID_LEN; tmp-=SYSTEM_ID_LEN; } @@ -3088,8 +3165,8 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_PREFIX_NEIGH: if (tmp < sizeof(struct isis_metric_block)) break; - ND_TCHECK2(*tptr, sizeof(struct isis_metric_block)); - ND_PRINT((ndo, "\n\t Metric Block")); + ND_TCHECK_LEN(tptr, sizeof(struct isis_metric_block)); + ND_PRINT("\n\t Metric Block"); isis_print_metric_block(ndo, (const struct isis_metric_block *)tptr); tptr+=sizeof(struct isis_metric_block); tmp-=sizeof(struct isis_metric_block); @@ -3099,15 +3176,15 @@ isis_print(netdissect_options *ndo, prefix_len=EXTRACT_U_1(tptr); /* read out prefix length in semioctets*/ tptr++; if (prefix_len < 2) { - ND_PRINT((ndo, "\n\t\tAddress: prefix length %u < 2", prefix_len)); + ND_PRINT("\n\t\tAddress: prefix length %u < 2", prefix_len); break; } tmp--; if (tmp < prefix_len/2) break; - ND_TCHECK2(*tptr, prefix_len / 2); - ND_PRINT((ndo, "\n\t\tAddress: %s/%u", - isonsap_string(ndo, tptr, prefix_len / 2), prefix_len * 4)); + ND_TCHECK_LEN(tptr, prefix_len / 2); + ND_PRINT("\n\t\tAddress: %s/%u", + isonsap_string(ndo, tptr, prefix_len / 2), prefix_len * 4); tptr+=prefix_len/2; tmp-=prefix_len/2; } @@ -3116,18 +3193,18 @@ isis_print(netdissect_options *ndo, case ISIS_TLV_IIH_SEQNR: if (tmp < ISIS_TLV_IIH_SEQNR_MINLEN) break; - ND_TCHECK2(*tptr, ISIS_TLV_IIH_SEQNR_MINLEN); /* check if four bytes are on the wire */ - ND_PRINT((ndo, "\n\t Sequence number: %u", EXTRACT_BE_U_4(tptr))); + ND_TCHECK_LEN(tptr, ISIS_TLV_IIH_SEQNR_MINLEN); /* check if four bytes are on the wire */ + ND_PRINT("\n\t Sequence number: %u", EXTRACT_BE_U_4(tptr)); break; case ISIS_TLV_VENDOR_PRIVATE: if (tmp < ISIS_TLV_VENDOR_PRIVATE_MINLEN) break; - ND_TCHECK2(*tptr, ISIS_TLV_VENDOR_PRIVATE_MINLEN); /* check if enough byte for a full oui */ + ND_TCHECK_LEN(tptr, ISIS_TLV_VENDOR_PRIVATE_MINLEN); /* check if enough byte for a full oui */ vendor_id = EXTRACT_BE_U_3(tptr); - ND_PRINT((ndo, "\n\t Vendor: %s (%u)", + ND_PRINT("\n\t Vendor: %s (%u)", tok2str(oui_values, "Unknown", vendor_id), - vendor_id)); + vendor_id); tptr+=3; tmp-=3; if (tmp > 0) /* hexdump the rest */ @@ -3163,18 +3240,13 @@ isis_print(netdissect_options *ndo, } if (packet_len != 0) { - ND_PRINT((ndo, "\n\t %u straggler bytes", packet_len)); + ND_PRINT("\n\t %u straggler bytes", packet_len); } return (1); - trunc: - ND_PRINT((ndo, "%s", tstr)); +trunc: + nd_print_trunc(ndo); return (1); - - trunctlv: - ND_PRINT((ndo, "\n\t\t")); - ND_PRINT((ndo, "%s", tstr)); - return(1); } static void @@ -3191,24 +3263,17 @@ osi_print_cksum(netdissect_options *ndo, const uint8_t *pptr, || checksum_offset < 0 || !ND_TTEST_2(pptr + checksum_offset) || (u_int)checksum_offset > length - || !ND_TTEST2(*pptr, length)) { - ND_PRINT((ndo, " (unverified)")); + || !ND_TTEST_LEN(pptr, length)) { + ND_PRINT(" (unverified)"); } else { #if 0 printf("\nosi_print_cksum: %p %u %u\n", pptr, checksum_offset, length); #endif calculated_checksum = create_osi_cksum(pptr, checksum_offset, length); if (checksum == calculated_checksum) { - ND_PRINT((ndo, " (correct)")); + ND_PRINT(" (correct)"); } else { - ND_PRINT((ndo, " (incorrect should be 0x%04x)", calculated_checksum)); + ND_PRINT(" (incorrect should be 0x%04x)", calculated_checksum); } } } - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */