X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/aad6ac30ce7904f688226dbc61021ca4f907274f..10c9f6fdaa79a650df98ffe98017f282a0fcde4a:/print-ospf.c diff --git a/print-ospf.c b/print-ospf.c index 09876377..d0cf573c 100644 --- a/print-ospf.c +++ b/print-ospf.c @@ -38,11 +38,11 @@ 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 +59,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 +101,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" }, { 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 +192,8 @@ 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_HOSTNAME, "Hostname" }, + { LS_OPAQUE_RI_TLV_SID_LABEL_RANGE, "SID/Label Range" }, { 0, NULL } }; @@ -209,6 +254,7 @@ ospf_grace_lsa_print(netdissect_options *ndo, /* Infinite loop protection. */ if (tlv_type == 0 || tlv_length ==0) { + nd_print_invalid(ndo); return -1; } @@ -296,6 +342,7 @@ ospf_te_lsa_print(netdissect_options *ndo, /* Infinite loop protection. */ if (tlv_type == 0 || tlv_length ==0) { + nd_print_invalid(ndo); return -1; } @@ -533,11 +580,11 @@ ospf_print_lshdr(netdissect_options *ndo, sizeof(struct lsa_hdr)); return(-1); } - 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)); + 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 */ @@ -582,7 +629,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) { @@ -597,7 +644,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", @@ -608,9 +654,218 @@ ospf_print_tos_metrics(netdissect_options *ndo, tos++; toscount--; } +} + +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); + + 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)); + } + 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); + + 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, MT-ID: %u, Algorithm: %u", + GET_BE_U_3(tptr+4), mt_id, algo); + } else if (subtlv_length == 8) { + ND_PRINT("\n\t\t Index: %u, MT-ID: %u, Algorithm: %u, Flags [%s]", + GET_BE_U_4(tptr+4), mt_id, algo, + bittok2str(ep_range_tlv_prefix_sid_subtlv_flag_values, "none", flags)); + } 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)); + } + 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); + + 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)); + } + tptr+=tlv_length; + lsa_length-=tlv_length; + } return 0; -trunc: - return 1; } /* @@ -688,8 +943,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))); @@ -701,8 +955,7 @@ ospf_print_lsa(netdissect_options *ndo, 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; @@ -840,6 +1093,20 @@ 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_SID_LABEL_RANGE: + 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; + default: if (ndo->ndo_vflag <= 1) { if (!print_unknown_data(ndo, tptr, "\n\t ", tlv_length)) @@ -848,6 +1115,11 @@ 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)); + } tptr+=tlv_length; ls_length_remaining-=tlv_length; } @@ -867,6 +1139,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, @@ -889,7 +1168,7 @@ trunc: return (NULL); } -static int +static void ospf_decode_lls(netdissect_options *ndo, const struct ospfhdr *op, u_int length) { @@ -903,16 +1182,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 */ @@ -921,12 +1200,12 @@ 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_PRINT("\n\t LLS: checksum: 0x%04x", (u_int) GET_BE_U_2(dptr)); @@ -968,8 +1247,6 @@ ospf_decode_lls(netdissect_options *ndo, dptr += lls_len; } - - return (0); } static int @@ -1006,8 +1283,7 @@ 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 */ @@ -1074,7 +1350,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; @@ -1149,13 +1426,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; @@ -1170,10 +1447,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: @@ -1183,5 +1458,5 @@ ospf_print(netdissect_options *ndo, return; trunc: - nd_print_trunc(ndo); + nd_trunc_longjmp(ndo); }