don't pass on src & dst MAC adresses to the isoclns decoder as MAC adresses

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 1eddff59f24dfaa6e3ccc5641535375d3772b88a..f3471c5057854358336b4e7940bda57605dd6b6d 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -21,192 +21,30 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.78 1999-12-15 00:34:10 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.125 2003-05-21 08:39:57 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
+#include <tcpdump-stdinc.h>

 
 

-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <unistd.h>

 
 #include "addrtoname.h"
 #include "interface.h"
 #include "extract.h"                   /* must come after interface.h */
 
 
 #include "addrtoname.h"
 #include "interface.h"
 #include "extract.h"                   /* must come after interface.h */
 

+#include "ip.h"
+

 /* Compatibility */
 #ifndef        IPPROTO_ND
 #define        IPPROTO_ND      77
 #endif
 
 /* Compatibility */
 #ifndef        IPPROTO_ND
 #define        IPPROTO_ND      77
 #endif
 

-#ifndef IN_CLASSD
-#define IN_CLASSD(i) (((int32_t)(i) & 0xf0000000) == 0xe0000000)
-#endif
-
-/* (following from ipmulti/mrouted/prune.h) */
-
-/*
- * The packet format for a traceroute request.
- */
-struct tr_query {
-       u_int  tr_src;                  /* traceroute source */
-       u_int  tr_dst;                  /* traceroute destination */
-       u_int  tr_raddr;                /* traceroute response address */
-       u_int  tr_rttlqid;              /* response ttl and 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
- * beginning, followed by one tr_resp for each hop taken.
- */
-struct tr_resp {
-       u_int tr_qarr;                  /* query arrival time */
-       u_int tr_inaddr;                /* incoming interface address */
-       u_int tr_outaddr;               /* outgoing interface address */
-       u_int tr_rmtaddr;               /* parent address in source tree */
-       u_int tr_vifin;                 /* input packet count on interface */
-       u_int tr_vifout;                /* output packet count on interface */
-       u_int tr_pktcnt;                /* total incoming packets for src-grp */
-       u_char  tr_rproto;              /* routing proto deployed on router */
-       u_char  tr_fttl;                /* ttl required to forward on outvif */
-       u_char  tr_smask;               /* subnet mask for src addr */
-       u_char  tr_rflags;              /* forwarding error codes */
-};
-
-/* defs within mtrace */
-#define TR_QUERY 1
-#define TR_RESP        2
-
-/* fields for tr_rflags (forwarding error codes) */
-#define TR_NO_ERR      0
-#define TR_WRONG_IF    1
-#define TR_PRUNED      2
-#define TR_OPRUNED     3
-#define TR_SCOPED      4
-#define TR_NO_RTE      5
-#define TR_NO_FWD      7
-#define TR_NO_SPACE    0x81
-#define TR_OLD_ROUTER  0x82
-
-/* fields for tr_rproto (routing protocol) */
-#define TR_PROTO_DVMRP 1
-#define TR_PROTO_MOSPF 2
-#define TR_PROTO_PIM   3
-#define TR_PROTO_CBT   4
-
-static void print_mtrace(register const u_char *bp, register u_int len)
-{
-       register struct tr_query *tr = (struct tr_query *)(bp + 8);
-
-       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_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 %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_GETTTL(ntohl(tr->tr_rttlqid)));
-}
-
-static void
-igmp_print(register const u_char *bp, register u_int len,
-          register const u_char *bp2)
-{
-       register const struct ip *ip;
-
-       ip = (const struct ip *)bp2;
-        (void)printf("%s > %s: ",
-               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 (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 v1 report %s", ipaddr_string(&bp[4]));
-               if (len != 8)
-                       (void)printf(" [len %d]", len);
-               break;
-       case 0x16:
-               (void)printf("igmp v2 report %s", ipaddr_string(&bp[4]));
-               break;
-       case 0x17:
-               (void)printf("igmp leave %s", ipaddr_string(&bp[4]));
-               break;
-       case 0x13:
-               (void)printf("igmp dvmrp");
-               if (len < 8)
-                       (void)printf(" [len %d]", len);
-               else
-                       dvmrp_print(bp, len);
-               break;
-       case 0x14:
-               (void)printf("igmp pimv1");
-               pimv1_print(bp, len);
-               break;
-       case 0x1e:
-               print_mresp(bp, len);
-               break;
-       case 0x1f:
-               print_mtrace(bp, len);
-               break;
-       default:
-               (void)printf("igmp-%d", bp[0]);
-               break;
-       }
-
-       if (vflag && TTEST2(bp[0], len)) {
-               /* Check the IGMP checksum */
-               if (in_cksum((const u_short*)bp, len, 0))
-                       printf(" bad igmp cksum %x!", EXTRACT_16BITS(&bp[2]));
-       }
-       return;
-trunc:
-       fputs("[|igmp]", stdout);
-}
-

 /*
  * print the recorded route in an IP RR, LSRR or SSRR option.
  */
 /*
  * print the recorded route in an IP RR, LSRR or SSRR option.
  */


@@ -232,13 +70,59 @@ ip_printroute(const char *type, register const u_char *cp, u_int length)
        printf("%s}", ptr == len? "#" : "");
 }
 
        printf("%s}", ptr == len? "#" : "");
 }
 

