X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/58f2aa4b57a2a1c15ce7e890201cce009b476ee7..0f24a43a7e9fbdcff2baae3990939b2bc25d9fd1:/print-icmp.c diff --git a/print-icmp.c b/print-icmp.c index 811fa8ef..ebf4693c 100644 --- a/print-icmp.c +++ b/print-icmp.c @@ -22,10 +22,10 @@ /* \summary: Internet Control Message Protocol (ICMP) printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include #include @@ -52,8 +52,8 @@ struct icmp { nd_uint8_t icmp_code; /* type sub code */ nd_uint16_t icmp_cksum; /* ones complement cksum of struct */ union { - nd_uint8_t ih_pptr; /* ICMP_PARAMPROB */ - struct in_addr ih_gwaddr; /* ICMP_REDIRECT */ + nd_uint8_t ih_pptr; /* ICMP_PARAMPROB */ + nd_ipv4 ih_gwaddr; /* ICMP_REDIRECT */ struct ih_idseq { nd_uint16_t icd_id; nd_uint16_t icd_seq; @@ -322,7 +322,7 @@ icmp_tstamp_print(u_int tstamp) sec = tstamp / 1000; min = sec / 60; sec -= min * 60; hrs = min / 60; min -= hrs * 60; - snprintf(buf, sizeof(buf), "%02u:%02u:%02u.%03u",hrs,min,sec,msec); + nd_snprintf(buf, sizeof(buf), "%02u:%02u:%02u.%03u",hrs,min,sec,msec); return buf; } @@ -347,20 +347,21 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * char buf[MAXHOSTNAMELEN + 100]; struct cksum_vec vec[1]; + ndo->ndo_protocol = "icmp"; dp = (const struct icmp *)bp; ext_dp = (const struct icmp_ext_t *)bp; ip = (const struct ip *)bp2; str = buf; - ND_TCHECK(dp->icmp_code); + ND_TCHECK_1(dp->icmp_code); icmp_type = EXTRACT_U_1(dp->icmp_type); icmp_code = EXTRACT_U_1(dp->icmp_code); switch (icmp_type) { case ICMP_ECHO: case ICMP_ECHOREPLY: - ND_TCHECK(dp->icmp_seq); - (void)snprintf(buf, sizeof(buf), "echo %s, id %u, seq %u", + ND_TCHECK_2(dp->icmp_seq); + (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), @@ -368,45 +369,45 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * break; case ICMP_UNREACH: - ND_TCHECK(dp->icmp_ip.ip_dst); + ND_TCHECK_4(dp->icmp_ip.ip_dst); switch (icmp_code) { case ICMP_UNREACH_PROTOCOL: ND_TCHECK_1(dp->icmp_ip.ip_p); - (void)snprintf(buf, sizeof(buf), - "%s protocol %d unreachable", - ipaddr_string(ndo, &dp->icmp_ip.ip_dst), + (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)); break; case ICMP_UNREACH_PORT: - ND_TCHECK(dp->icmp_ip.ip_p); + ND_TCHECK_1(dp->icmp_ip.ip_p); oip = &dp->icmp_ip; hlen = IP_HL(oip) * 4; ouh = (const struct udphdr *)(((const u_char *)oip) + hlen); - ND_TCHECK(ouh->uh_dport); + ND_TCHECK_2(ouh->uh_dport); dport = EXTRACT_BE_U_2(ouh->uh_dport); ip_proto = EXTRACT_U_1(oip->ip_p); switch (ip_proto) { case IPPROTO_TCP: - (void)snprintf(buf, sizeof(buf), + (void)nd_snprintf(buf, sizeof(buf), "%s tcp port %s unreachable", - ipaddr_string(ndo, &oip->ip_dst), + ipaddr_string(ndo, oip->ip_dst), tcpport_string(ndo, dport)); break; case IPPROTO_UDP: - (void)snprintf(buf, sizeof(buf), + (void)nd_snprintf(buf, sizeof(buf), "%s udp port %s unreachable", - ipaddr_string(ndo, &oip->ip_dst), + ipaddr_string(ndo, oip->ip_dst), udpport_string(ndo, dport)); break; default: - (void)snprintf(buf, sizeof(buf), + (void)nd_snprintf(buf, sizeof(buf), "%s protocol %u port %u unreachable", - ipaddr_string(ndo, &oip->ip_dst), + ipaddr_string(ndo, oip->ip_dst), ip_proto, dport); break; } @@ -418,33 +419,33 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * mp = (const struct mtu_discovery *)(const u_char *)&dp->icmp_void; mtu = EXTRACT_BE_U_2(mp->nexthopmtu); if (mtu) { - (void)snprintf(buf, sizeof(buf), - "%s unreachable - need to frag (mtu %d)", - ipaddr_string(ndo, &dp->icmp_ip.ip_dst), mtu); + (void)nd_snprintf(buf, sizeof(buf), + "%s unreachable - need to frag (mtu %u)", + ipaddr_string(ndo, dp->icmp_ip.ip_dst), mtu); } else { - (void)snprintf(buf, sizeof(buf), + (void)nd_snprintf(buf, sizeof(buf), "%s unreachable - need to frag", - ipaddr_string(ndo, &dp->icmp_ip.ip_dst)); + ipaddr_string(ndo, dp->icmp_ip.ip_dst)); } } break; default: - fmt = tok2str(unreach2str, "#%d %%s unreachable", + fmt = tok2str(unreach2str, "#%u %%s unreachable", icmp_code); - (void)snprintf(buf, sizeof(buf), fmt, - ipaddr_string(ndo, &dp->icmp_ip.ip_dst)); + (void)nd_snprintf(buf, sizeof(buf), fmt, + ipaddr_string(ndo, dp->icmp_ip.ip_dst)); break; } break; case ICMP_REDIRECT: - ND_TCHECK(dp->icmp_ip.ip_dst); - fmt = tok2str(type2str, "redirect-#%d %%s to net %%s", + ND_TCHECK_4(dp->icmp_ip.ip_dst); + fmt = tok2str(type2str, "redirect-#%u %%s to net %%s", icmp_code); - (void)snprintf(buf, sizeof(buf), fmt, - ipaddr_string(ndo, &dp->icmp_ip.ip_dst), - ipaddr_string(ndo, &dp->icmp_gwaddr)); + (void)nd_snprintf(buf, sizeof(buf), fmt, + ipaddr_string(ndo, dp->icmp_ip.ip_dst), + ipaddr_string(ndo, dp->icmp_gwaddr)); break; case ICMP_ROUTERADVERT: @@ -453,22 +454,22 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * const struct id_rdiscovery *idp; u_int lifetime, num, size; - (void)snprintf(buf, sizeof(buf), "router advertisement"); + (void)nd_snprintf(buf, sizeof(buf), "router advertisement"); cp = buf + strlen(buf); ihp = (const struct ih_rdiscovery *)&dp->icmp_void; - ND_TCHECK(*ihp); + ND_TCHECK_SIZE(ihp); (void)strncpy(cp, " lifetime ", sizeof(buf) - (cp - buf)); cp = buf + strlen(buf); lifetime = EXTRACT_BE_U_2(ihp->ird_lifetime); if (lifetime < 60) { - (void)snprintf(cp, sizeof(buf) - (cp - buf), "%u", + (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), "%u", lifetime); } else if (lifetime < 60 * 60) { - (void)snprintf(cp, sizeof(buf) - (cp - buf), "%u:%02u", + (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), "%u:%02u", lifetime / 60, lifetime % 60); } else { - (void)snprintf(cp, sizeof(buf) - (cp - buf), + (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), "%u:%02u:%02u", lifetime / 3600, (lifetime % 3600) / 60, @@ -477,20 +478,20 @@ 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); - (void)snprintf(cp, sizeof(buf) - (cp - buf), " %d:", num); + (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), " %u:", num); cp = buf + strlen(buf); size = EXTRACT_U_1(ihp->ird_addrsiz); if (size != 2) { - (void)snprintf(cp, sizeof(buf) - (cp - buf), - " [size %d]", size); + (void)nd_snprintf(cp, sizeof(buf) - (cp - buf), + " [size %u]", size); break; } idp = (const struct id_rdiscovery *)&dp->icmp_data; while (num-- > 0) { - ND_TCHECK(*idp); - (void)snprintf(cp, sizeof(buf) - (cp - buf), " {%s %u}", - ipaddr_string(ndo, &idp->ird_addr), + 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)); cp = buf + strlen(buf); ++idp; @@ -499,7 +500,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * break; case ICMP_TIMXCEED: - ND_TCHECK(dp->icmp_ip.ip_dst); + ND_TCHECK_4(dp->icmp_ip.ip_dst); switch (icmp_code) { case ICMP_TIMXCEED_INTRANS: @@ -511,7 +512,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * break; default: - (void)snprintf(buf, sizeof(buf), "time exceeded-#%u", + (void)nd_snprintf(buf, sizeof(buf), "time exceeded-#%u", icmp_code); break; } @@ -519,48 +520,48 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * case ICMP_PARAMPROB: if (icmp_code) - (void)snprintf(buf, sizeof(buf), + (void)nd_snprintf(buf, sizeof(buf), "parameter problem - code %u", icmp_code); else { - ND_TCHECK(dp->icmp_pptr); - (void)snprintf(buf, sizeof(buf), + ND_TCHECK_1(dp->icmp_pptr); + (void)nd_snprintf(buf, sizeof(buf), "parameter problem - octet %u", EXTRACT_U_1(dp->icmp_pptr)); } break; case ICMP_MASKREPLY: - ND_TCHECK(dp->icmp_mask); - (void)snprintf(buf, sizeof(buf), "address mask is 0x%08x", + ND_TCHECK_4(dp->icmp_mask); + (void)nd_snprintf(buf, sizeof(buf), "address mask is 0x%08x", EXTRACT_BE_U_4(dp->icmp_mask)); break; case ICMP_TSTAMP: - ND_TCHECK(dp->icmp_seq); - (void)snprintf(buf, sizeof(buf), + 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)); break; case ICMP_TSTAMPREPLY: - ND_TCHECK(dp->icmp_ttime); - (void)snprintf(buf, sizeof(buf), + 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))); - (void)snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", recv %s", + (void)nd_snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", recv %s", icmp_tstamp_print(EXTRACT_BE_U_4(dp->icmp_rtime))); - (void)snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", xmit %s", + (void)nd_snprintf(buf+strlen(buf),sizeof(buf)-strlen(buf),", xmit %s", icmp_tstamp_print(EXTRACT_BE_U_4(dp->icmp_ttime))); break; default: - str = tok2str(icmp2str, "type-#%d", icmp_type); + str = tok2str(icmp2str, "type-#%u", icmp_type); break; } - ND_PRINT((ndo, "ICMP %s, length %u", str, plen)); + ND_PRINT("ICMP %s, length %u", str, plen); if (ndo->ndo_vflag && !fragmented) { /* don't attempt checksumming if this is a frag */ if (ND_TTEST_LEN(bp, plen)) { uint16_t sum; @@ -570,9 +571,9 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * sum = in_cksum(vec, 1); if (sum != 0) { uint16_t icmp_sum = EXTRACT_BE_U_2(dp->icmp_cksum); - ND_PRINT((ndo, " (wrong icmp cksum %x (->%x)!)", + ND_PRINT(" (wrong icmp cksum %x (->%x)!)", icmp_sum, - in_cksum_shouldbe(icmp_sum, sum))); + in_cksum_shouldbe(icmp_sum, sum)); } } } @@ -583,7 +584,7 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * */ if (ndo->ndo_vflag >= 1 && ICMP_ERRTYPE(icmp_type)) { bp += 8; - ND_PRINT((ndo, "\n\t")); + ND_PRINT("\n\t"); ip = (const struct ip *)bp; snapend_save = ndo->ndo_snapend; ND_TCHECK_2(ip->ip_len); @@ -591,12 +592,15 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * ndo->ndo_snapend = snapend_save; } + /* ndo_protocol reassignment after ip_print() call */ + ndo->ndo_protocol = "icmp"; + /* * Attempt to decode the MPLS extensions only for some ICMP types. */ if (ndo->ndo_vflag >= 1 && plen > ICMP_EXTD_MINLEN && ICMP_MPLS_EXT_TYPE(icmp_type)) { - ND_TCHECK(*ext_dp); + ND_TCHECK_SIZE(ext_dp); /* * Check first if the mpls extension header shows a non-zero length. @@ -613,15 +617,15 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * } } - ND_PRINT((ndo, "\n\tMPLS extension v%u", - ICMP_MPLS_EXT_EXTRACT_VERSION(*(ext_dp->icmp_ext_version_res)))); + ND_PRINT("\n\tMPLS extension v%u", + ICMP_MPLS_EXT_EXTRACT_VERSION(*(ext_dp->icmp_ext_version_res))); /* * Sanity checking of the header. */ if (ICMP_MPLS_EXT_EXTRACT_VERSION(*(ext_dp->icmp_ext_version_res)) != ICMP_MPLS_EXT_VERSION) { - ND_PRINT((ndo, " packet not supported")); + ND_PRINT(" packet not supported"); return; } @@ -629,10 +633,10 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * if (ND_TTEST_LEN(ext_dp->icmp_ext_version_res, hlen)) { vec[0].ptr = (const uint8_t *)(const void *)&ext_dp->icmp_ext_version_res; vec[0].len = hlen; - ND_PRINT((ndo, ", checksum 0x%04x (%scorrect), length %u", + ND_PRINT(", checksum 0x%04x (%scorrect), length %u", EXTRACT_BE_U_2(ext_dp->icmp_ext_checksum), in_cksum(vec, 1) ? "in" : "", - hlen)); + hlen); } hlen -= 4; /* subtract common header size */ @@ -641,17 +645,17 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * while (hlen > sizeof(struct icmp_mpls_ext_object_header_t)) { icmp_mpls_ext_object_header = (const struct icmp_mpls_ext_object_header_t *)obj_tptr; - ND_TCHECK(*icmp_mpls_ext_object_header); + 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_tptr += sizeof(struct icmp_mpls_ext_object_header_t); - ND_PRINT((ndo, "\n\t %s Object (%u), Class-Type: %u, length %u", + ND_PRINT("\n\t %s Object (%u), Class-Type: %u, length %u", tok2str(icmp_mpls_ext_obj_values,"unknown",obj_class_num), obj_class_num, obj_ctype, - obj_tlen)); + obj_tlen); hlen-=sizeof(struct icmp_mpls_ext_object_header_t); /* length field includes tlv header */ @@ -668,10 +672,10 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * case 1: ND_TCHECK_4(obj_tptr); raw_label = EXTRACT_BE_U_4(obj_tptr); - ND_PRINT((ndo, "\n\t label %u, exp %u", MPLS_LABEL(raw_label), MPLS_EXP(raw_label))); + ND_PRINT("\n\t label %u, exp %u", MPLS_LABEL(raw_label), MPLS_EXP(raw_label)); if (MPLS_STACK(raw_label)) - ND_PRINT((ndo, ", [S]")); - ND_PRINT((ndo, ", ttl %u", MPLS_TTL(raw_label))); + ND_PRINT(", [S]"); + ND_PRINT(", ttl %u", MPLS_TTL(raw_label)); break; default: print_unknown_data(ndo, obj_tptr, "\n\t ", obj_tlen); @@ -696,11 +700,5 @@ icmp_print(netdissect_options *ndo, const u_char *bp, u_int plen, const u_char * return; trunc: - ND_PRINT((ndo, "[|icmp]")); + nd_print_trunc(ndo); } -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */