X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/64e8f9a9ed91a3cbfa8e66367f87ef50a1d62b99..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-pgm.c diff --git a/print-pgm.c b/print-pgm.c index 00e53b82..3b063ba7 100644 --- a/print-pgm.c +++ b/print-pgm.c @@ -21,6 +21,7 @@ #include "netdissect-stdinc.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "extract.h" #include "addrtoname.h" @@ -167,15 +168,14 @@ pgm_print(netdissect_options *ndo, if (!ND_TTEST_2(pgm->pgm_dport)) { if (ip6) { ND_PRINT("%s > %s:", - ip6addr_string(ndo, ip6->ip6_src), - ip6addr_string(ndo, ip6->ip6_dst)); + GET_IP6ADDR_STRING(ip6->ip6_src), + GET_IP6ADDR_STRING(ip6->ip6_dst)); } else { ND_PRINT("%s > %s:", - ipaddr_string(ndo, ip->ip_src), - ipaddr_string(ndo, ip->ip_dst)); + GET_IPADDR_STRING(ip->ip_src), + GET_IPADDR_STRING(ip->ip_dst)); } - nd_print_trunc(ndo); - return; + nd_trunc_longjmp(ndo); } sport = GET_BE_U_2(pgm->pgm_sport); @@ -184,9 +184,9 @@ pgm_print(netdissect_options *ndo, if (ip6) { if (GET_U_1(ip6->ip6_nxt) == IPPROTO_PGM) { ND_PRINT("%s.%s > %s.%s: ", - ip6addr_string(ndo, ip6->ip6_src), + GET_IP6ADDR_STRING(ip6->ip6_src), tcpport_string(ndo, sport), - ip6addr_string(ndo, ip6->ip6_dst), + GET_IP6ADDR_STRING(ip6->ip6_dst), tcpport_string(ndo, dport)); } else { ND_PRINT("%s > %s: ", @@ -195,9 +195,9 @@ pgm_print(netdissect_options *ndo, } else { if (GET_U_1(ip->ip_p) == IPPROTO_PGM) { ND_PRINT("%s.%s > %s.%s: ", - ipaddr_string(ndo, ip->ip_src), + GET_IPADDR_STRING(ip->ip_src), tcpport_string(ndo, sport), - ipaddr_string(ndo, ip->ip_dst), + GET_IPADDR_STRING(ip->ip_dst), tcpport_string(ndo, dport)); } else { ND_PRINT("%s > %s: ", @@ -229,18 +229,18 @@ pgm_print(netdissect_options *ndo, bp = (const u_char *) (spm + 1); switch (GET_BE_U_2(spm->pgms_nla_afi)) { - case AFNUM_INET: + case AFNUM_IP: ND_TCHECK_LEN(bp, sizeof(nd_ipv4)); addrtostr(bp, nla_buf, sizeof(nla_buf)); bp += sizeof(nd_ipv4); break; - case AFNUM_INET6: + case AFNUM_IP6: ND_TCHECK_LEN(bp, sizeof(nd_ipv6)); addrtostr6(bp, nla_buf, sizeof(nla_buf)); bp += sizeof(nd_ipv6); break; default: - goto trunc; + goto invalid; break; } @@ -261,30 +261,27 @@ pgm_print(netdissect_options *ndo, bp = (const u_char *) (pgm_poll + 1); switch (GET_BE_U_2(pgm_poll->pgmp_nla_afi)) { - case AFNUM_INET: + case AFNUM_IP: ND_TCHECK_LEN(bp, sizeof(nd_ipv4)); addrtostr(bp, nla_buf, sizeof(nla_buf)); bp += sizeof(nd_ipv4); break; - case AFNUM_INET6: + case AFNUM_IP6: ND_TCHECK_LEN(bp, sizeof(nd_ipv6)); addrtostr6(bp, nla_buf, sizeof(nla_buf)); bp += sizeof(nd_ipv6); break; default: - goto trunc; + goto invalid; break; } - ND_TCHECK_LEN(bp, sizeof(uint32_t)); ivl = GET_BE_U_4(bp); bp += sizeof(uint32_t); - ND_TCHECK_LEN(bp, sizeof(uint32_t)); rnd = GET_BE_U_4(bp); bp += sizeof(uint32_t); - ND_TCHECK_LEN(bp, sizeof(uint32_t)); mask = GET_BE_U_4(bp); bp += sizeof(uint32_t); @@ -309,7 +306,6 @@ pgm_print(netdissect_options *ndo, const struct pgm_data *odata; odata = (const struct pgm_data *)(pgm + 1); - ND_TCHECK_SIZE(odata); ND_PRINT("ODATA trail %u seq %u", GET_BE_U_4(odata->pgmd_trailseq), GET_BE_U_4(odata->pgmd_seq)); @@ -321,7 +317,6 @@ pgm_print(netdissect_options *ndo, const struct pgm_data *rdata; rdata = (const struct pgm_data *)(pgm + 1); - ND_TCHECK_SIZE(rdata); ND_PRINT("RDATA trail %u seq %u", GET_BE_U_4(rdata->pgmd_trailseq), GET_BE_U_4(rdata->pgmd_seq)); @@ -344,18 +339,18 @@ pgm_print(netdissect_options *ndo, * and stopping if we don't have enough. */ switch (GET_BE_U_2(nak->pgmn_source_afi)) { - case AFNUM_INET: + case AFNUM_IP: ND_TCHECK_LEN(bp, sizeof(nd_ipv4)); addrtostr(bp, source_buf, sizeof(source_buf)); bp += sizeof(nd_ipv4); break; - case AFNUM_INET6: + case AFNUM_IP6: ND_TCHECK_LEN(bp, sizeof(nd_ipv6)); addrtostr6(bp, source_buf, sizeof(source_buf)); bp += sizeof(nd_ipv6); break; default: - goto trunc; + goto invalid; break; } @@ -364,20 +359,19 @@ pgm_print(netdissect_options *ndo, * and stopping if we don't have enough. */ bp += (2 * sizeof(uint16_t)); - ND_TCHECK_2(bp); switch (GET_BE_U_2(bp)) { - case AFNUM_INET: + case AFNUM_IP: ND_TCHECK_LEN(bp, sizeof(nd_ipv4)); addrtostr(bp, group_buf, sizeof(group_buf)); bp += sizeof(nd_ipv4); break; - case AFNUM_INET6: + case AFNUM_IP6: ND_TCHECK_LEN(bp, sizeof(nd_ipv6)); addrtostr6(bp, group_buf, sizeof(group_buf)); bp += sizeof(nd_ipv6); break; default: - goto trunc; + goto invalid; break; } @@ -459,7 +453,6 @@ pgm_print(netdissect_options *ndo, ND_PRINT("[Total option length leaves no room for final option]"); return; } - ND_TCHECK_2(bp); opt_type = GET_U_1(bp); bp++; opt_len = GET_U_1(bp); @@ -515,7 +508,6 @@ pgm_print(netdissect_options *ndo, ND_PRINT("[Option length not a multiple of 4]"); return; } - ND_TCHECK_4(bp); ND_PRINT(" %u", GET_BE_U_4(bp)); bp += 4; opt_len -= 4; @@ -580,7 +572,7 @@ pgm_print(netdissect_options *ndo, nla_afnum = GET_BE_U_2(bp); bp += 2+2; switch (nla_afnum) { - case AFNUM_INET: + case AFNUM_IP: if (opt_len != PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv4)) { ND_PRINT("[Bad OPT_REDIRECT option, length %u != %u + address size]", opt_len, PGM_OPT_REDIRECT_FIXED_LEN); @@ -591,7 +583,7 @@ pgm_print(netdissect_options *ndo, bp += sizeof(nd_ipv4); opts_len -= PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv4); break; - case AFNUM_INET6: + case AFNUM_IP6: if (opt_len != PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv6)) { ND_PRINT("[Bad OPT_REDIRECT option, length %u != %u + address size]", opt_len, PGM_OPT_REDIRECT_FIXED_LEN); @@ -603,7 +595,7 @@ pgm_print(netdissect_options *ndo, opts_len -= PGM_OPT_REDIRECT_FIXED_LEN + sizeof(nd_ipv6); break; default: - goto trunc; + goto invalid; break; } @@ -737,7 +729,7 @@ pgm_print(netdissect_options *ndo, nla_afnum = GET_BE_U_2(bp); bp += 2+2; switch (nla_afnum) { - case AFNUM_INET: + case AFNUM_IP: if (opt_len != PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv4)) { ND_PRINT("[Bad OPT_PGMCC_DATA option, length %u != %u + address size]", opt_len, PGM_OPT_PGMCC_DATA_FIXED_LEN); @@ -748,7 +740,7 @@ pgm_print(netdissect_options *ndo, bp += sizeof(nd_ipv4); opts_len -= PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv4); break; - case AFNUM_INET6: + case AFNUM_IP6: if (opt_len != PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv6)) { ND_PRINT("[Bad OPT_PGMCC_DATA option, length %u != %u + address size]", opt_len, PGM_OPT_PGMCC_DATA_FIXED_LEN); @@ -760,7 +752,7 @@ pgm_print(netdissect_options *ndo, opts_len -= PGM_OPT_PGMCC_DATA_FIXED_LEN + sizeof(nd_ipv6); break; default: - goto trunc; + goto invalid; break; } @@ -780,7 +772,7 @@ pgm_print(netdissect_options *ndo, nla_afnum = GET_BE_U_2(bp); bp += 2+2; switch (nla_afnum) { - case AFNUM_INET: + case AFNUM_IP: if (opt_len != PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv4)) { ND_PRINT("[Bad OPT_PGMCC_FEEDBACK option, length %u != %u + address size]", opt_len, PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN); @@ -791,7 +783,7 @@ pgm_print(netdissect_options *ndo, bp += sizeof(nd_ipv4); opts_len -= PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv4); break; - case AFNUM_INET6: + case AFNUM_IP6: if (opt_len != PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv6)) { ND_PRINT("[Bad OPT_PGMCC_FEEDBACK option, length %u != %u + address size]", opt_len, PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN); @@ -803,7 +795,7 @@ pgm_print(netdissect_options *ndo, opts_len -= PGM_OPT_PGMCC_FEEDBACK_FIXED_LEN + sizeof(nd_ipv6); break; default: - goto trunc; + goto invalid; break; } @@ -829,7 +821,6 @@ pgm_print(netdissect_options *ndo, GET_BE_U_2(pgm->pgm_length)); return; - -trunc: - nd_print_trunc(ndo); +invalid: + nd_print_invalid(ndo); }