X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8b67f771343e94182b048b0cae3ffe164dc37bb9..4890d02f2cbdfd68f0dfb8ce7123fb61b4a591d4:/print-icmp.c diff --git a/print-icmp.c b/print-icmp.c index 4c1545f6..1ae85482 100644 --- a/print-icmp.c +++ b/print-icmp.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.52 2000-09-28 06:43:00 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-icmp.c,v 1.59 2001-06-15 22:17:32 fenner Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -36,10 +36,10 @@ struct mbuf; struct rtentry; #include -#include #include #include +#include /* for MAXHOSTNAMELEN on some platforms */ #include "interface.h" #include "addrtoname.h" @@ -57,22 +57,22 @@ struct rtentry; * Structure of an icmp header. */ struct icmp { - u_char icmp_type; /* type of message, see below */ - u_char icmp_code; /* type sub code */ - u_short icmp_cksum; /* ones complement cksum of struct */ + u_int8_t icmp_type; /* type of message, see below */ + u_int8_t icmp_code; /* type sub code */ + u_int16_t icmp_cksum; /* ones complement cksum of struct */ union { - u_char ih_pptr; /* ICMP_PARAMPROB */ + u_int8_t ih_pptr; /* ICMP_PARAMPROB */ struct in_addr ih_gwaddr; /* ICMP_REDIRECT */ struct ih_idseq { - n_short icd_id; - n_short icd_seq; + u_int16_t icd_id; + u_int16_t icd_seq; } ih_idseq; - int ih_void; + u_int32_t ih_void; /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */ struct ih_pmtu { - n_short ipm_void; - n_short ipm_nextmtu; + u_int16_t ipm_void; + u_int16_t ipm_nextmtu; } ih_pmtu; } icmp_hun; #define icmp_pptr icmp_hun.ih_pptr @@ -84,16 +84,16 @@ struct icmp { #define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu union { struct id_ts { - n_time its_otime; - n_time its_rtime; - n_time its_ttime; + u_int32_t its_otime; + u_int32_t its_rtime; + u_int32_t its_ttime; } id_ts; struct id_ip { struct ip idi_ip; /* options and then 64 bits of data */ } id_ip; - u_int id_mask; - char id_data[1]; + u_int32_t id_mask; + u_int8_t id_data[1]; } icmp_dun; #define icmp_otime icmp_dun.id_ts.its_otime #define icmp_rtime icmp_dun.id_ts.its_rtime @@ -112,10 +112,10 @@ struct icmp { * ip header length. */ #define ICMP_MINLEN 8 /* abs minimum */ -#define ICMP_TSLEN (8 + 3 * sizeof (n_time)) /* timestamp */ +#define ICMP_TSLEN (8 + 3 * sizeof (u_int32_t)) /* timestamp */ #define ICMP_MASKLEN 12 /* address mask */ #define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */ -#define ICMP_ADVLEN(p) (8 + ((p)->icmp_ip.ip_hl << 2) + 8) +#define ICMP_ADVLEN(p) (8 + (IP_HL(&(p)->icmp_ip) << 2) + 8) /* N.B.: must separately check that ip_hl >= 5 */ /* @@ -251,15 +251,15 @@ static struct tok type2str[] = { /* rfc1191 */ struct mtu_discovery { - short unused; - short nexthopmtu; + u_int16_t unused; + u_int16_t nexthopmtu; }; /* rfc1256 */ struct ih_rdiscovery { - u_char ird_addrnum; - u_char ird_addrsiz; - u_short ird_lifetime; + u_int8_t ird_addrnum; + u_int8_t ird_addrsiz; + u_int16_t ird_lifetime; }; struct id_rdiscovery { @@ -277,18 +277,12 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2) register const struct ip *oip; register const struct udphdr *ouh; register u_int hlen, dport, mtu; - char buf[256]; + char buf[MAXHOSTNAMELEN + 100]; dp = (struct icmp *)bp; ip = (struct ip *)bp2; str = buf; -#if 0 - (void)printf("%s > %s: ", - ipaddr_string(&ip->ip_src), - ipaddr_string(&ip->ip_dst)); -#endif - TCHECK(dp->icmp_code); switch (dp->icmp_type) { @@ -307,7 +301,7 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2) case ICMP_UNREACH_PORT: TCHECK(dp->icmp_ip.ip_p); oip = &dp->icmp_ip; - hlen = oip->ip_hl * 4; + hlen = IP_HL(oip) * 4; ouh = (struct udphdr *)(((u_char *)oip) + hlen); dport = ntohs(ouh->uh_dport); switch (oip->ip_p) { @@ -339,12 +333,12 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2) { register const struct mtu_discovery *mp; mp = (struct mtu_discovery *)&dp->icmp_void; - mtu = EXTRACT_16BITS(&mp->nexthopmtu); - if (mtu) { + mtu = EXTRACT_16BITS(&mp->nexthopmtu); + if (mtu) { (void)snprintf(buf, sizeof(buf), "%s unreachable - need to frag (mtu %d)", ipaddr_string(&dp->icmp_ip.ip_dst), mtu); - } else { + } else { (void)snprintf(buf, sizeof(buf), "%s unreachable - need to frag", ipaddr_string(&dp->icmp_ip.ip_dst)); @@ -459,14 +453,16 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2) case ICMP_TSTAMP: TCHECK(dp->icmp_seq); - (void)sprintf(buf, "time stamp query id %u seq %u", + (void)snprintf(buf, sizeof(buf), + "time stamp query id %u seq %u", (unsigned)ntohs(dp->icmp_id), (unsigned)ntohs(dp->icmp_seq)); break; case ICMP_TSTAMPREPLY: TCHECK(dp->icmp_ttime); - (void)sprintf(buf, "time stamp reply id %u seq %u : org 0x%lx recv 0x%lx xmit 0x%lx", + (void)snprintf(buf, sizeof(buf), + "time stamp reply id %u seq %u : org 0x%lx recv 0x%lx xmit 0x%lx", (unsigned)ntohs(dp->icmp_id), (unsigned)ntohs(dp->icmp_seq), (unsigned long)ntohl(dp->icmp_otime), @@ -478,7 +474,7 @@ icmp_print(register const u_char *bp, u_int plen, register const u_char *bp2) str = tok2str(icmp2str, "type-#%d", dp->icmp_type); break; } - (void)printf("icmp: %s", str); + (void)printf("icmp: %s", str); if (vflag) { if (TTEST2(*bp, plen)) { if (in_cksum((u_short*)dp, plen, 0))