X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/0b3880c91e169db7cfbdce1b18ef4f1e3fd277de..dc9744f7c6f1aa8f676f84829ee9a69a52952f94:/print-icmp.c diff --git a/print-icmp.c b/print-icmp.c index 86da44bd..0f0e7a10 100644 --- a/print-icmp.c +++ b/print-icmp.c @@ -343,7 +343,8 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * uint32_t raw_label; const u_char *snapend_save; const struct icmp_mpls_ext_object_header_t *icmp_mpls_ext_object_header; - u_int hlen, dport, mtu, obj_tlen, obj_class_num, obj_ctype; + u_int hlen, mtu, obj_tlen, obj_class_num, obj_ctype; + uint16_t dport; char buf[MAXHOSTNAMELEN + 100]; struct cksum_vec vec[1]; @@ -354,8 +355,8 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * str = buf; ND_TCHECK_1(dp->icmp_code); - icmp_type = EXTRACT_U_1(dp->icmp_type); - icmp_code = EXTRACT_U_1(dp->icmp_code); + icmp_type = GET_U_1(dp->icmp_type); + icmp_code = GET_U_1(dp->icmp_code); switch (icmp_type) { case ICMP_ECHO: @@ -364,8 +365,8 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * (void)nd_snprintf(buf, sizeof(buf), "echo %s, id %u, seq %u", icmp_type == ICMP_ECHO ? "request" : "reply", - EXTRACT_BE_U_2(dp->icmp_id), - EXTRACT_BE_U_2(dp->icmp_seq)); + GET_BE_U_2(dp->icmp_id), + GET_BE_U_2(dp->icmp_seq)); break; case ICMP_UNREACH: @@ -377,7 +378,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * (void)nd_snprintf(buf, sizeof(buf), "%s protocol %u unreachable", ipaddr_string(ndo, dp->icmp_ip.ip_dst), - EXTRACT_U_1(dp->icmp_ip.ip_p)); + GET_U_1(dp->icmp_ip.ip_p)); break; case ICMP_UNREACH_PORT: @@ -386,8 +387,8 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * hlen = IP_HL(oip) * 4; ouh = (const struct udphdr *)(((const u_char *)oip) + hlen); ND_TCHECK_2(ouh->uh_dport); - dport = EXTRACT_BE_U_2(ouh->uh_dport); - ip_proto = EXTRACT_U_1(oip->ip_p); + dport = GET_BE_U_2(ouh->uh_dport); + ip_proto = GET_U_1(oip->ip_p); switch (ip_proto) { case IPPROTO_TCP: @@ -417,7 +418,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * { const struct mtu_discovery *mp; mp = (const struct mtu_discovery *)(const u_char *)&dp->icmp_void; - mtu = EXTRACT_BE_U_2(mp->nexthopmtu); + mtu = GET_BE_U_2(mp->nexthopmtu); if (mtu) { (void)nd_snprintf(buf, sizeof(buf), "%s unreachable - need to frag (mtu %u)", @@ -461,7 +462,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * ND_TCHECK_SIZE(ihp); (void)strncpy(cp, " lifetime ", sizeof(buf) - (cp - buf)); cp = buf + strlen(buf); - lifetime = EXTRACT_BE_U_2(ihp->ird_lifetime); + lifetime = GET_BE_U_2(ihp->ird_lifetime); if (lifetime < 60) { (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), "%u", lifetime); @@ -477,24 +478,25 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * } cp = buf + strlen(buf); - num = EXTRACT_U_1(ihp->ird_addrnum); + num = GET_U_1(ihp->ird_addrnum); (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), " %u:", num); cp = buf + strlen(buf); - size = EXTRACT_U_1(ihp->ird_addrsiz); + size = GET_U_1(ihp->ird_addrsiz); if (size != 2) { (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), " [size %u]", size); break; } idp = (const struct id_rdiscovery *)&dp->icmp_data; - while (num-- > 0) { + while (num > 0) { ND_TCHECK_SIZE(idp); (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), " {%s %u}", ipaddr_string(ndo, idp->ird_addr), - EXTRACT_BE_U_4(idp->ird_pref)); + GET_BE_U_4(idp->ird_pref)); cp = buf + strlen(buf); ++idp; + num--; } } break; @@ -525,36 +527,37 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * else { ND_TCHECK_1(dp->icmp_pptr); (void)nd_snprintf(buf, sizeof(buf), - "parameter problem - octet %u", EXTRACT_U_1(dp->icmp_pptr)); + "parameter problem - octet %u", + GET_U_1(dp->icmp_pptr)); } break; case ICMP_MASKREPLY: ND_TCHECK_4(dp->icmp_mask); (void)nd_snprintf(buf, sizeof(buf), "address mask is 0x%08x", - EXTRACT_BE_U_4(dp->icmp_mask)); + GET_BE_U_4(dp->icmp_mask)); break; case ICMP_TSTAMP: ND_TCHECK_2(dp->icmp_seq); (void)nd_snprintf(buf, sizeof(buf), "time stamp query id %u seq %u", - EXTRACT_BE_U_2(dp->icmp_id), - EXTRACT_BE_U_2(dp->icmp_seq)); + GET_BE_U_2(dp->icmp_id), + GET_BE_U_2(dp->icmp_seq)); break; case ICMP_TSTAMPREPLY: ND_TCHECK_4(dp->icmp_ttime); (void)nd_snprintf(buf, sizeof(buf), "time stamp reply id %u seq %u: org %s", - EXTRACT_BE_U_2(dp->icmp_id), - EXTRACT_BE_U_2(dp->icmp_seq), - icmp_tstamp_print(EXTRACT_BE_U_4(dp->icmp_otime))); + GET_BE_U_2(dp->icmp_id), + GET_BE_U_2(dp->icmp_seq), + icmp_tstamp_print(GET_BE_U_4(dp->icmp_otime))); (void)nd_snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", recv %s", - icmp_tstamp_print(EXTRACT_BE_U_4(dp->icmp_rtime))); + icmp_tstamp_print(GET_BE_U_4(dp->icmp_rtime))); (void)nd_snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", xmit %s", - icmp_tstamp_print(EXTRACT_BE_U_4(dp->icmp_ttime))); + icmp_tstamp_print(GET_BE_U_4(dp->icmp_ttime))); break; default: @@ -570,7 +573,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * vec[0].len = plen; sum = in_cksum(vec, 1); if (sum != 0) { - uint16_t icmp_sum = EXTRACT_BE_U_2(dp->icmp_cksum); + uint16_t icmp_sum = GET_BE_U_2(dp->icmp_cksum); ND_PRINT(" (wrong icmp cksum %x (->%x)!)", icmp_sum, in_cksum_shouldbe(icmp_sum, sum)); @@ -588,7 +591,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * ip = (const struct ip *)bp; snapend_save = ndo->ndo_snapend; ND_TCHECK_2(ip->ip_len); - ip_print(ndo, bp, EXTRACT_BE_U_2(ip->ip_len)); + ip_print(ndo, bp, GET_BE_U_2(ip->ip_len)); ndo->ndo_snapend = snapend_save; } @@ -608,7 +611,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * * to check if an extension header is present. This is expedient, * however not all implementations set the length field proper. */ - if (EXTRACT_U_1(ext_dp->icmp_length) == 0 && + if (GET_U_1(ext_dp->icmp_length) == 0 && ND_TTEST_LEN(ext_dp->icmp_ext_version_res, plen - ICMP_EXTD_MINLEN)) { vec[0].ptr = (const uint8_t *)(const void *)&ext_dp->icmp_ext_version_res; vec[0].len = plen - ICMP_EXTD_MINLEN; @@ -634,7 +637,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * vec[0].ptr = (const uint8_t *)(const void *)&ext_dp->icmp_ext_version_res; vec[0].len = hlen; ND_PRINT(", checksum 0x%04x (%scorrect), length %u", - EXTRACT_BE_U_2(ext_dp->icmp_ext_checksum), + GET_BE_U_2(ext_dp->icmp_ext_checksum), in_cksum(vec, 1) ? "in" : "", hlen); } @@ -646,9 +649,9 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * icmp_mpls_ext_object_header = (const struct icmp_mpls_ext_object_header_t *)obj_tptr; ND_TCHECK_SIZE(icmp_mpls_ext_object_header); - obj_tlen = EXTRACT_BE_U_2(icmp_mpls_ext_object_header->length); - obj_class_num = EXTRACT_U_1(icmp_mpls_ext_object_header->class_num); - obj_ctype = EXTRACT_U_1(icmp_mpls_ext_object_header->ctype); + obj_tlen = GET_BE_U_2(icmp_mpls_ext_object_header->length); + obj_class_num = GET_U_1(icmp_mpls_ext_object_header->class_num); + obj_ctype = GET_U_1(icmp_mpls_ext_object_header->ctype); obj_tptr += sizeof(struct icmp_mpls_ext_object_header_t); ND_PRINT("\n\t %s Object (%u), Class-Type: %u, length %u", @@ -671,7 +674,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * switch(obj_ctype) { case 1: ND_TCHECK_4(obj_tptr); - raw_label = EXTRACT_BE_U_4(obj_tptr); + raw_label = GET_BE_U_4(obj_tptr); ND_PRINT("\n\t label %u, exp %u", MPLS_LABEL(raw_label), MPLS_EXP(raw_label)); if (MPLS_STACK(raw_label)) ND_PRINT(", [S]");