X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/abc8c2d61c65757011d9d32abb01cd1e51232f3a..9169e4e1949c3fa879f0a2f98cfbd8c444743c27:/print-ospf.c diff --git a/print-ospf.c b/print-ospf.c index 8e4fec5a..a385d7a1 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" }, @@ -307,7 +307,6 @@ ospf_te_lsa_print(netdissect_options *ndo, 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; @@ -492,7 +491,6 @@ ospf_te_lsa_print(netdissect_options *ndo, ND_PRINT("\n\t TLV length %u < 4", tlv_length); return -1; } - ND_TCHECK_4(tptr); ND_PRINT(", %s", GET_IPADDR_STRING(tptr)); break; @@ -584,7 +582,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) { @@ -599,7 +597,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", @@ -610,9 +607,6 @@ ospf_print_tos_metrics(netdissect_options *ndo, tos++; toscount--; } - return 0; -trunc: - return 1; } /* @@ -690,8 +684,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))); @@ -699,7 +692,6 @@ 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; @@ -767,11 +759,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)); } @@ -783,7 +773,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: @@ -895,7 +884,7 @@ trunc: return (NULL); } -static int +static void ospf_decode_lls(netdissect_options *ndo, const struct ospfhdr *op, u_int length) { @@ -909,16 +898,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 */ @@ -927,12 +916,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)); @@ -941,7 +930,6 @@ ospf_decode_lls(netdissect_options *ndo, ND_PRINT(", length: %u", length2); dptr += 2; - ND_TCHECK_1(dptr); while (dptr < dataend) { lls_type = GET_BE_U_2(dptr); ND_PRINT("\n\t %s (%u)", @@ -975,10 +963,6 @@ ospf_decode_lls(netdissect_options *ndo, dptr += lls_len; } - - return (0); -trunc: - return (1); } static int @@ -1003,12 +987,10 @@ ospf_decode_v2(netdissect_options *ndo, 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)); @@ -1138,10 +1120,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 @@ -1167,8 +1147,8 @@ ospf_print(netdissect_options *ndo, 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; @@ -1183,10 +1163,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: @@ -1196,5 +1174,5 @@ ospf_print(netdissect_options *ndo, return; trunc: - nd_print_trunc(ndo); + nd_trunc_longjmp(ndo); }