X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/a3ad5bb4dc11b7af43f8d3a6225049524e479eef..refs/heads/coverity_scan:/print-ospf.c diff --git a/print-ospf.c b/print-ospf.c index 7d357800..38f44745 100644 --- a/print-ospf.c +++ b/print-ospf.c @@ -23,9 +23,7 @@ /* \summary: Open Shortest Path First (OSPF) printer */ -#ifdef HAVE_CONFIG_H #include -#endif #include "netdissect-stdinc.h" @@ -36,13 +34,12 @@ #include "ospf.h" - static const struct tok ospf_option_values[] = { - { OSPF_OPTION_T, "MultiTopology" }, /* draft-ietf-ospf-mt-09 */ + { OSPF_OPTION_MT, "MultiTopology" }, /* draft-ietf-ospf-mt-09 */ { OSPF_OPTION_E, "External" }, { OSPF_OPTION_MC, "Multicast" }, { OSPF_OPTION_NP, "NSSA" }, - { OSPF_OPTION_L, "LLS" }, + { OSPF_OPTION_L, "LLS" }, { OSPF_OPTION_DC, "Demand Circuit" }, { OSPF_OPTION_O, "Opaque" }, { OSPF_OPTION_DN, "Up/Down" }, @@ -59,8 +56,10 @@ static const struct tok ospf_authtype_values[] = { static const struct tok ospf_rla_flag_values[] = { { RLA_FLAG_B, "ABR" }, { RLA_FLAG_E, "ASBR" }, - { RLA_FLAG_W1, "Virtual" }, - { RLA_FLAG_W2, "W2" }, + { RLA_FLAG_V, "Virtual" }, + { RLA_FLAG_W, "Wildcard" }, + { RLA_FLAG_NT, "Nt" }, + { RLA_FLAG_H, "Host" }, { 0, NULL } }; @@ -99,15 +98,56 @@ static const struct tok lsa_opaque_values[] = { { LS_OPAQUE_TYPE_TE, "Traffic Engineering" }, { LS_OPAQUE_TYPE_GRACE, "Graceful restart" }, { LS_OPAQUE_TYPE_RI, "Router Information" }, + { LS_OPAQUE_TYPE_EP, "Extended Prefix" }, + { LS_OPAQUE_TYPE_EL, "Extended Link" }, { 0, NULL } }; +static const struct tok lsa_opaque_ri_sid_subtlv_values[] = { + { LS_OPAQUE_RI_SUBTLV_SID_LABEL, "SID/Label" }, + { 0, NULL } +}; + static const struct tok lsa_opaque_te_tlv_values[] = { { LS_OPAQUE_TE_TLV_ROUTER, "Router Address" }, { LS_OPAQUE_TE_TLV_LINK, "Link" }, { 0, NULL } }; +static const struct tok lsa_opaque_ep_extd_prefix_subtlv_values[] = { + { LS_OPAQUE_EP_SUBTLV_PREFIX_SID, "Prefix-SID" }, + { 0, NULL } +}; + +static const struct tok ep_range_tlv_prefix_sid_subtlv_flag_values[] = { + { 0x40, "No-PHP"}, + { 0x20, "Mapping-Server"}, + { 0x10, "Explicit-NULL"}, + { 0x08, "Value"}, + { 0x04, "Local"}, + { 0, NULL} +}; + +static const struct tok lsa_opaque_ep_route_type_values[] = { + { 0, "Unspecified" }, + { 1, "Intra-Area" }, + { 3, "Inter-Area" }, + { 5, "AS External" }, + { 7, "NSSA External" }, + { 0, NULL } +}; + +static const struct tok lsa_opaque_ep_tlv_values[] = { + { LS_OPAQUE_EP_EXTD_PREFIX_TLV, "Extended Prefix" }, + { LS_OPAQUE_EP_EXTD_PREFIX_RANGE_TLV, "Extended Prefix Range" }, + { 0, NULL } +}; + +static const struct tok ep_tlv_flag_values[] = { + { 0x80, "Inter-Area"}, + { 0, NULL} +}; + static const struct tok lsa_opaque_te_link_tlv_subtlv_values[] = { { LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE, "Link Type" }, { LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID, "Link ID" }, @@ -149,6 +189,11 @@ static const struct tok lsa_opaque_te_tlv_link_type_sub_tlv_values[] = { static const struct tok lsa_opaque_ri_tlv_values[] = { { LS_OPAQUE_RI_TLV_CAP, "Router Capabilities" }, + { LS_OPAQUE_RI_TLV_SR_ALGO, "SR-Algorithm" }, + { LS_OPAQUE_RI_TLV_HOSTNAME, "Hostname" }, + { LS_OPAQUE_RI_TLV_SID_LABEL_RANGE, "SID/Label Range" }, + { LS_OPAQUE_RI_TLV_SR_LOCAL_BLOCK, "SR Local Block" }, + { LS_OPAQUE_RI_TLV_SRMS_PREFERENCE, "SRMS Preference" }, { 0, NULL } }; @@ -166,6 +211,12 @@ static const struct tok lsa_opaque_ri_tlv_cap_values[] = { { 0, NULL } }; +static const struct tok lsa_opaque_ri_tlv_sr_algos[] = { + { 0, "Shortest Path First" }, + { 1, "Strict Shortest Path First" }, + { 0, NULL } +}; + static const struct tok ospf_lls_tlv_values[] = { { OSPF_LLS_EO, "Extended Options" }, { OSPF_LLS_MD5, "MD5 Authentication" }, @@ -184,8 +235,7 @@ ospf_grace_lsa_print(netdissect_options *ndo, { u_int tlv_type, tlv_length; - - while (ls_length > 0) { + while (ls_length != 0) { ND_TCHECK_4(tptr); if (ls_length < 4) { ND_PRINT("\n\t Remaining LS length %u < 4", ls_length); @@ -209,6 +259,7 @@ ospf_grace_lsa_print(netdissect_options *ndo, /* Infinite loop protection. */ if (tlv_type == 0 || tlv_length ==0) { + nd_print_invalid(ndo); return -1; } @@ -250,14 +301,213 @@ ospf_grace_lsa_print(netdissect_options *ndo, } /* in OSPF everything has to be 32-bit aligned, including TLVs */ - if (tlv_length%4 != 0) + if (tlv_length%4 != 0) { tlv_length+=4-(tlv_length%4); + if (tlv_length > ls_length) { + ND_PRINT("\n\t Bogus padded length %u > %u", tlv_length, + ls_length); + return -1; + } + } ls_length-=tlv_length; tptr+=tlv_length; } return 0; trunc: + nd_print_trunc(ndo); + return -1; +} + +static int +ospf_te_tlv_link_print(netdissect_options *ndo, + const u_char *tptr, u_int tlv_length) +{ + u_int subtlv_type, subtlv_length; + u_int priority_level, te_class, count_srlg; + + while (tlv_length != 0) { + if (tlv_length < 4) { + ND_PRINT("\n\t Remaining TLV length %u < 4", + tlv_length); + return -1; + } + subtlv_type = GET_BE_U_2(tptr); + subtlv_length = GET_BE_U_2(tptr + 2); + tptr+=4; + tlv_length-=4; + + /* Infinite loop protection */ + if (subtlv_type == 0 || subtlv_length == 0) + goto invalid; + + ND_PRINT("\n\t %s subTLV (%u), length: %u", + tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type), + subtlv_type, + subtlv_length); + + if (tlv_length < subtlv_length) { + ND_PRINT("\n\t Remaining TLV length %u < %u", + tlv_length, subtlv_length); + return -1; + } + ND_TCHECK_LEN(tptr, subtlv_length); + switch(subtlv_type) { + case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP: + if (subtlv_length != 4) { + ND_PRINT(" != 4"); + goto invalid; + } + ND_PRINT(", 0x%08x", GET_BE_U_4(tptr)); + break; + case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID: + case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID: + if (subtlv_length != 4 && subtlv_length != 8) { + ND_PRINT(" != 4 && != 8"); + goto invalid; + } + ND_PRINT(", %s (0x%08x)", + GET_IPADDR_STRING(tptr), + GET_BE_U_4(tptr)); + if (subtlv_length == 8) /* rfc4203 */ + ND_PRINT(", %s (0x%08x)", + GET_IPADDR_STRING(tptr+4), + GET_BE_U_4(tptr + 4)); + break; + case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP: + case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP: + if (subtlv_length != 4) { + ND_PRINT(" != 4"); + goto invalid; + } + ND_PRINT(", %s", GET_IPADDR_STRING(tptr)); + break; + case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW: + case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW: + if (subtlv_length != 4) { + ND_PRINT(" != 4"); + goto invalid; + } + ND_PRINT(", %.3f Mbps", GET_BE_F_4(tptr) * 8 / 1000000); + break; + case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW: + if (subtlv_length != 32) { + ND_PRINT(" != 32"); + goto invalid; + } + for (te_class = 0; te_class < 8; te_class++) { + ND_PRINT("\n\t\tTE-Class %u: %.3f Mbps", + te_class, + GET_BE_F_4(tptr + te_class * 4) * 8 / 1000000); + } + break; + case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS: + if (subtlv_length < 4) { + ND_PRINT(" < 4"); + goto invalid; + } + /* BC Model Id (1 octet) + Reserved (3 octets) */ + ND_PRINT("\n\t\tBandwidth Constraints Model ID: %s (%u)", + tok2str(diffserv_te_bc_values, "unknown", GET_U_1(tptr)), + GET_U_1(tptr)); + if (subtlv_length % 4 != 0) { + ND_PRINT("\n\t\tlength %u != N x 4", subtlv_length); + goto invalid; + } + if (subtlv_length > 36) { + ND_PRINT("\n\t\tlength %u > 36", subtlv_length); + goto invalid; + } + /* decode BCs until the subTLV ends */ + for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) { + ND_PRINT("\n\t\t Bandwidth constraint CT%u: %.3f Mbps", + te_class, + GET_BE_F_4(tptr + 4 + te_class * 4) * 8 / 1000000); + } + break; + case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC: + if (subtlv_length != 4) { + ND_PRINT(" != 4"); + goto invalid; + } + ND_PRINT(", Metric %u", GET_BE_U_4(tptr)); + break; + case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE: + /* Protection Cap (1 octet) + Reserved ((3 octets) */ + if (subtlv_length != 4) { + ND_PRINT(" != 4"); + goto invalid; + } + ND_PRINT(", %s", + bittok2str(gmpls_link_prot_values, "none", GET_U_1(tptr))); + break; + case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR: + if (subtlv_length < 36) { + ND_PRINT(" < 36"); + goto invalid; + } + /* Switching Cap (1 octet) + Encoding (1) + Reserved (2) */ + ND_PRINT("\n\t\tInterface Switching Capability: %s", + tok2str(gmpls_switch_cap_values, "Unknown", GET_U_1((tptr)))); + ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:", + tok2str(gmpls_encoding_values, "Unknown", GET_U_1((tptr + 1)))); + for (priority_level = 0; priority_level < 8; priority_level++) { + ND_PRINT("\n\t\t priority level %u: %.3f Mbps", + priority_level, + GET_BE_F_4(tptr + 4 + (priority_level * 4)) * 8 / 1000000); + } + break; + case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE: + if (subtlv_length != 1) { + ND_PRINT(" != 1"); + goto invalid; + } + ND_PRINT(", %s (%u)", + tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",GET_U_1(tptr)), + GET_U_1(tptr)); + break; + case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP: + if (subtlv_length % 4 != 0) { + ND_PRINT(" != N x 4"); + goto invalid; + } + count_srlg = subtlv_length / 4; + if (count_srlg != 0) + ND_PRINT("\n\t\t Shared risk group: "); + while (count_srlg != 0) { + ND_PRINT("%u", GET_BE_U_4(tptr)); + tptr+=4; + count_srlg--; + if (count_srlg > 0) + ND_PRINT(", "); + } + break; + default: + if (ndo->ndo_vflag <= 1) { + if (!print_unknown_data(ndo, tptr, "\n\t\t", subtlv_length)) + return -1; + } + break; + } + /* in OSPF everything has to be 32-bit aligned, including subTLVs */ + if (subtlv_length%4 != 0) { + subtlv_length+=4-(subtlv_length%4); + + if (tlv_length < subtlv_length) { + ND_PRINT("\n\t Remaining TLV length %u < %u", + tlv_length, subtlv_length); + return -1; + } + } + tlv_length-=subtlv_length; + tptr+=subtlv_length; + } + return 0; +trunc: + nd_print_trunc(ndo); + return -1; +invalid: + nd_print_invalid(ndo); return -1; } @@ -265,12 +515,7 @@ int ospf_te_lsa_print(netdissect_options *ndo, const u_char *tptr, u_int ls_length) { - u_int tlv_type, tlv_length, subtlv_type, subtlv_length; - u_int priority_level, te_class, count_srlg; - union { /* int to float conversion buffer for several subTLVs */ - float f; - uint32_t i; - } bw; + u_int tlv_type, tlv_length; while (ls_length != 0) { ND_TCHECK_4(tptr); @@ -291,231 +536,51 @@ ospf_te_lsa_print(netdissect_options *ndo, if (tlv_length > ls_length) { ND_PRINT("\n\t Bogus length %u > %u", tlv_length, ls_length); - return -1; + goto invalid; } /* Infinite loop protection. */ if (tlv_type == 0 || tlv_length ==0) { - return -1; + nd_print_invalid(ndo); + goto invalid; } switch(tlv_type) { case LS_OPAQUE_TE_TLV_LINK: - while (tlv_length != 0) { - if (tlv_length < 4) { - ND_PRINT("\n\t Remaining TLV length %u < 4", - tlv_length); - return -1; - } - ND_TCHECK_4(tptr); - subtlv_type = GET_BE_U_2(tptr); - subtlv_length = GET_BE_U_2(tptr + 2); - tptr+=4; - tlv_length-=4; - - /* Infinite loop protection */ - if (subtlv_type == 0 || subtlv_length == 0) - goto invalid; - - ND_PRINT("\n\t %s subTLV (%u), length: %u", - tok2str(lsa_opaque_te_link_tlv_subtlv_values,"unknown",subtlv_type), - subtlv_type, - subtlv_length); - - if (tlv_length < subtlv_length) { - ND_PRINT("\n\t Remaining TLV length %u < %u", - tlv_length + 4, subtlv_length + 4); - return -1; - } - ND_TCHECK_LEN(tptr, subtlv_length); - switch(subtlv_type) { - case LS_OPAQUE_TE_LINK_SUBTLV_ADMIN_GROUP: - if (subtlv_length != 4) { - ND_PRINT(" != 4"); - goto invalid; - } - ND_PRINT(", 0x%08x", GET_BE_U_4(tptr)); - break; - case LS_OPAQUE_TE_LINK_SUBTLV_LINK_ID: - case LS_OPAQUE_TE_LINK_SUBTLV_LINK_LOCAL_REMOTE_ID: - if (subtlv_length != 4 && subtlv_length != 8) { - ND_PRINT(" != 4 && != 8"); - goto invalid; - } - ND_PRINT(", %s (0x%08x)", - GET_IPADDR_STRING(tptr), - GET_BE_U_4(tptr)); - if (subtlv_length == 8) /* rfc4203 */ - ND_PRINT(", %s (0x%08x)", - GET_IPADDR_STRING(tptr+4), - GET_BE_U_4(tptr + 4)); - break; - case LS_OPAQUE_TE_LINK_SUBTLV_LOCAL_IP: - case LS_OPAQUE_TE_LINK_SUBTLV_REMOTE_IP: - if (subtlv_length != 4) { - ND_PRINT(" != 4"); - goto invalid; - } - ND_PRINT(", %s", GET_IPADDR_STRING(tptr)); - break; - case LS_OPAQUE_TE_LINK_SUBTLV_MAX_BW: - case LS_OPAQUE_TE_LINK_SUBTLV_MAX_RES_BW: - if (subtlv_length != 4) { - ND_PRINT(" != 4"); - goto invalid; - } - bw.i = GET_BE_U_4(tptr); - ND_PRINT(", %.3f Mbps", bw.f * 8 / 1000000); - break; - case LS_OPAQUE_TE_LINK_SUBTLV_UNRES_BW: - if (subtlv_length != 32) { - ND_PRINT(" != 32"); - goto invalid; - } - for (te_class = 0; te_class < 8; te_class++) { - bw.i = GET_BE_U_4(tptr + te_class * 4); - ND_PRINT("\n\t\tTE-Class %u: %.3f Mbps", - te_class, - bw.f * 8 / 1000000); - } - break; - case LS_OPAQUE_TE_LINK_SUBTLV_BW_CONSTRAINTS: - if (subtlv_length < 4) { - ND_PRINT(" < 4"); - goto invalid; - } - /* BC Model Id (1 octet) + Reserved (3 octets) */ - ND_PRINT("\n\t\tBandwidth Constraints Model ID: %s (%u)", - tok2str(diffserv_te_bc_values, "unknown", GET_U_1(tptr)), - GET_U_1(tptr)); - if (subtlv_length % 4 != 0) { - ND_PRINT("\n\t\tlength %u != N x 4", subtlv_length); - goto invalid; - } - if (subtlv_length > 36) { - ND_PRINT("\n\t\tlength %u > 36", subtlv_length); - goto invalid; - } - /* decode BCs until the subTLV ends */ - for (te_class = 0; te_class < (subtlv_length-4)/4; te_class++) { - bw.i = GET_BE_U_4(tptr + 4 + te_class * 4); - ND_PRINT("\n\t\t Bandwidth constraint CT%u: %.3f Mbps", - te_class, - bw.f * 8 / 1000000); - } - break; - case LS_OPAQUE_TE_LINK_SUBTLV_TE_METRIC: - if (subtlv_length != 4) { - ND_PRINT(" != 4"); - goto invalid; - } - ND_PRINT(", Metric %u", GET_BE_U_4(tptr)); - break; - case LS_OPAQUE_TE_LINK_SUBTLV_LINK_PROTECTION_TYPE: - /* Protection Cap (1 octet) + Reserved ((3 octets) */ - if (subtlv_length != 4) { - ND_PRINT(" != 4"); - goto invalid; - } - ND_PRINT(", %s", - bittok2str(gmpls_link_prot_values, "none", GET_U_1(tptr))); - break; - case LS_OPAQUE_TE_LINK_SUBTLV_INTF_SW_CAP_DESCR: - if (subtlv_length < 36) { - ND_PRINT(" < 36"); - goto invalid; - } - /* Switching Cap (1 octet) + Encoding (1) + Reserved (2) */ - ND_PRINT("\n\t\tInterface Switching Capability: %s", - tok2str(gmpls_switch_cap_values, "Unknown", GET_U_1((tptr)))); - ND_PRINT("\n\t\tLSP Encoding: %s\n\t\tMax LSP Bandwidth:", - tok2str(gmpls_encoding_values, "Unknown", GET_U_1((tptr + 1)))); - for (priority_level = 0; priority_level < 8; priority_level++) { - bw.i = GET_BE_U_4(tptr + 4 + (priority_level * 4)); - ND_PRINT("\n\t\t priority level %u: %.3f Mbps", - priority_level, - bw.f * 8 / 1000000); - } - break; - case LS_OPAQUE_TE_LINK_SUBTLV_LINK_TYPE: - if (subtlv_length != 1) { - ND_PRINT(" != 1"); - goto invalid; - } - ND_PRINT(", %s (%u)", - tok2str(lsa_opaque_te_tlv_link_type_sub_tlv_values,"unknown",GET_U_1(tptr)), - GET_U_1(tptr)); - break; - - case LS_OPAQUE_TE_LINK_SUBTLV_SHARED_RISK_GROUP: - if (subtlv_length % 4 != 0) { - ND_PRINT(" != N x 4"); - goto invalid; - } - count_srlg = subtlv_length / 4; - if (count_srlg != 0) - ND_PRINT("\n\t\t Shared risk group: "); - while (count_srlg > 0) { - bw.i = GET_BE_U_4(tptr); - ND_PRINT("%u", bw.i); - tptr+=4; - count_srlg--; - if (count_srlg > 0) - ND_PRINT(", "); - } - break; - - default: - if (ndo->ndo_vflag <= 1) { - if (!print_unknown_data(ndo, tptr, "\n\t\t", subtlv_length)) - return -1; - } - break; - } - /* in OSPF everything has to be 32-bit aligned, including subTLVs */ - if (subtlv_length%4 != 0) - subtlv_length+=4-(subtlv_length%4); - - if (tlv_length < subtlv_length) { - ND_PRINT("\n\t Remaining TLV length %u < %u", - tlv_length + 4, subtlv_length + 4); - return -1; - } - tlv_length-=subtlv_length; - tptr+=subtlv_length; - - } + if (ospf_te_tlv_link_print(ndo, tptr, tlv_length) == -1) + return -1; break; case LS_OPAQUE_TE_TLV_ROUTER: if (tlv_length < 4) { ND_PRINT("\n\t TLV length %u < 4", tlv_length); - return -1; + goto invalid; } - ND_TCHECK_4(tptr); ND_PRINT(", %s", GET_IPADDR_STRING(tptr)); break; default: if (ndo->ndo_vflag <= 1) { if (!print_unknown_data(ndo, tptr, "\n\t ", tlv_length)) - return -1; + goto invalid; } break; } /* in OSPF everything has to be 32-bit aligned, including TLVs */ - if (tlv_length%4 != 0) + if (tlv_length%4 != 0) { tlv_length+=4-(tlv_length%4); - if (tlv_length > ls_length) { - ND_PRINT("\n\t Bogus padded length %u > %u", tlv_length, - ls_length); - return -1; + if (tlv_length > ls_length) { + ND_PRINT("\n\t Bogus padded length %u > %u", tlv_length, + ls_length); + goto invalid; + } } ls_length-=tlv_length; tptr+=tlv_length; } return 0; trunc: + nd_print_trunc(ndo); return -1; invalid: nd_print_invalid(ndo); @@ -529,22 +594,17 @@ ospf_print_lshdr(netdissect_options *ndo, u_int ls_type; u_int ls_length; - ND_TCHECK_2(lshp->ls_length); ls_length = GET_BE_U_2(lshp->ls_length); if (ls_length < sizeof(struct lsa_hdr)) { ND_PRINT("\n\t Bogus length %u < header (%zu)", ls_length, sizeof(struct lsa_hdr)); return(-1); } - - ND_TCHECK_4(lshp->ls_seq); /* XXX - ls_length check checked this */ - ND_PRINT("\n\t Advertising Router %s, seq 0x%08x, age %us, length %u", + ND_PRINT("\n\t Advertising Router %s, seq 0x%08x, age %us, length %zu", GET_IPADDR_STRING(lshp->ls_router), GET_BE_U_4(lshp->ls_seq), GET_BE_U_2(lshp->ls_age), - ls_length - (u_int)sizeof(struct lsa_hdr)); - - ND_TCHECK_1(lshp->ls_type); /* XXX - ls_length check checked this */ + ls_length - sizeof(struct lsa_hdr)); ls_type = GET_U_1(lshp->ls_type); switch (ls_type) { /* the LSA header for opaque LSAs was slightly changed */ @@ -572,14 +632,10 @@ ospf_print_lshdr(netdissect_options *ndo, GET_IPADDR_STRING(lshp->un_lsa_id.lsa_id)); break; } - - ND_TCHECK_1(lshp->ls_options); /* XXX - ls_length check checked this */ ND_PRINT("\n\t Options: [%s]", bittok2str(ospf_option_values, "none", GET_U_1(lshp->ls_options))); return (ls_length); -trunc: - return (-1); } /* draft-ietf-ospf-mt-09 */ @@ -593,7 +649,7 @@ static const struct tok ospf_topology_values[] = { /* * Print all the per-topology metrics. */ -static int +static void ospf_print_tos_metrics(netdissect_options *ndo, const union un_tos *tos) { @@ -608,7 +664,6 @@ ospf_print_tos_metrics(netdissect_options *ndo, * All but the first metric contain a valid topology id. */ while (toscount != 0) { - ND_TCHECK_SIZE(tos); tos_type = GET_U_1(tos->metrics.tos_type); ND_PRINT("\n\t\ttopology %s (%u), metric %u", tok2str(ospf_topology_values, "Unknown", @@ -619,9 +674,260 @@ ospf_print_tos_metrics(netdissect_options *ndo, tos++; toscount--; } +} + +/* + * The SID/Label Range TLV + * https://datatracker.ietf.org/doc/html/rfc8665#section-3.2 + * and the SR Local Block TLV + * https://datatracker.ietf.org/doc/html/rfc8665#section-3.3 + * have the same contents, so this function is used to + * print both. + */ +static int +ospf_print_ri_lsa_sid_label_range_tlv(netdissect_options *ndo, const uint8_t *tptr, + u_int tlv_length) +{ + u_int subtlv_type, subtlv_length; + + while (tlv_length >= 4) { + + subtlv_type = GET_BE_U_2(tptr); + subtlv_length = GET_BE_U_2(tptr+2); + tptr+=4; + tlv_length-=4; + + /* Infinite loop protection. */ + if (subtlv_type == 0 || subtlv_length == 0) { + nd_print_invalid(ndo); + return -1; + } + + ND_PRINT("\n\t %s subTLV (%u), length: %u, value: ", + tok2str(lsa_opaque_ri_sid_subtlv_values,"unknown",subtlv_type), + subtlv_type, + subtlv_length); + + if (tlv_length < subtlv_length) { + ND_PRINT("\n\t Remaining TLV length %u < %u", + tlv_length, subtlv_length); + return -1; + } + + switch (subtlv_type) { + case LS_OPAQUE_RI_SUBTLV_SID_LABEL: + if (subtlv_length == 3) { + ND_PRINT("\n\t\tLabel: %u", GET_BE_U_3(tptr)); + } else if (subtlv_length == 4) { + ND_PRINT("\n\t\tSID: %u", GET_BE_U_4(tptr)); + } else { + ND_PRINT("\n\t\tBogus subTLV length %u", subtlv_length); + } + break; + + default: + if (ndo->ndo_vflag <= 1) { + if (!print_unknown_data(ndo, tptr, "\n\t\t", subtlv_length)) + return -1; + } + } + + /* in OSPF everything has to be 32-bit aligned, including subTLVs */ + if (subtlv_length % 4) { + subtlv_length += (4 - (subtlv_length % 4)); + if (tlv_length < subtlv_length) { + ND_PRINT("\n\t Remaining TLV length %u < %u", + tlv_length, subtlv_length); + return -1; + } + } + tptr+=subtlv_length; + tlv_length-=subtlv_length; + } + return 0; +} + +static int +ospf_print_ep_lsa_extd_prefix_tlv(netdissect_options *ndo, const uint8_t *tptr, + u_int tlv_length) +{ + u_int subtlv_type, subtlv_length; + uint8_t flags, mt_id, algo; + + while (tlv_length >= 4) { + subtlv_type = GET_BE_U_2(tptr); + subtlv_length = GET_BE_U_2(tptr+2); + tptr+=4; + tlv_length-=4; + + /* Infinite loop protection. */ + if (subtlv_type == 0 || subtlv_length == 0) { + nd_print_invalid(ndo); + return -1; + } + + ND_PRINT("\n\t\t%s subTLV (%u), length: %u, value: ", + tok2str(lsa_opaque_ep_extd_prefix_subtlv_values,"unknown",subtlv_type), + subtlv_type, + subtlv_length); + + if (tlv_length < subtlv_length) { + ND_PRINT("\n\t Remaining TLV length %u < %u", + tlv_length, subtlv_length); + return -1; + } + + switch (subtlv_type) { + case LS_OPAQUE_EP_SUBTLV_PREFIX_SID: + flags = GET_U_1(tptr); + mt_id = GET_U_1(tptr+2); + algo = GET_U_1(tptr+3); + + if (subtlv_length == 7) { + ND_PRINT("\n\t\t Label: %u", GET_BE_U_3(tptr+4)); + } else if (subtlv_length == 8) { + ND_PRINT("\n\t\t Index: %u", GET_BE_U_4(tptr+4)); + } else { + ND_PRINT("\n\t\tBogus subTLV length %u", subtlv_length); + break; + } + ND_PRINT( ", MT-ID: %u, Algorithm: %s (%u), Flags [%s]", + mt_id, tok2str(lsa_opaque_ri_tlv_sr_algos, "Unknown", algo), algo, + bittok2str(ep_range_tlv_prefix_sid_subtlv_flag_values, "none", flags)); + break; + + default: + if (ndo->ndo_vflag <= 1) { + if (!print_unknown_data(ndo, tptr, "\n\t\t", subtlv_length)) + return -1; + } + } + + /* in OSPF everything has to be 32-bit aligned, including subTLVs */ + if (subtlv_length % 4) { + subtlv_length += (4 - (subtlv_length % 4)); + if (tlv_length < subtlv_length) { + ND_PRINT("\n\t Remaining TLV length %u < %u", + tlv_length, subtlv_length); + return -1; + } + } + tptr+=subtlv_length; + tlv_length-=subtlv_length; + } + return 0; +} + +static int +ospf_ep_lsa_print(netdissect_options *ndo, const uint8_t *tptr, u_int lsa_length) +{ + u_int tlv_type, tlv_length; + uint16_t range_size; + uint8_t af, prefix_length, route_type, flags; + + while (lsa_length >= 4) { + + tlv_type = GET_BE_U_2(tptr); + tlv_length = GET_BE_U_2(tptr+2); + tptr+=4; + lsa_length-=4; + + /* Infinite loop protection. */ + if (tlv_type == 0 || tlv_length == 0) { + nd_print_invalid(ndo); + return -1; + } + + ND_PRINT("\n\t %s TLV (%u), length: %u, value: ", + tok2str(lsa_opaque_ep_tlv_values,"unknown",tlv_type), + tlv_type, + tlv_length); + + if (tlv_length > lsa_length) { + ND_PRINT("\n\t Bogus length %u > %u", + tlv_length, lsa_length); + return -1; + } + + switch (tlv_type) { + case LS_OPAQUE_EP_EXTD_PREFIX_TLV: + prefix_length = GET_U_1(tptr+1); + af = GET_U_1(tptr+2); + route_type = GET_U_1(tptr); + flags = GET_U_1(tptr+3); + + if (af != 0) { + ND_PRINT("\n\t Bogus AF %u", af); + return -1; + } + + if (prefix_length > 32) { + ND_PRINT("\n\t IPv4 prefix: bad bit length %u", prefix_length); + return -1; + } + + ND_PRINT("\n\t IPv4 prefix: %15s/%u, Route Type: %s, Flags [%s]", + GET_IPADDR_STRING(tptr+4), prefix_length, + tok2str(lsa_opaque_ep_route_type_values, "Unknown", route_type), + bittok2str(ep_tlv_flag_values, "none", flags)); + + /* subTLVs present ? */ + if (tlv_length > 12) { + if (ospf_print_ep_lsa_extd_prefix_tlv(ndo, tptr+8, tlv_length-8) == -1) { + return -1; + } + } + break; + + case LS_OPAQUE_EP_EXTD_PREFIX_RANGE_TLV: + prefix_length = GET_U_1(tptr); + af = GET_U_1(tptr+1); + range_size = GET_BE_U_2(tptr+2); + flags = GET_U_1(tptr+4); + + if (af != 0) { + ND_PRINT("\n\t Bogus AF %u", af); + return -1; + } + + if (prefix_length > 32) { + ND_PRINT("\n\t IPv4 prefix: bad bit length %u", prefix_length); + return -1; + } + + ND_PRINT("\n\t IPv4 prefix: %15s/%u, Range size: %u, Flags [%s]", + GET_IPADDR_STRING(tptr+8), prefix_length, + range_size, + bittok2str(ep_tlv_flag_values, "none", flags)); + + /* subTLVs present ? */ + if (tlv_length > 12) { + if (ospf_print_ep_lsa_extd_prefix_tlv(ndo, tptr+12, tlv_length-12) == -1) { + return -1; + } + } + break; + + default: + if (ndo->ndo_vflag <= 1) { + if (!print_unknown_data(ndo, tptr, "\n\t\t", tlv_length)) + return -1; + } + } + + /* in OSPF everything has to be 32-bit aligned, including TLVs */ + if (tlv_length % 4) { + tlv_length += (4 - (tlv_length % 4)); + if (tlv_length > lsa_length) { + ND_PRINT("\n\t Bogus padded length %u > %u", tlv_length, + lsa_length); + return -1; + } + } + tptr+=tlv_length; + lsa_length-=tlv_length; + } return 0; -trunc: - return 1; } /* @@ -639,29 +945,33 @@ ospf_print_lsa(netdissect_options *ndo, const struct aslametric *almp; const struct mcla *mcp; const uint8_t *lp; - int j, tlv_type, tlv_length, topology; - int ls_length; + u_int tlv_type, tlv_length, rla_count, topology, num_tlv; + int ospf_print_lshdr_ret; + u_int ls_length; const uint8_t *tptr; tptr = (const uint8_t *)lsap->lsa_un.un_unknown; /* squelch compiler warnings */ - ls_length = ospf_print_lshdr(ndo, &lsap->ls_hdr); - if (ls_length == -1) - return(NULL); + ospf_print_lshdr_ret = ospf_print_lshdr(ndo, &lsap->ls_hdr); + if (ospf_print_lshdr_ret < 0) + return(NULL); + ls_length = (u_int)ospf_print_lshdr_ret; ls_end = (const uint8_t *)lsap + ls_length; + /* + * ospf_print_lshdr() returns -1 if the length is too short, + * so we know ls_length is >= sizeof(struct lsa_hdr). + */ ls_length -= sizeof(struct lsa_hdr); switch (GET_U_1(lsap->ls_hdr.ls_type)) { case LS_TYPE_ROUTER: - ND_TCHECK_1(lsap->lsa_un.un_rla.rla_flags); ND_PRINT("\n\t Router LSA Options: [%s]", bittok2str(ospf_rla_flag_values, "none", GET_U_1(lsap->lsa_un.un_rla.rla_flags))); - ND_TCHECK_2(lsap->lsa_un.un_rla.rla_count); - j = GET_BE_U_2(lsap->lsa_un.un_rla.rla_count); + rla_count = GET_BE_U_2(lsap->lsa_un.un_rla.rla_count); ND_TCHECK_SIZE(lsap->lsa_un.un_rla.rla_link); rlp = lsap->lsa_un.un_rla.rla_link; - while (j--) { + for (u_int i = rla_count; i != 0; i--) { ND_TCHECK_SIZE(rlp); switch (GET_U_1(rlp->un_tos.link.link_type)) { @@ -695,8 +1005,7 @@ ospf_print_lsa(netdissect_options *ndo, return (ls_end); } - if (ospf_print_tos_metrics(ndo, &rlp->un_tos)) - goto trunc; + ospf_print_tos_metrics(ndo, &rlp->un_tos); rlp = (const struct rlalink *)((const u_char *)(rlp + 1) + (GET_U_1(rlp->un_tos.link.link_tos_count) * sizeof(union un_tos))); @@ -704,13 +1013,11 @@ ospf_print_lsa(netdissect_options *ndo, break; case LS_TYPE_NETWORK: - ND_TCHECK_4(lsap->lsa_un.un_nla.nla_mask); ND_PRINT("\n\t Mask %s\n\t Connected Routers:", GET_IPADDR_STRING(lsap->lsa_un.un_nla.nla_mask)); ap = lsap->lsa_un.un_nla.nla_router; while ((const u_char *)ap < ls_end) { - ND_TCHECK_SIZE(ap); - ND_PRINT("\n\t %s", GET_IPADDR_STRING(*ap)); + ND_PRINT("\n\t %s", GET_IPADDR_STRING(ap)); ++ap; } break; @@ -724,7 +1031,6 @@ ospf_print_lsa(netdissect_options *ndo, while (lp < ls_end) { uint32_t ul; - ND_TCHECK_4(lp); ul = GET_BE_U_4(lp); topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS; ND_PRINT("\n\t\ttopology %s (%u) metric %u", @@ -741,7 +1047,6 @@ ospf_print_lsa(netdissect_options *ndo, while (lp < ls_end) { uint32_t ul; - ND_TCHECK_4(lp); ul = GET_BE_U_4(lp); topology = (ul & SLA_MASK_TOS) >> SLA_SHIFT_TOS; ND_PRINT("\n\t\ttopology %s (%u) metric %u", @@ -763,7 +1068,6 @@ ospf_print_lsa(netdissect_options *ndo, while ((const u_char *)almp < ls_end) { uint32_t ul; - ND_TCHECK_4(almp->asla_tosmetric); ul = GET_BE_U_4(almp->asla_tosmetric); topology = ((ul & ASLA_MASK_TOS) >> ASLA_SHIFT_TOS); ND_PRINT("\n\t\ttopology %s (%u), type %u, metric", @@ -775,11 +1079,9 @@ ospf_print_lsa(netdissect_options *ndo, else ND_PRINT(" %u", (ul & ASLA_MASK_METRIC)); - ND_TCHECK_4(almp->asla_forward); if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_forward) != 0) { ND_PRINT(", forward %s", GET_IPADDR_STRING(almp->asla_forward)); } - ND_TCHECK_4(almp->asla_tag); if (GET_IPV4_TO_NETWORK_ORDER(almp->asla_tag) != 0) { ND_PRINT(", tag %s", GET_IPADDR_STRING(almp->asla_tag)); } @@ -791,7 +1093,6 @@ ospf_print_lsa(netdissect_options *ndo, /* Multicast extensions as of 23 July 1991 */ mcp = lsap->lsa_un.un_mcla; while ((const u_char *)mcp < ls_end) { - ND_TCHECK_4(mcp->mcla_vid); switch (GET_BE_U_4(mcp->mcla_vtype)) { case MCLA_VERTEX_ROUTER: @@ -821,7 +1122,7 @@ ospf_print_lsa(netdissect_options *ndo, case LS_OPAQUE_TYPE_RI: tptr = (const uint8_t *)(lsap->lsa_un.un_ri_tlv); - int ls_length_remaining = ls_length; + u_int ls_length_remaining = ls_length; while (ls_length_remaining != 0) { ND_TCHECK_4(tptr); if (ls_length_remaining < 4) { @@ -854,6 +1155,38 @@ ospf_print_lsa(netdissect_options *ndo, ND_PRINT("Capabilities: %s", bittok2str(lsa_opaque_ri_tlv_cap_values, "Unknown", GET_BE_U_4(tptr))); break; + + case LS_OPAQUE_RI_TLV_HOSTNAME: + ND_PRINT("\n\t Hostname: "); + nd_printjnp(ndo, tptr, tlv_length); + break; + + case LS_OPAQUE_RI_TLV_SR_ALGO: + num_tlv = tlv_length; + while (num_tlv >= 1) { + ND_PRINT("\n\t %s (%u)", + tok2str(lsa_opaque_ri_tlv_sr_algos, "Unknown", GET_U_1(tptr+tlv_length-num_tlv)), GET_U_1(tptr+tlv_length-num_tlv)); + num_tlv--; + } + break; + + case LS_OPAQUE_RI_TLV_SID_LABEL_RANGE: + case LS_OPAQUE_RI_TLV_SR_LOCAL_BLOCK: + ND_TCHECK_4(tptr); + ND_PRINT("\n\t Range size: %u", GET_BE_U_3(tptr)); + if (ospf_print_ri_lsa_sid_label_range_tlv(ndo, tptr+4, tlv_length-4) == -1) { + return(ls_end); + } + break; + + case LS_OPAQUE_RI_TLV_SRMS_PREFERENCE: + if (tlv_length != 4) { + ND_PRINT("\n\t Bogus SRMS Preference TLV length %u != 4", tlv_length); + return(ls_end); + } + ND_PRINT("\n\t SRMS Preference: %u", GET_U_1(tptr)); + break; + default: if (ndo->ndo_vflag <= 1) { if (!print_unknown_data(ndo, tptr, "\n\t ", tlv_length)) @@ -862,6 +1195,16 @@ ospf_print_lsa(netdissect_options *ndo, break; } + + /* in OSPF everything has to be 32-bit aligned, including TLVs */ + if (tlv_length % 4) { + tlv_length += (4 - (tlv_length % 4)); + if (tlv_length > ls_length_remaining) { + ND_PRINT("\n\t Bogus padded length %u > %u", tlv_length, + ls_length_remaining); + return(NULL); + } + } tptr+=tlv_length; ls_length_remaining-=tlv_length; } @@ -881,6 +1224,13 @@ ospf_print_lsa(netdissect_options *ndo, } break; + case LS_OPAQUE_TYPE_EP: + if (ospf_ep_lsa_print(ndo, (const u_char *)(lsap->lsa_un.un_ep_tlv), + ls_length) == -1) { + return(ls_end); + } + break; + default: if (ndo->ndo_vflag <= 1) { if (!print_unknown_data(ndo, (const uint8_t *)lsap->lsa_un.un_unknown, @@ -900,10 +1250,11 @@ ospf_print_lsa(netdissect_options *ndo, return (ls_end); trunc: + nd_print_trunc(ndo); return (NULL); } -static int +static void ospf_decode_lls(netdissect_options *ndo, const struct ospfhdr *op, u_int length) { @@ -917,16 +1268,16 @@ ospf_decode_lls(netdissect_options *ndo, case OSPF_TYPE_HELLO: if (!(GET_U_1(op->ospf_hello.hello_options) & OSPF_OPTION_L)) - return (0); + return; break; case OSPF_TYPE_DD: if (!(GET_U_1(op->ospf_db.db_options) & OSPF_OPTION_L)) - return (0); + return; break; default: - return (0); + return; } /* dig deeper if LLS data is available; see RFC4813 */ @@ -935,31 +1286,26 @@ ospf_decode_lls(netdissect_options *ndo, dataend = (const u_char *)op + length; if (GET_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) { - dptr = dptr + op->ospf_authdata[3]; - length2 += op->ospf_authdata[3]; + dptr = dptr + GET_U_1(op->ospf_authdata + 3); + length2 += GET_U_1(op->ospf_authdata + 3); } if (length2 >= length) { ND_PRINT("\n\t[LLS truncated]"); - return (1); + return; } - ND_TCHECK_2(dptr); ND_PRINT("\n\t LLS: checksum: 0x%04x", (u_int) GET_BE_U_2(dptr)); dptr += 2; - ND_TCHECK_2(dptr); length2 = GET_BE_U_2(dptr); ND_PRINT(", length: %u", length2); dptr += 2; - ND_TCHECK_1(dptr); while (dptr < dataend) { - ND_TCHECK_2(dptr); lls_type = GET_BE_U_2(dptr); ND_PRINT("\n\t %s (%u)", tok2str(ospf_lls_tlv_values,"Unknown TLV",lls_type), lls_type); dptr += 2; - ND_TCHECK_2(dptr); lls_len = GET_BE_U_2(dptr); ND_PRINT(", length: %u", lls_len); dptr += 2; @@ -970,7 +1316,6 @@ ospf_decode_lls(netdissect_options *ndo, ND_PRINT(" [should be 4]"); lls_len = 4; } - ND_TCHECK_4(dptr); lls_flags = GET_BE_U_4(dptr); ND_PRINT("\n\t Options: 0x%08x [%s]", lls_flags, bittok2str(ospf_lls_eo_options, "?", lls_flags)); @@ -982,17 +1327,12 @@ ospf_decode_lls(netdissect_options *ndo, ND_PRINT(" [should be 20]"); lls_len = 20; } - ND_TCHECK_4(dptr); ND_PRINT("\n\t Sequence number: 0x%08x", GET_BE_U_4(dptr)); break; } dptr += lls_len; } - - return (0); -trunc: - return (1); } static int @@ -1008,23 +1348,19 @@ ospf_decode_v2(netdissect_options *ndo, switch (GET_U_1(op->ospf_type)) { case OSPF_TYPE_HELLO: - ND_TCHECK_1(op->ospf_hello.hello_options); ND_PRINT("\n\tOptions [%s]", bittok2str(ospf_option_values,"none",GET_U_1(op->ospf_hello.hello_options))); - ND_TCHECK_4(op->ospf_hello.hello_deadint); ND_PRINT("\n\t Hello Timer %us, Dead Timer %us, Mask %s, Priority %u", GET_BE_U_2(op->ospf_hello.hello_helloint), GET_BE_U_4(op->ospf_hello.hello_deadint), GET_IPADDR_STRING(op->ospf_hello.hello_mask), GET_U_1(op->ospf_hello.hello_priority)); - ND_TCHECK_4(op->ospf_hello.hello_dr); if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_dr) != 0) ND_PRINT("\n\t Designated Router %s", GET_IPADDR_STRING(op->ospf_hello.hello_dr)); - ND_TCHECK_4(op->ospf_hello.hello_bdr); if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_hello.hello_bdr) != 0) ND_PRINT(", Backup Designated Router %s", GET_IPADDR_STRING(op->ospf_hello.hello_bdr)); @@ -1033,25 +1369,20 @@ ospf_decode_v2(netdissect_options *ndo, if ((const u_char *)ap < dataend) ND_PRINT("\n\t Neighbor List:"); while ((const u_char *)ap < dataend) { - ND_TCHECK_SIZE(ap); - ND_PRINT("\n\t %s", GET_IPADDR_STRING(*ap)); + ND_PRINT("\n\t %s", GET_IPADDR_STRING(ap)); ++ap; } break; /* HELLO */ case OSPF_TYPE_DD: - ND_TCHECK_1(op->ospf_db.db_options); ND_PRINT("\n\tOptions [%s]", bittok2str(ospf_option_values, "none", GET_U_1(op->ospf_db.db_options))); - ND_TCHECK_1(op->ospf_db.db_flags); ND_PRINT(", DD Flags [%s]", bittok2str(ospf_dd_flag_values, "none", GET_U_1(op->ospf_db.db_flags))); - ND_TCHECK_2(op->ospf_db.db_ifmtu); if (GET_BE_U_2(op->ospf_db.db_ifmtu)) { ND_PRINT(", MTU: %u", GET_BE_U_2(op->ospf_db.db_ifmtu)); } - ND_TCHECK_4(op->ospf_db.db_seq); ND_PRINT(", Sequence: 0x%08x", GET_BE_U_4(op->ospf_db.db_seq)); /* Print all the LS adv's */ @@ -1093,7 +1424,6 @@ ospf_decode_v2(netdissect_options *ndo, case OSPF_TYPE_LS_UPDATE: lsap = op->ospf_lsu.lsu_lsa; - ND_TCHECK_4(op->ospf_lsu.lsu_count); lsa_count_max = GET_BE_U_4(op->ospf_lsu.lsu_count); ND_PRINT(", %u LSA%s", lsa_count_max, PLURAL_SUFFIX(lsa_count_max)); for (lsa_count=1;lsa_count <= lsa_count_max;lsa_count++) { @@ -1106,7 +1436,8 @@ ospf_decode_v2(netdissect_options *ndo, case OSPF_TYPE_LS_ACK: lshp = op->ospf_lsa.lsa_lshdr; - while (ospf_print_lshdr(ndo, lshp) != -1) { + while ((const u_char *)lshp < dataend) { + ospf_print_lshdr(ndo, lshp); ++lshp; } break; @@ -1132,7 +1463,6 @@ ospf_print(netdissect_options *ndo, op = (const struct ospfhdr *)bp; /* XXX Before we do anything else, strip off the MD5 trailer */ - ND_TCHECK_2(op->ospf_authtype); if (GET_BE_U_2(op->ospf_authtype) == OSPF_AUTH_MD5) { length -= OSPF_AUTH_MD5_LEN; ndo->ndo_snapend -= OSPF_AUTH_MD5_LEN; @@ -1140,7 +1470,6 @@ ospf_print(netdissect_options *ndo, /* If the type is valid translate it, or just print the type */ /* value. If it's not valid, say so and return */ - ND_TCHECK_1(op->ospf_type); cp = tok2str(type2str, "unknown LS-type %u", GET_U_1(op->ospf_type)); ND_PRINT("OSPFv%u, %s, length %u", GET_U_1(op->ospf_version), cp, length); @@ -1151,7 +1480,6 @@ ospf_print(netdissect_options *ndo, return; } - ND_TCHECK_2(op->ospf_len); if (length != GET_BE_U_2(op->ospf_len)) { ND_PRINT(" [len %u]", GET_BE_U_2(op->ospf_len)); } @@ -1162,10 +1490,8 @@ ospf_print(netdissect_options *ndo, dataend = bp + length; } - ND_TCHECK_4(op->ospf_routerid); ND_PRINT("\n\tRouter-ID %s", GET_IPADDR_STRING(op->ospf_routerid)); - ND_TCHECK_4(op->ospf_areaid); if (GET_IPV4_TO_NETWORK_ORDER(op->ospf_areaid) != 0) ND_PRINT(", Area %s", GET_IPADDR_STRING(op->ospf_areaid)); else @@ -1186,13 +1512,13 @@ ospf_print(netdissect_options *ndo, case OSPF_AUTH_SIMPLE: ND_PRINT("\n\tSimple text password: "); - (void)nd_printzp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN, NULL); + nd_printjnp(ndo, op->ospf_authdata, OSPF_AUTH_SIMPLE_LEN); break; case OSPF_AUTH_MD5: ND_PRINT("\n\tKey-ID: %u, Auth-Length: %u, Crypto Sequence Number: 0x%08x", - *((op->ospf_authdata) + 2), - *((op->ospf_authdata) + 3), + GET_U_1(op->ospf_authdata + 2), + GET_U_1(op->ospf_authdata + 3), GET_BE_U_4((op->ospf_authdata) + 4)); break; @@ -1207,10 +1533,8 @@ ospf_print(netdissect_options *ndo, /* ospf version 2 */ if (ospf_decode_v2(ndo, op, dataend)) goto trunc; - if (length > GET_BE_U_2(op->ospf_len)) { - if (ospf_decode_lls(ndo, op, length)) - goto trunc; - } + if (length > GET_BE_U_2(op->ospf_len)) + ospf_decode_lls(ndo, op, length); break; default: @@ -1220,5 +1544,5 @@ ospf_print(netdissect_options *ndo, return; trunc: - nd_print_trunc(ndo); + nd_trunc_longjmp(ndo); }