+/*
+ * If source-routing is present, return the final destination.
+ * Otherwise, return IP destination.
+ *
+ * This is used for UDP and TCP pseudo-header in the checksum
+ * calculation.
+ */
+u_int32_t
+ip_finddst(const struct ip *ip)
+{
+       int length;
+       int len;
+       const u_char *cp;
+       u_int32_t retval;
+
+       cp = (const u_char *)(ip + 1);
+       length = (IP_HL(ip) << 2) - sizeof(struct ip);
+
+       for (; length > 0; cp += len, length -= len) {
+               int tt = *cp;
+
+               if (tt == IPOPT_NOP || tt == IPOPT_EOL)
+                       len = 1;
+               else {
+                       if (&cp[1] >= snapend) {
+                               return 0;
+                       }
+                       len = cp[1];
+               }
+               if (len <= 0) {
+                       return 0;
+               }
+               if (&cp[1] >= snapend || cp + len > snapend) {
+                       return 0;
+               }
+               switch (tt) {
+
+               case IPOPT_SSRR:
+               case IPOPT_LSRR:
+                       memcpy(&retval, cp + len - 4, 4);
+                       return retval;
+               }
+       }
+       return ip->ip_dst.s_addr;
+}
+

 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;
 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;
+       const char *type;

 
        printf(" TS{");
        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;
 
        printf(" TS{");
        hoplen = ((cp[3]&0xF) != IPOPT_TS_TSONLY) ? 8 : 4;


@@ -265,7 +149,7 @@ ip_printts(register const u_char *cp, u_int length)
        case 3:                 /* IPOPT_TS_PRESPEC */
                printf("PRESPEC");
                break;
        case 3:                 /* IPOPT_TS_PRESPEC */
                printf("PRESPEC");
                break;

-       default:        
+       default:

                printf("[bad ts type %d]", cp[3]&0xF);
                goto done;
        }
                printf("[bad ts type %d]", cp[3]&0xF);
                goto done;
        }


