]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ip.c
Get rid of an extra newline.
[tcpdump] / print-ip.c
index 1effe0d693774bef4b9466f67ec2bcdc1f5e4dac..c24f5d520a34598ca1a5b4e320f0475f8ae91647 100644 (file)
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.80 2000-01-25 01:03:23 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip.c,v 1.104 2002-05-29 09:47:04 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -33,16 +33,8 @@ static const char rcsid[] =
 #include <sys/socket.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 <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -52,161 +44,13 @@ static const char rcsid[] =
 #include "interface.h"
 #include "extract.h"                   /* must come after interface.h */
 
+#include "ip.h"
+
 /* 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 %lu: %s to %s reply-to %s",
-               (u_long)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 %lu: %s to %s reply-to %s",
-               (u_long)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.
  */
@@ -299,7 +143,15 @@ ip_optprint(register const u_char *cp, u_int length)
        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;
@@ -352,7 +204,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]);
-                       break;
+                       break;
 
                default:
                        printf(" IPOPT-%d{%d}", cp[0], len);
@@ -366,7 +218,7 @@ ip_optprint(register const u_char *cp, u_int length)
  * 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;
@@ -406,13 +258,12 @@ ip_print(register const u_char *bp, register u_int length)
        register const u_char *cp;
        u_char nh;
        int advance;
+       struct protoent *proto;
 
        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;
@@ -442,7 +293,7 @@ ip_print(register const u_char *bp, register u_int length)
                (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;
@@ -450,7 +301,7 @@ ip_print(register const u_char *bp, register u_int length)
 
        len = ntohs(ip->ip_len);
        if (length < len)
-               (void)printf("truncated-ip - %d bytes missing!",
+               (void)printf("truncated-ip - %d bytes missing! ",
                        len - length);
        len -= hlen;
        len0 = len;
@@ -464,7 +315,11 @@ ip_print(register const u_char *bp, register u_int length)
                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));
                }
@@ -486,10 +341,10 @@ again:
 #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;
-                       len -= advance;
+                       len -= advance + padlen;
                        if (enh < 0)
                                break;
                        nh = enh & 0xff;
@@ -511,12 +366,16 @@ again:
                        goto again;
                    }
 
+               case IPPROTO_SCTP:
+                       sctp_print(cp, (const u_char *)ip, len);
+                       break;
+
                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:
-                       udp_print(cp, len, (const u_char *)ip);
+                       udp_print(cp, len, (const u_char *)ip, (off &~ 0x6000));
                        break;
 
                case IPPROTO_ICMP:
@@ -531,10 +390,6 @@ again:
                        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;
 
@@ -553,20 +408,14 @@ again:
 #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) */
-#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)");
+                               printf(" (ipip-proto-4)");
                                return;
                        }
                        break;
@@ -577,17 +426,7 @@ again:
 #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*/
 
@@ -596,31 +435,15 @@ again:
 #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;
+                       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
@@ -630,12 +453,19 @@ again:
                        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
-                       (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;
                }
        }
@@ -654,11 +484,17 @@ again:
        if (off & 0x3fff) {
                /*
                 * if this isn't the first frag, we're missing the
-                * next level protocol header.  print the ip addr.
+                * next level protocol header.  print the ip addr
+                * and the protocol.
                 */
-               if (off & 0x1fff)
+               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);
+               }
 #ifndef IP_MF
 #define IP_MF 0x2000
 #endif /* IP_MF */
@@ -675,10 +511,17 @@ again:
        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)
+               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");
+                       }
                }
                (void)printf("] ");
        }
@@ -699,11 +542,14 @@ again:
                        (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));
+                               (void)printf("%sbad cksum %x (->%x)!", sep,
+                                            ntohs(ip->ip_sum),
+                                            ntohs(ip->ip_sum)-sum);
                                sep = ", ";
                        }
                }
@@ -714,3 +560,29 @@ again:
                printf(")");
        }
 }
+
+void
+ipN_print(register const u_char *bp, register u_int length)
+{
+       struct ip *ip, hdr;
+
+       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;
+       }
+}