#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.70 1999-10-30 05:11:14 itojun Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.78 1999-12-15 00:34:10 fenner Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#include <sys/param.h>
u_int tr_src; /* traceroute source */
u_int tr_dst; /* traceroute destination */
u_int tr_raddr; /* traceroute response address */
-#if defined(WORDS_BIGENDIAN) || (defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN))
- struct {
- u_int ttl : 8; /* traceroute response ttl */
- u_int qid : 24; /* traceroute query id */
- } q;
-#else
- struct {
- u_int qid : 24; /* traceroute query id */
- u_int ttl : 8; /* traceroute response ttl */
- } q;
-#endif
+ u_int tr_rttlqid; /* response ttl and qid */
};
-#define tr_rttl q.ttl
-#define tr_qid q.qid
+#define TR_GETTTL(x) (int)(((x) >> 24) & 0xff)
+#define TR_GETQID(x) ((x) & 0x00ffffff)
/*
* Traceroute response format. A traceroute response has a tr_query at the
{
register struct tr_query *tr = (struct tr_query *)(bp + 8);
- printf("mtrace %d: %s to %s reply-to %s", tr->tr_qid,
+ printf("mtrace %ld: %s to %s reply-to %s",
+ TR_GETQID(ntohl(tr->tr_rttlqid)),
ipaddr_string(&tr->tr_src), ipaddr_string(&tr->tr_dst),
ipaddr_string(&tr->tr_raddr));
if (IN_CLASSD(ntohl(tr->tr_raddr)))
- printf(" with-ttl %d", tr->tr_rttl);
+ printf(" with-ttl %d", TR_GETTTL(ntohl(tr->tr_rttlqid)));
}
static void print_mresp(register const u_char *bp, register u_int len)
{
register struct tr_query *tr = (struct tr_query *)(bp + 8);
- printf("mresp %d: %s to %s reply-to %s", tr->tr_qid,
+ printf("mresp %ld: %s to %s reply-to %s",
+ TR_GETQID(ntohl(tr->tr_rttlqid)),
ipaddr_string(&tr->tr_src), ipaddr_string(&tr->tr_dst),
ipaddr_string(&tr->tr_raddr));
if (IN_CLASSD(ntohl(tr->tr_raddr)))
- printf(" with-ttl %d", tr->tr_rttl);
+ printf(" with-ttl %d", TR_GETTTL(ntohl(tr->tr_rttlqid)));
}
static void
ipaddr_string(&ip->ip_src),
ipaddr_string(&ip->ip_dst));
+ if (qflag) {
+ (void)printf("igmp");
+ return;
+ }
+
TCHECK2(bp[0], 8);
switch (bp[0]) {
case 0x11:
(void)printf("igmp query");
- if (*(int *)&bp[4])
+ if (EXTRACT_32BITS(&bp[4]))
(void)printf(" [gaddr %s]", ipaddr_string(&bp[4]));
if (len != 8)
(void)printf(" [len %d]", len);
break;
case 0x12:
- (void)printf("igmp report %s", ipaddr_string(&bp[4]));
+ (void)printf("igmp v1 report %s", ipaddr_string(&bp[4]));
if (len != 8)
(void)printf(" [len %d]", len);
break;
case 0x16:
- (void)printf("igmp nreport %s", ipaddr_string(&bp[4]));
+ (void)printf("igmp v2 report %s", ipaddr_string(&bp[4]));
break;
case 0x17:
(void)printf("igmp leave %s", ipaddr_string(&bp[4]));
dvmrp_print(bp, len);
break;
case 0x14:
- (void)printf("igmp pim");
- igmp_pim_print(bp, len);
+ (void)printf("igmp pimv1");
+ pimv1_print(bp, len);
break;
case 0x1e:
print_mresp(bp, len);
print_mtrace(bp, len);
break;
default:
- (void)printf("igmp-%d", bp[0] & 0xf);
+ (void)printf("igmp-%d", bp[0]);
break;
}
- if ((bp[0] >> 4) != 1)
- (void)printf(" [v%d]", bp[0] >> 4);
- TCHECK2(bp[0], len);
- if (vflag) {
+ if (vflag && TTEST2(bp[0], len)) {
/* Check the IGMP checksum */
- u_int32_t sum = 0;
- int count;
- const u_short *sp = (u_short *)bp;
-
- for (count = len / 2; --count >= 0; )
- sum += *sp++;
- if (len & 1)
- sum += ntohs(*(u_char *) sp << 8);
- while (sum >> 16)
- sum = (sum & 0xffff) + (sum >> 16);
- sum = 0xffff & ~sum;
- if (sum != 0)
+ if (in_cksum((const u_short*)bp, len, 0))
printf(" bad igmp cksum %x!", EXTRACT_16BITS(&bp[2]));
}
return;
printf("%s}", ptr == len? "#" : "");
}
+static void
+ip_printts(register const u_char *cp, u_int length)
+{
+ register u_int ptr = cp[2] - 1;
+ register u_int len = 0;
+ int hoplen;
+ char *type;
+
+ printf(" TS{");
+ hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
+ if ((length - 4) & (hoplen-1))
+ printf("[bad length %d]", length);
+ if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
+ printf("[bad ptr %d]", cp[2]);
+ switch (cp[3]&0xF) {
+ case IPOPT_TS_TSONLY:
+ printf("TSONLY");
+ break;
+ case IPOPT_TS_TSANDADDR:
+ printf("TS+ADDR");
+ break;
+ /*
+ * prespecified should really be 3, but some ones might send 2
+ * instead, and the IPOPT_TS_PRESPEC constant can apparently
+ * have both values, so we have to hard-code it here.
+ */
+
+ case 2:
+ printf("PRESPEC2.0");
+ break;
+ case 3: /* IPOPT_TS_PRESPEC */
+ printf("PRESPEC");
+ break;
+ default:
+ printf("[bad ts type %d]", cp[3]&0xF);
+ goto done;
+ }
+
+ type = " ";
+ for (len = 4; len < length; len += hoplen) {
+ if (ptr == len)
+ type = " ^ ";
+ printf("%s%d@%s", type, EXTRACT_32BITS(&cp[len+hoplen-4]),
+ hoplen!=8 ? "" : ipaddr_string(&cp[len]));
+ type = " ";
+ }
+
+done:
+ printf("%s", ptr == len ? " ^ " : "");
+
+ if (cp[3]>>4)
+ printf(" [%d hops not recorded]} ", cp[3]>>4);
+ else
+ printf("}");
+}
+
/*
* print IP options.
*/
break;
case IPOPT_TS:
- printf(" TS{%d}", len);
+ ip_printts(cp, len);
break;
+#ifndef IPOPT_SECURITY
+#define IPOPT_SECURITY 130
+#endif /* IPOPT_SECURITY */
case IPOPT_SECURITY:
printf(" SECURITY{%d}", len);
break;
case IPOPT_RR:
- printf(" RR{%d}=", len);
ip_printroute("RR", cp, len);
break;
ip_printroute("LSRR", cp, len);
break;
+#ifndef IPOPT_RA
+#define IPOPT_RA 148 /* router alert */
+#endif
+ case IPOPT_RA:
+ printf(" RA");
+ if (len != 4)
+ printf("{%d}", len);
+ else if (cp[2] || cp[3])
+ printf("%d.%d", cp[2], cp[3]);
+ break;
+
default:
printf(" IPOPT-%d{%d}", cp[0], len);
break;
* compute an IP header checksum.
* don't modifiy the packet.
*/
-static int
-in_cksum(const struct ip *ip)
+u_short
+in_cksum(const u_short *addr, register int len, u_short csum)
{
- register const u_short *sp = (u_short *)ip;
- register u_int32_t sum = 0;
- register int count;
+ int nleft = len;
+ const u_short *w = addr;
+ u_short answer;
+ int sum = csum;
+
+ /*
+ * Our algorithm is simple, using a 32 bit accumulator (sum),
+ * we add sequential 16 bit words to it, and at the end, fold
+ * back all the carry bits from the top 16 bits into the lower
+ * 16 bits.
+ */
+ while (nleft > 1) {
+ sum += *w++;
+ nleft -= 2;
+ }
+ if (nleft == 1)
+ sum += htons(*(u_char *)w<<8);
/*
- * No need for endian conversions.
+ * add back carry outs from top 16 bits to low 16 bits
*/
- for (count = ip->ip_hl * 2; --count >= 0; )
- sum += *sp++;
- while (sum > 0xffff)
- sum = (sum & 0xffff) + (sum >> 16);
- sum = ~sum & 0xffff;
-
- return (sum);
+ sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */
+ sum += (sum >> 16); /* add carry */
+ answer = ~sum; /* truncate to 16 bits */
+ return (answer);
}
/*
again:
switch (nh) {
+#ifndef IPPROTO_AH
+#define IPPROTO_AH 51
+#endif
case IPPROTO_AH:
nh = *cp;
advance = ah_print(cp, (const u_char *)ip);
len -= advance;
goto again;
+#ifndef IPPROTO_ESP
+#define IPPROTO_ESP 50
+#endif
case IPPROTO_ESP:
{
int enh;
break;
case IPPROTO_ICMP:
- icmp_print(cp, (const u_char *)ip);
+ icmp_print(cp, len, (const u_char *)ip);
break;
#ifndef IPPROTO_IGRP
}
break;
+#ifndef IPPROTO_PIM
+#define IPPROTO_PIM 103
+#endif
case IPPROTO_PIM:
pim_print(cp, len);
break;
}
}
+ /* Ultra quiet now means that all this stuff should be suppressed */
+ /* res 3-Nov-98 */
+ if (qflag > 1) return;
+
+
/*
* for fragmented datagrams, print id:size@offset. On all
* but the last stick a "+". For unfragmented datagrams, note
if (off & 0x1fff)
(void)printf("%s > %s:", ipaddr_string(&ip->ip_src),
ipaddr_string(&ip->ip_dst));
+#ifndef IP_MF
+#define IP_MF 0x2000
+#endif /* IP_MF */
+#ifndef IP_DF
+#define IP_DF 0x4000
+#endif /* IP_DF */
(void)printf(" (frag %d:%u@%d%s)", ntohs(ip->ip_id), len,
(off & 0x1fff) * 8,
(off & IP_MF)? "+" : "");
+
} else if (off & IP_DF)
(void)printf(" (DF)");
- if (ip->ip_tos)
- (void)printf(" [tos 0x%x]", (int)ip->ip_tos);
+ if (ip->ip_tos) {
+ (void)printf(" [tos 0x%x", (int)ip->ip_tos);
+ /* ECN bits */
+ if (ip->ip_tos&0x02) {
+ (void)printf(",ECT");
+ if (ip->ip_tos&0x01)
+ (void)printf(",CE");
+ }
+ (void)printf("] ");
+ }
+
if (ip->ip_ttl <= 1)
(void)printf(" [ttl %d]", (int)ip->ip_ttl);
sep = ", ";
}
if ((u_char *)ip + hlen <= snapend) {
- sum = in_cksum(ip);
+ sum = in_cksum((const u_short *)ip, hlen, 0);
if (sum != 0) {
(void)printf("%sbad cksum %x!", sep,
ntohs(ip->ip_sum));
projects / tcpdump / blobdiff