@@ -299,7 +183,15 @@ ip_optprint(register const u_char *cp, u_int length)
        for (; length > 0; cp += len, length -= len) {
                int tt = *cp;
 
        for (; length > 0; cp += len, length -= len) {
                int tt = *cp;
 

-               len = (tt == IPOPT_NOP || tt == IPOPT_EOL) ? 1 : cp[1];
+               if (tt == IPOPT_NOP || tt == IPOPT_EOL)
+                       len = 1;
+               else {
+                       if (&cp[1] >= snapend) {
+                               printf("[|ip]");
+                               return;
+                       }
+                       len = cp[1];
+               }

                if (len <= 0) {
                        printf("[|ip op len %d]", len);
                        return;
                if (len <= 0) {
                        printf("[|ip op len %d]", len);
                        return;


@@ -352,7 +244,7 @@ ip_optprint(register const u_char *cp, u_int length)
                                printf("{%d}", len);
                        else if (cp[2] || cp[3])
                                printf("%d.%d", cp[2], cp[3]);
                                printf("{%d}", len);
                        else if (cp[2] || cp[3])
                                printf("%d.%d", cp[2], cp[3]);

-                       break;
+                       break;

 
                default:
                        printf(" IPOPT-%d{%d}", cp[0], len);
 
                default:
                        printf(" IPOPT-%d{%d}", cp[0], len);


@@ -366,19 +258,19 @@ ip_optprint(register const u_char *cp, u_int length)
  * don't modifiy the packet.
  */
 u_short
  * don't modifiy the packet.
  */
 u_short

-in_cksum(const u_short *addr, register int len, u_short csum)
+in_cksum(const u_short *addr, register u_int len, int csum)

 {
        int nleft = len;
        const u_short *w = addr;
        u_short answer;
        int sum = 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.
         *  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;
        while (nleft > 1)  {
                sum += *w++;
                nleft -= 2;


@@ -395,6 +287,73 @@ in_cksum(const u_short *addr, register int len, u_short csum)
        return (answer);
 }
 
        return (answer);
 }
 

+/*
+ * Given the host-byte-order value of the checksum field in a packet
+ * header, and the network-byte-order computed checksum of the data
+ * that the checksum covers (including the checksum itself), compute
+ * what the checksum field *should* have been.
+ */
+u_int16_t
+in_cksum_shouldbe(u_int16_t sum, u_int16_t computed_sum)
+{
+       u_int32_t shouldbe;
+
+       /*
+        * The value that should have gone into the checksum field
+        * is the negative of the value gotten by summing up everything
+        * *but* the checksum field.
+        *
+        * We can compute that by subtracting the value of the checksum
+        * field from the sum of all the data in the packet, and then
+        * computing the negative of that value.
+        *
+        * "sum" is the value of the checksum field, and "computed_sum"
+        * is the negative of the sum of all the data in the packets,
+        * so that's -(-computed_sum - sum), or (sum + computed_sum).
+        *
+        * All the arithmetic in question is one's complement, so the
+        * addition must include an end-around carry; we do this by
+        * doing the arithmetic in 32 bits (with no sign-extension),
+        * and then adding the upper 16 bits of the sum, which contain
+        * the carry, to the lower 16 bits of the sum, and then do it
+        * again in case *that* sum produced a carry.
+        *
+        * As RFC 1071 notes, the checksum can be computed without
+        * byte-swapping the 16-bit words; summing 16-bit words
+        * on a big-endian machine gives a big-endian checksum, which
+        * can be directly stuffed into the big-endian checksum fields
+        * in protocol headers, and summing words on a little-endian
+        * machine gives a little-endian checksum, which must be
+        * byte-swapped before being stuffed into a big-endian checksum
+        * field.
+        *
+        * "computed_sum" is a network-byte-order value, so we must put
+        * it in host byte order before subtracting it from the
+        * host-byte-order value from the header; the adjusted checksum
+        * will be in host byte order, which is what we'll return.
+        */
+       shouldbe = sum;
+       shouldbe += ntohs(computed_sum);
+       shouldbe = (shouldbe & 0xFFFF) + (shouldbe >> 16);
+       shouldbe = (shouldbe & 0xFFFF) + (shouldbe >> 16);
+       return shouldbe;
+}
+
+#ifndef IP_MF
+#define IP_MF 0x2000
+#endif /* IP_MF */
+#ifndef IP_DF
+#define IP_DF 0x4000
+#endif /* IP_DF */
+#define IP_RES 0x8000
+
+static struct tok ip_frag_values[] = {
+        { IP_MF,        "+" },
+        { IP_DF,        "DF" },
+       { IP_RES,       "rsvd" }, /* The RFC3514 evil ;-) bit */
+        { 0,            NULL }
+};
+

 /*
  * print an IP datagram.
  */
 /*
  * print an IP datagram.
  */


@@ -406,34 +365,13 @@ ip_print(register const u_char *bp, register u_int length)
        register const u_char *cp;
        u_char nh;
        int advance;
        register const u_char *cp;
        u_char nh;
        int advance;

+       struct protoent *proto;
+       u_int16_t sum, ip_sum;
+       const char *sep = "";
+
+       printf("IP%s ", (((*bp >> 4) & 0xf) == 4) ? "" : "%u", (*bp >> 4) & 0xf); /* print version if != 4 */

 
        ip = (const struct ip *)bp;
 
        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 ((u_char *)(ip + 1) > snapend) {
                printf("[|ip]");
                return;


@@ -442,25 +380,86 @@ ip_print(register const u_char *bp, register u_int length)
                (void)printf("truncated-ip %d", length);
                return;
        }
                (void)printf("truncated-ip %d", length);
                return;
        }

-       hlen = ip->ip_hl * 4;
+       hlen = IP_HL(ip) * 4;
+       if (hlen < sizeof (struct ip)) {
+               (void)printf("bad-hlen %d", hlen);
+               return;
+       }

 
 

-       len = ntohs(ip->ip_len);
+       len = EXTRACT_16BITS(&ip->ip_len);

        if (length < len)
        if (length < len)

-               (void)printf("truncated-ip - %d bytes missing!",
+               (void)printf("truncated-ip - %d bytes missing! ",

                        len - length);
        len -= hlen;
        len0 = len;
 
                        len - length);
        len -= hlen;
        len0 = len;
 

+       off = EXTRACT_16BITS(&ip->ip_off);
+
+        if (vflag) {
+            (void)printf("(tos 0x%x", (int)ip->ip_tos);
+            /* ECN bits */
+            if (ip->ip_tos & 0x03) {
+                switch (ip->ip_tos & 0x03) {
+                case 1:
+                    (void)printf(",ECT(1)");
+                    break;
+                case 2:
+                    (void)printf(",ECT(0)");
+                    break;
+                case 3:
+                    (void)printf(",CE");
+                }
+            }
+
+            if (ip->ip_ttl >= 1)
+                (void)printf(", ttl %3u", ip->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.
+            */
+
+           (void)printf(", id %u, offset %u, flags [%s]",
+                            EXTRACT_16BITS(&ip->ip_id),
+                            (off & 0x1fff) * 8,
+                            bittok2str(ip_frag_values, "none", off & 0xe000 ));
+
+            (void)printf(", length: %u", EXTRACT_16BITS(&ip->ip_len));
+
+            if ((hlen - sizeof(struct ip)) > 0) {
+                (void)printf(", optlength: %u (", hlen - (u_int)sizeof(struct ip));
+                ip_optprint((u_char *)(ip + 1), hlen - sizeof(struct ip));
+                printf(" )");
+            }
+
+           if ((u_char *)ip + hlen <= snapend) {
+               sum = in_cksum((const u_short *)ip, hlen, 0);
+               if (sum != 0) {
+                   ip_sum = EXTRACT_16BITS(&ip->ip_sum);
+                   (void)printf("%sbad cksum %x (->%x)!", sep,
+                            ip_sum,
+                            in_cksum_shouldbe(ip_sum, sum));
+                   sep = ", ";
+               }
+           }
+
+            printf(") ");
+       }
+

        /*
         * If this is fragment zero, hand it to the next higher
         * level protocol.
         */
        /*
         * If this is fragment zero, hand it to the next higher
         * level protocol.
         */

-       off = ntohs(ip->ip_off);

        if ((off & 0x1fff) == 0) {
                cp = (const u_char *)ip + hlen;
                nh = ip->ip_p;
 
        if ((off & 0x1fff) == 0) {
                cp = (const u_char *)ip + hlen;
                nh = ip->ip_p;
 

-               if (nh != IPPROTO_TCP && nh != IPPROTO_UDP) {
+#ifndef IPPROTO_SCTP
+#define IPPROTO_SCTP 132
+#endif
+               if (nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
+                   nh != IPPROTO_SCTP) {

                        (void)printf("%s > %s: ", ipaddr_string(&ip->ip_src),
                                ipaddr_string(&ip->ip_dst));
                }
                        (void)printf("%s > %s: ", ipaddr_string(&ip->ip_src),
                                ipaddr_string(&ip->ip_dst));
                }


@@ -472,7 +471,7 @@ again:
 #endif
                case IPPROTO_AH:
                        nh = *cp;
 #endif
                case IPPROTO_AH:
                        nh = *cp;

-                       advance = ah_print(cp, (const u_char *)ip);
+                       advance = ah_print(cp);

                        cp += advance;
                        len -= advance;
                        goto again;
                        cp += advance;
                        len -= advance;
                        goto again;


@@ -482,10 +481,10 @@ again:
 #endif
                case IPPROTO_ESP:
                    {
 #endif
                case IPPROTO_ESP:
                    {

-                       int enh;
-                       advance = esp_print(cp, (const u_char *)ip, &enh);
+                       int enh, padlen;
+                       advance = esp_print(cp, (const u_char *)ip, &enh, &padlen);

                        cp += advance;
                        cp += advance;

-                       len -= advance;
+                       len -= advance + padlen;

                        if (enh < 0)
                                break;
                        nh = enh & 0xff;
                        if (enh < 0)
                                break;
                        nh = enh & 0xff;


@@ -498,7 +497,7 @@ again:
                case IPPROTO_IPCOMP:
                    {
                        int enh;
                case IPPROTO_IPCOMP:
                    {
                        int enh;

-                       advance = ipcomp_print(cp, (const u_char *)ip, &enh);
+                       advance = ipcomp_print(cp, &enh);

                        cp += advance;
                        len -= advance;
                        if (enh < 0)
                        cp += advance;
                        len -= advance;
                        if (enh < 0)


@@ -507,16 +506,21 @@ again:
                        goto again;
                    }
 
                        goto again;
                    }
 

+               case IPPROTO_SCTP:
+                       sctp_print(cp, (const u_char *)ip, len);
+                       break;
+

                case IPPROTO_TCP:
                case IPPROTO_TCP:

-                       tcp_print(cp, len, (const u_char *)ip);
+                       tcp_print(cp, len, (const u_char *)ip, (off &~ 0x6000));

                        break;
 
                case IPPROTO_UDP:
                        break;
 
                case IPPROTO_UDP:

-                       udp_print(cp, len, (const u_char *)ip);
+                       udp_print(cp, len, (const u_char *)ip, (off &~ 0x6000));

                        break;
 
                case IPPROTO_ICMP:
                        break;
 
                case IPPROTO_ICMP:

-                       icmp_print(cp, len, (const u_char *)ip);
+                       /* pass on the MF bit plus the offset to detect fragments */
+                       icmp_print(cp, len, (const u_char *)ip, (off & 0x3fff));

                        break;
 
 #ifndef IPPROTO_IGRP
                        break;
 
 #ifndef IPPROTO_IGRP


@@ -527,15 +531,11 @@ again:
                        break;
 
                case IPPROTO_ND:
                        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;
 
                case IPPROTO_EGP:
                        (void)printf(" nd %d", len);
                        break;
 
                case IPPROTO_EGP:

-                       egp_print(cp, len, (const u_char *)ip);
+                       egp_print(cp);

                        break;
 
 #ifndef IPPROTO_OSPF
                        break;
 
 #ifndef IPPROTO_OSPF


@@ -549,20 +549,14 @@ again:
 #define IPPROTO_IGMP 2
 #endif
                case IPPROTO_IGMP:
 #define IPPROTO_IGMP 2
 #endif
                case IPPROTO_IGMP:

-                       igmp_print(cp, len, (const u_char *)ip);
+                       igmp_print(cp, len);

                        break;
 
                case 4:
                        /* DVMRP multicast tunnel (ip-in-ip encapsulation) */
                        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) {
                        ip_print(cp, len);
                        if (! vflag) {

-                               printf(" (ipip)");
+                               printf(" (ipip-proto-4)");

                                return;
                        }
                        break;
                                return;
                        }
                        break;


@@ -573,50 +567,30 @@ again:
 #endif
                case IP6PROTO_ENCAP:
                        /* ip6-in-ip encapsulation */
 #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);
                        ip6_print(cp, len);

-                       if (! vflag) {
-                               printf(" (encap)");
-                               return;
-                       }

                        break;
 #endif /*INET6*/
 
                        break;
 #endif /*INET6*/
 

+#ifndef IPPROTO_RSVP
+#define IPPROTO_RSVP 46
+#endif
+               case IPPROTO_RSVP:
+                       rsvp_print(cp, len);
+                       break;

 
 #ifndef IPPROTO_GRE
 #define IPPROTO_GRE 47
 #endif
                case IPPROTO_GRE:
 
 #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);
                        /* do it */
                        gre_print(cp, len);

-                       if (! vflag) {
-                               printf(" (gre encap)");
-                               return;
-                       }
-                       break;
+                       break;

 
 #ifndef IPPROTO_MOBILE
 #define IPPROTO_MOBILE 55
 #endif
                case IPPROTO_MOBILE:
 
 #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);
                        mobile_print(cp, len);

-                       if (! vflag) {
-                               printf(" (mobile encap)");
-                               return;
-                       }

                        break;
 
 #ifndef IPPROTO_PIM
                        break;
 
 #ifndef IPPROTO_PIM


@@ -626,87 +600,66 @@ again:
                        pim_print(cp, len);
                        break;
 
                        pim_print(cp, len);
                        break;
 

-               default:
-#if 0
-                       (void)printf("%s > %s:", ipaddr_string(&ip->ip_src),
-                               ipaddr_string(&ip->ip_dst));
+#ifndef IPPROTO_VRRP
+#define IPPROTO_VRRP   112

 #endif
 #endif

-                       (void)printf(" ip-proto-%d %d", nh, len);
+               case IPPROTO_VRRP:
+                       vrrp_print(cp, len, ip->ip_ttl);
+                       break;
+
+               default:
+                       if ((proto = getprotobynumber(nh)) != NULL)
+                               (void)printf(" %s", proto->p_name);
+                       else
+                               (void)printf(" ip-proto-%d", nh);
+                       printf(" %d", len);

                        break;
                }
                        break;
                }

+       } else {
+           /* Ultra quiet now means that all this stuff should be suppressed */
+           if (qflag > 1) return;
+
+           /*
+            * if this isn't the first frag, we're missing the
+            * next level protocol header.  print the ip addr
+            * and the protocol.
+            */
+           if (off & 0x1fff) {
+               (void)printf("%s > %s:", ipaddr_string(&ip->ip_src),
+                            ipaddr_string(&ip->ip_dst));
+               if ((proto = getprotobynumber(ip->ip_p)) != NULL)
+                   (void)printf(" %s", proto->p_name);
+               else
+                   (void)printf(" ip-proto-%d", ip->ip_p);
+           } 

        }
        }

+}

 
 

-       /* Ultra quiet now means that all this stuff should be suppressed */
-       /* res 3-Nov-98 */
-       if (qflag > 1) return;
-
+void
+ipN_print(register const u_char *bp, register u_int length)
+{
+       struct ip *ip, hdr;

 
 

-       /*
-        * for fragmented datagrams, print id:size@offset.  On all
-        * but the last stick a "+".  For unfragmented datagrams, note
-        * the don't fragment flag.
-        */
-       len = len0;     /* get the original length */
-       if (off & 0x3fff) {
-               /*
-                * if this isn't the first frag, we're missing the
-                * next level protocol header.  print the ip addr.
-                */
-               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");
-               }
-               (void)printf("] ");
+       ip = (struct ip *)bp;
+       if (length < 4) {
+               (void)printf("truncated-ip %d", 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
+       default:
+               (void)printf("unknown ip %d", IP_V(&hdr));
+               return;

        }
        }

+}

 
 

-       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 = ", ";
-               }
-               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(")");
-       }
-}