* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.94 2001-02-20 18:55:47 fenner Exp $ (LBL)";
-#endif
+/* \summary: IP printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include "netdissect-stdinc.h"
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
+#include "netdissect.h"
#include "addrtoname.h"
-#include "interface.h"
-#include "extract.h" /* must come after interface.h */
+#include "extract.h"
#include "ip.h"
-
-/* Compatibility */
-#ifndef IPPROTO_ND
-#define IPPROTO_ND 77
-#endif
+#include "ipproto.h"
+
+
+static const struct tok ip_option_values[] = {
+ { IPOPT_EOL, "EOL" },
+ { IPOPT_NOP, "NOP" },
+ { IPOPT_TS, "timestamp" },
+ { IPOPT_SECURITY, "security" },
+ { IPOPT_RR, "RR" },
+ { IPOPT_SSRR, "SSRR" },
+ { IPOPT_LSRR, "LSRR" },
+ { IPOPT_RA, "RA" },
+ { IPOPT_RFC1393, "traceroute" },
+ { 0, NULL }
+};
/*
* print the recorded route in an IP RR, LSRR or SSRR option.
*/
-static void
-ip_printroute(const char *type, register const u_char *cp, u_int length)
+static int
+ip_printroute(netdissect_options *ndo,
+ const u_char *cp, u_int length)
{
- register u_int ptr = cp[2] - 1;
- register u_int len;
+ u_int ptr;
+ u_int len;
- printf(" %s{", type);
+ if (length < 3) {
+ ND_PRINT(" [bad length %u]", length);
+ return (0);
+ }
if ((length + 1) & 3)
- printf(" [bad length %d]", length);
+ ND_PRINT(" [bad length %u]", length);
+ ptr = GET_U_1(cp + 2) - 1;
if (ptr < 3 || ((ptr + 1) & 3) || ptr > length + 1)
- printf(" [bad ptr %d]", cp[2]);
+ ND_PRINT(" [bad ptr %u]", GET_U_1(cp + 2));
- type = "";
for (len = 3; len < length; len += 4) {
- if (ptr == len)
- type = "#";
- printf("%s%s", type, ipaddr_string(&cp[len]));
- type = " ";
+ ND_PRINT(" %s", GET_IPADDR_STRING(cp + len));
+ if (ptr > len)
+ ND_PRINT(",");
+ }
+ return (0);
+}
+
+/*
+ * If source-routing is present and valid, return the final destination.
+ * Otherwise, return IP destination.
+ *
+ * This is used for UDP and TCP pseudo-header in the checksum
+ * calculation.
+ */
+static uint32_t
+ip_finddst(netdissect_options *ndo,
+ const struct ip *ip)
+{
+ u_int length;
+ u_int len;
+ const u_char *cp;
+
+ cp = (const u_char *)(ip + 1);
+ length = IP_HL(ip) * 4;
+ if (length < sizeof(struct ip))
+ goto trunc;
+ length -= sizeof(struct ip);
+
+ for (; length != 0; cp += len, length -= len) {
+ int tt;
+
+ tt = GET_U_1(cp);
+ if (tt == IPOPT_EOL)
+ break;
+ else if (tt == IPOPT_NOP)
+ len = 1;
+ else {
+ len = GET_U_1(cp + 1);
+ if (len < 2)
+ break;
+ }
+ if (length < len)
+ goto trunc;
+ ND_TCHECK_LEN(cp, len);
+ switch (tt) {
+
+ case IPOPT_SSRR:
+ case IPOPT_LSRR:
+ if (len < 7)
+ break;
+ return (GET_IPV4_TO_NETWORK_ORDER(cp + len - 4));
+ }
}
- printf("%s}", ptr == len? "#" : "");
+trunc:
+ return (GET_IPV4_TO_NETWORK_ORDER(ip->ip_dst));
}
-static void
-ip_printts(register const u_char *cp, u_int length)
+/*
+ * Compute a V4-style checksum by building a pseudoheader.
+ */
+uint16_t
+nextproto4_cksum(netdissect_options *ndo,
+ const struct ip *ip, const uint8_t *data,
+ u_int len, u_int covlen, uint8_t next_proto)
{
- register u_int ptr = cp[2] - 1;
- register u_int len = 0;
- int hoplen;
- char *type;
+ struct phdr {
+ uint32_t src;
+ uint32_t dst;
+ uint8_t mbz;
+ uint8_t proto;
+ uint16_t len;
+ } ph;
+ struct cksum_vec vec[2];
+
+ /* pseudo-header.. */
+ ph.len = htons((uint16_t)len);
+ ph.mbz = 0;
+ ph.proto = next_proto;
+ ph.src = GET_IPV4_TO_NETWORK_ORDER(ip->ip_src);
+ if (IP_HL(ip) == 5)
+ ph.dst = GET_IPV4_TO_NETWORK_ORDER(ip->ip_dst);
+ else
+ ph.dst = ip_finddst(ndo, ip);
- printf(" TS{");
- hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
+ vec[0].ptr = (const uint8_t *)(void *)&ph;
+ vec[0].len = sizeof(ph);
+ vec[1].ptr = data;
+ vec[1].len = covlen;
+ return (in_cksum(vec, 2));
+}
+
+static int
+ip_printts(netdissect_options *ndo,
+ const u_char *cp, u_int length)
+{
+ u_int ptr;
+ u_int len;
+ u_int hoplen;
+ const char *type;
+
+ if (length < 4) {
+ ND_PRINT("[bad length %u]", length);
+ return (0);
+ }
+ ND_PRINT(" TS{");
+ hoplen = ((GET_U_1(cp + 3) & 0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
if ((length - 4) & (hoplen-1))
- printf("[bad length %d]", length);
+ ND_PRINT("[bad length %u]", length);
+ ptr = GET_U_1(cp + 2) - 1;
+ len = 0;
if (ptr < 4 || ((ptr - 4) & (hoplen-1)) || ptr > length + 1)
- printf("[bad ptr %d]", cp[2]);
- switch (cp[3]&0xF) {
+ ND_PRINT("[bad ptr %u]", GET_U_1(cp + 2));
+ switch (GET_U_1(cp + 3)&0xF) {
case IPOPT_TS_TSONLY:
- printf("TSONLY");
+ ND_PRINT("TSONLY");
break;
case IPOPT_TS_TSANDADDR:
- printf("TS+ADDR");
+ ND_PRINT("TS+ADDR");
break;
/*
* prespecified should really be 3, but some ones might send 2
*/
case 2:
- printf("PRESPEC2.0");
+ ND_PRINT("PRESPEC2.0");
break;
case 3: /* IPOPT_TS_PRESPEC */
- printf("PRESPEC");
+ ND_PRINT("PRESPEC");
break;
- default:
- printf("[bad ts type %d]", cp[3]&0xF);
+ default:
+ ND_PRINT("[bad ts type %u]", GET_U_1(cp + 3)&0xF);
goto done;
}
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]));
+ ND_TCHECK_LEN(cp + len, hoplen);
+ ND_PRINT("%s%u@%s", type, GET_BE_U_4(cp + len + hoplen - 4),
+ hoplen!=8 ? "" : GET_IPADDR_STRING(cp + len));
type = " ";
}
done:
- printf("%s", ptr == len ? " ^ " : "");
+ ND_PRINT("%s", ptr == len ? " ^ " : "");
- if (cp[3]>>4)
- printf(" [%d hops not recorded]} ", cp[3]>>4);
+ if (GET_U_1(cp + 3) >> 4)
+ ND_PRINT(" [%u hops not recorded]} ", GET_U_1(cp + 3)>>4);
else
- printf("}");
+ ND_PRINT("}");
+ return (0);
+
+trunc:
+ return (-1);
}
/*
* print IP options.
+ If truncated return -1, else 0.
*/
-static void
-ip_optprint(register const u_char *cp, u_int length)
+static int
+ip_optprint(netdissect_options *ndo,
+ const u_char *cp, u_int length)
{
- register u_int len;
+ u_int option_len;
+ const char *sep = "";
- for (; length > 0; cp += len, length -= len) {
- int tt = *cp;
+ for (; length > 0; cp += option_len, length -= option_len) {
+ u_int option_code;
+
+ ND_PRINT("%s", sep);
+ sep = ",";
+
+ option_code = GET_U_1(cp);
+
+ ND_PRINT("%s",
+ tok2str(ip_option_values,"unknown %u",option_code));
+
+ if (option_code == IPOPT_NOP ||
+ option_code == IPOPT_EOL)
+ option_len = 1;
- if (tt == IPOPT_NOP || tt == IPOPT_EOL)
- len = 1;
else {
- if (&cp[1] >= snapend) {
- printf("[|ip]");
- return;
+ option_len = GET_U_1(cp + 1);
+ if (option_len < 2) {
+ ND_PRINT(" [bad length %u]", option_len);
+ return 0;
}
- len = cp[1];
- }
- if (len <= 0) {
- printf("[|ip op len %d]", len);
- return;
}
- if (&cp[1] >= snapend || cp + len > snapend) {
- printf("[|ip]");
- return;
+
+ if (option_len > length) {
+ ND_PRINT(" [bad length %u]", option_len);
+ return 0;
}
- switch (tt) {
- case IPOPT_EOL:
- printf(" EOL");
- if (length > 1)
- printf("-%d", length - 1);
- return;
+ ND_TCHECK_LEN(cp, option_len);
- case IPOPT_NOP:
- printf(" NOP");
- break;
+ switch (option_code) {
+ case IPOPT_EOL:
+ return 0;
case IPOPT_TS:
- 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:
- ip_printroute("RR", cp, len);
+ if (ip_printts(ndo, cp, option_len) == -1)
+ goto trunc;
break;
+ case IPOPT_RR: /* fall through */
case IPOPT_SSRR:
- ip_printroute("SSRR", cp, len);
- break;
-
case IPOPT_LSRR:
- ip_printroute("LSRR", cp, len);
+ if (ip_printroute(ndo, cp, option_len) == -1)
+ goto trunc;
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]);
+ if (option_len < 4) {
+ ND_PRINT(" [bad length %u]", option_len);
+ break;
+ }
+ ND_TCHECK_1(cp + 3);
+ if (GET_BE_U_2(cp + 2) != 0)
+ ND_PRINT(" value %u", GET_BE_U_2(cp + 2));
break;
+ case IPOPT_NOP: /* nothing to print - fall through */
+ case IPOPT_SECURITY:
default:
- printf(" IPOPT-%d{%d}", cp[0], len);
break;
}
}
+ return 0;
+
+trunc:
+ return -1;
}
-/*
- * compute an IP header checksum.
- * don't modifiy the packet.
- */
-u_short
-in_cksum(const u_short *addr, register int len, u_short csum)
-{
- 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);
+#define IP_RES 0x8000
+
+static const struct tok ip_frag_values[] = {
+ { IP_MF, "+" },
+ { IP_DF, "DF" },
+ { IP_RES, "rsvd" }, /* The RFC3514 evil ;-) bit */
+ { 0, NULL }
+};
- /*
- * add back carry outs from top 16 bits to low 16 bits
- */
- sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */
- sum += (sum >> 16); /* add carry */
- answer = ~sum; /* truncate to 16 bits */
- return (answer);
-}
/*
* print an IP datagram.
*/
void
-ip_print(register const u_char *bp, register u_int length)
+ip_print(netdissect_options *ndo,
+ const u_char *bp,
+ u_int length)
{
- register const struct ip *ip;
- register u_int hlen, len, len0, off;
- register const u_char *cp;
- u_char nh;
- int advance;
-
+ const struct ip *ip;
+ u_int off;
+ u_int hlen;
+ u_int len;
+ struct cksum_vec vec[1];
+ uint8_t ip_tos, ip_ttl, ip_proto;
+ uint16_t sum, ip_sum;
+ const char *p_name;
+ int truncated = 0;
+
+ ndo->ndo_protocol = "ip";
ip = (const struct ip *)bp;
-#ifdef LBL_ALIGN
- /*
- * If the IP header is not aligned, copy into abuf.
- * This will never happen with BPF. It does happen raw packet
- * dumps from -r.
- */
- if ((long)ip & 3) {
- static u_char *abuf = NULL;
- static int didwarn = 0;
-
- if (abuf == NULL) {
- abuf = (u_char *)malloc(snaplen);
- if (abuf == NULL)
- error("ip_print: malloc");
- }
- memcpy((char *)abuf, (char *)ip, min(length, snaplen));
- snapend += abuf - (u_char *)ip;
- packetp = abuf;
- ip = (struct ip *)abuf;
- /* We really want libpcap to give us aligned packets */
- if (!didwarn) {
- warning("compensating for unaligned libpcap packets");
- ++didwarn;
- }
- }
-#endif
- if ((u_char *)(ip + 1) > snapend) {
- printf("[|ip]");
- return;
+ if (IP_V(ip) != 4) { /* print version and fail if != 4 */
+ if (IP_V(ip) == 6)
+ ND_PRINT("IP6, wrong link-layer encapsulation");
+ else
+ ND_PRINT("IP%u", IP_V(ip));
+ nd_print_invalid(ndo);
+ return;
}
+ if (!ndo->ndo_eflag)
+ ND_PRINT("IP ");
+
+ ND_TCHECK_SIZE(ip);
if (length < sizeof (struct ip)) {
- (void)printf("truncated-ip %d", length);
+ ND_PRINT("truncated-ip %u", length);
return;
}
hlen = IP_HL(ip) * 4;
if (hlen < sizeof (struct ip)) {
- (void)printf("bad-hlen %d", hlen);
+ ND_PRINT("bad-hlen %u", hlen);
return;
}
- len = ntohs(ip->ip_len);
+ len = GET_BE_U_2(ip->ip_len);
if (length < len)
- (void)printf("truncated-ip - %d bytes missing! ",
+ ND_PRINT("truncated-ip - %u bytes missing! ",
len - length);
- len -= hlen;
- len0 = len;
+ if (len < hlen) {
+#ifdef GUESS_TSO
+ if (len) {
+ ND_PRINT("bad-len %u", len);
+ return;
+ }
+ else {
+ /* we guess that it is a TSO send */
+ len = length;
+ }
+#else
+ ND_PRINT("bad-len %u", len);
+ return;
+#endif /* GUESS_TSO */
+ }
/*
- * If this is fragment zero, hand it to the next higher
- * level protocol.
+ * Cut off the snapshot length to the end of the IP payload.
*/
- off = ntohs(ip->ip_off);
- if ((off & 0x1fff) == 0) {
- cp = (const u_char *)ip + hlen;
- nh = ip->ip_p;
-
- if (nh != IPPROTO_TCP && nh != IPPROTO_UDP) {
- (void)printf("%s > %s: ", ipaddr_string(&ip->ip_src),
- ipaddr_string(&ip->ip_dst));
- }
-again:
- switch (nh) {
-
-#ifndef IPPROTO_AH
-#define IPPROTO_AH 51
-#endif
- case IPPROTO_AH:
- nh = *cp;
- advance = ah_print(cp, (const u_char *)ip);
- cp += advance;
- len -= advance;
- goto again;
-
-#ifndef IPPROTO_ESP
-#define IPPROTO_ESP 50
-#endif
- case IPPROTO_ESP:
- {
- int enh;
- advance = esp_print(cp, (const u_char *)ip, &enh);
- cp += advance;
- len -= advance;
- if (enh < 0)
- break;
- nh = enh & 0xff;
- goto again;
- }
-
-#ifndef IPPROTO_IPCOMP
-#define IPPROTO_IPCOMP 108
-#endif
- case IPPROTO_IPCOMP:
- {
- int enh;
- advance = ipcomp_print(cp, (const u_char *)ip, &enh);
- cp += advance;
- len -= advance;
- if (enh < 0)
- break;
- nh = enh & 0xff;
- goto again;
- }
-
- case IPPROTO_TCP:
- tcp_print(cp, len, (const u_char *)ip, (off &~ 0x6000));
- break;
-
- case IPPROTO_UDP:
- udp_print(cp, len, (const u_char *)ip, (off &~ 0x6000));
- break;
-
- case IPPROTO_ICMP:
- icmp_print(cp, len, (const u_char *)ip);
- break;
-
-#ifndef IPPROTO_IGRP
-#define IPPROTO_IGRP 9
-#endif
- case IPPROTO_IGRP:
- igrp_print(cp, len, (const u_char *)ip);
- break;
-
- case IPPROTO_ND:
-#if 0
- (void)printf("%s > %s:", ipaddr_string(&ip->ip_src),
- ipaddr_string(&ip->ip_dst));
-#endif
- (void)printf(" nd %d", len);
- break;
+ nd_push_snapend(ndo, bp + len);
- case IPPROTO_EGP:
- egp_print(cp, len, (const u_char *)ip);
- break;
-
-#ifndef IPPROTO_OSPF
-#define IPPROTO_OSPF 89
-#endif
- case IPPROTO_OSPF:
- ospf_print(cp, len, (const u_char *)ip);
- break;
-
-#ifndef IPPROTO_IGMP
-#define IPPROTO_IGMP 2
-#endif
- case IPPROTO_IGMP:
- igmp_print(cp, len, (const u_char *)ip);
- break;
-
- case 4:
- /* DVMRP multicast tunnel (ip-in-ip encapsulation) */
-#if 0
- if (vflag)
- (void)printf("%s > %s: ",
- ipaddr_string(&ip->ip_src),
- ipaddr_string(&ip->ip_dst));
-#endif
- ip_print(cp, len);
- if (! vflag) {
- printf(" (ipip)");
- return;
- }
- break;
-
-#ifdef INET6
-#ifndef IP6PROTO_ENCAP
-#define IP6PROTO_ENCAP 41
-#endif
- case IP6PROTO_ENCAP:
- /* ip6-in-ip encapsulation */
-#if 0
- if (vflag)
- (void)printf("%s > %s: ",
- ipaddr_string(&ip->ip_src),
- ipaddr_string(&ip->ip_dst));
-#endif
- ip6_print(cp, len);
- if (! vflag) {
- printf(" (encap)");
- return;
- }
- break;
-#endif /*INET6*/
-
-
-#ifndef IPPROTO_GRE
-#define IPPROTO_GRE 47
-#endif
- case IPPROTO_GRE:
- if (vflag)
- (void)printf("gre %s > %s: ",
- ipaddr_string(&ip->ip_src),
- ipaddr_string(&ip->ip_dst));
- /* do it */
- gre_print(cp, len);
- if (! vflag) {
- printf(" (gre encap)");
- return;
- }
- break;
-
-#ifndef IPPROTO_MOBILE
-#define IPPROTO_MOBILE 55
-#endif
- case IPPROTO_MOBILE:
- if (vflag)
- (void)printf("mobile %s > %s: ",
- ipaddr_string(&ip->ip_src),
- ipaddr_string(&ip->ip_dst));
- mobile_print(cp, len);
- if (! vflag) {
- printf(" (mobile encap)");
- return;
- }
- break;
-
-#ifndef IPPROTO_PIM
-#define IPPROTO_PIM 103
-#endif
- case IPPROTO_PIM:
- pim_print(cp, len);
- break;
-
-#ifndef IPPROTO_VRRP
-#define IPPROTO_VRRP 112
-#endif
- case IPPROTO_VRRP:
- if (vflag)
- (void)printf("vrrp %s > %s: ",
- ipaddr_string(&ip->ip_src),
- ipaddr_string(&ip->ip_dst));
- vrrp_print(cp, len, ip->ip_ttl);
- break;
+ len -= hlen;
- default:
-#if 0
- (void)printf("%s > %s:", ipaddr_string(&ip->ip_src),
- ipaddr_string(&ip->ip_dst));
-#endif
- (void)printf(" ip-proto-%d %d", nh, len);
- break;
+ off = GET_BE_U_2(ip->ip_off);
+
+ ip_proto = GET_U_1(ip->ip_p);
+
+ if (ndo->ndo_vflag) {
+ ip_tos = GET_U_1(ip->ip_tos);
+ ND_PRINT("(tos 0x%x", ip_tos);
+ /* ECN bits */
+ switch (ip_tos & 0x03) {
+
+ case 0:
+ break;
+
+ case 1:
+ ND_PRINT(",ECT(1)");
+ break;
+
+ case 2:
+ ND_PRINT(",ECT(0)");
+ break;
+
+ case 3:
+ ND_PRINT(",CE");
+ break;
+ }
+
+ ip_ttl = GET_U_1(ip->ip_ttl);
+ if (ip_ttl >= 1)
+ ND_PRINT(", ttl %u", ip_ttl);
+
+ /*
+ * for the firewall guys, print id, offset.
+ * On all but the last stick a "+" in the flags portion.
+ * For unfragmented datagrams, note the don't fragment flag.
+ */
+ ND_PRINT(", id %u, offset %u, flags [%s], proto %s (%u)",
+ GET_BE_U_2(ip->ip_id),
+ (off & IP_OFFMASK) * 8,
+ bittok2str(ip_frag_values, "none", off & (IP_RES|IP_DF|IP_MF)),
+ tok2str(ipproto_values, "unknown", ip_proto),
+ ip_proto);
+
+ ND_PRINT(", length %u", GET_BE_U_2(ip->ip_len));
+
+ if ((hlen - sizeof(struct ip)) > 0) {
+ ND_PRINT(", options (");
+ if (ip_optprint(ndo, (const u_char *)(ip + 1),
+ hlen - sizeof(struct ip)) == -1) {
+ ND_PRINT(" [truncated-option]");
+ truncated = 1;
+ }
+ ND_PRINT(")");
+ }
+
+ if (!ndo->ndo_Kflag && (const u_char *)ip + hlen <= ndo->ndo_snapend) {
+ vec[0].ptr = (const uint8_t *)(const void *)ip;
+ vec[0].len = hlen;
+ sum = in_cksum(vec, 1);
+ if (sum != 0) {
+ ip_sum = GET_BE_U_2(ip->ip_sum);
+ ND_PRINT(", bad cksum %x (->%x)!", ip_sum,
+ in_cksum_shouldbe(ip_sum, sum));
}
+ }
+
+ ND_PRINT(")\n ");
+ if (truncated) {
+ ND_PRINT("%s > %s: ",
+ GET_IPADDR_STRING(ip->ip_src),
+ GET_IPADDR_STRING(ip->ip_dst));
+ nd_print_trunc(ndo);
+ nd_pop_packet_info(ndo);
+ return;
+ }
}
- /* 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
- * the don't fragment flag.
+ * If this is fragment zero, hand it to the next higher
+ * level protocol. Let them know whether there are more
+ * fragments.
*/
- len = len0; /* get the original length */
- if (off & 0x3fff) {
+ if ((off & IP_OFFMASK) == 0) {
+ uint8_t nh = GET_U_1(ip->ip_p);
+
+ if (nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
+ nh != IPPROTO_SCTP && nh != IPPROTO_DCCP) {
+ ND_PRINT("%s > %s: ",
+ GET_IPADDR_STRING(ip->ip_src),
+ GET_IPADDR_STRING(ip->ip_dst));
+ }
+ ip_demux_print(ndo, (const u_char *)ip + hlen, len, 4,
+ off & IP_MF, GET_U_1(ip->ip_ttl), nh, bp);
+ } else {
/*
- * if this isn't the first frag, we're missing the
- * next level protocol header. print the ip addr.
+ * Ultra quiet now means that all this stuff should be
+ * suppressed.
*/
- 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);
- /* ECN bits */
- if (ip->ip_tos&0x02) {
- (void)printf(",ECT");
- if (ip->ip_tos&0x01)
- (void)printf(",CE");
+ if (ndo->ndo_qflag > 1) {
+ nd_pop_packet_info(ndo);
+ return;
}
- (void)printf("] ");
- }
- if (ip->ip_ttl <= 1)
- (void)printf(" [ttl %d]", (int)ip->ip_ttl);
-
- if (vflag) {
- int sum;
- char *sep = "";
-
- printf(" (");
- if (ip->ip_ttl > 1) {
- (void)printf("%sttl %d", sep, (int)ip->ip_ttl);
- sep = ", ";
- }
- if ((off & 0x3fff) == 0) {
- (void)printf("%sid %d", sep, (int)ntohs(ip->ip_id));
- sep = ", ";
- }
- (void)printf("%slen %d", sep, (int)ntohs(ip->ip_len));
- sep = ", ";
- if ((u_char *)ip + hlen <= snapend) {
- sum = in_cksum((const u_short *)ip, hlen, 0);
- if (sum != 0) {
- (void)printf("%sbad cksum %x!", sep,
- ntohs(ip->ip_sum));
- sep = ", ";
- }
- }
- if ((hlen -= sizeof(struct ip)) > 0) {
- (void)printf("%soptlen=%d", sep, hlen);
- ip_optprint((u_char *)(ip + 1), hlen);
- }
- printf(")");
+ /*
+ * This isn't the first frag, so we're missing the
+ * next level protocol header. print the ip addr
+ * and the protocol.
+ */
+ ND_PRINT("%s > %s:", GET_IPADDR_STRING(ip->ip_src),
+ GET_IPADDR_STRING(ip->ip_dst));
+ if (!ndo->ndo_nflag && (p_name = netdb_protoname(ip_proto)) != NULL)
+ ND_PRINT(" %s", p_name);
+ else
+ ND_PRINT(" ip-proto-%u", ip_proto);
}
+ nd_pop_packet_info(ndo);
+ return;
+
+trunc:
+ nd_print_trunc(ndo);
+ return;
}
void
-ipN_print(register const u_char *bp, register u_int length)
+ipN_print(netdissect_options *ndo, const u_char *bp, u_int length)
{
- struct ip *ip, hdr;
-
- ip = (struct ip *)bp;
- if (length < 4) {
- (void)printf("truncated-ip %d", length);
+ ndo->ndo_protocol = "ipn";
+ if (length < 1) {
+ ND_PRINT("truncated-ip %u", length);
return;
}
- memcpy (&hdr, (char *)ip, 4);
- switch (IP_V(&hdr)) {
- case 4:
- ip_print (bp, length);
- return;
-#ifdef INET6
- case 6:
- ip6_print (bp, length);
- return;
-#endif
+
+ switch (GET_U_1(bp) & 0xF0) {
+ case 0x40:
+ ip_print(ndo, bp, length);
+ break;
+ case 0x60:
+ ip6_print(ndo, bp, length);
+ break;
default:
- (void)printf("unknown ip %d", IP_V(&hdr));
- return;
+ ND_PRINT("unknown ip %u", (GET_U_1(bp) & 0xF0) >> 4);
+ break;
}
}
projects / tcpdump / blobdiff