add boundary, infinite loop checks

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 7eab7e05aa30079397e35de75f0572c08cb64c35..05db9d97da2d3d214bb9e874dd4f0f123345b2d0 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.15 2000-11-09 07:43:50 itojun Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.47 2005-04-06 21:32:40 mcr Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -30,77 +30,93 @@ static const char rcsid[] =
 
 #ifdef INET6
 
 
 #ifdef INET6
 

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

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

-#include <unistd.h>

 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"

+#include "extract.h"

 
 #include "ip6.h"
 
 #include "ip6.h"

+#include "ipproto.h"

 
 /*
  * print an IP6 datagram.
  */
 void
 
 /*
  * print an IP6 datagram.
  */
 void

-ip6_print(register const u_char *bp, register int length)
+ip6_print(register const u_char *bp, register u_int length)

 {
        register const struct ip6_hdr *ip6;
        register int advance;
 {
        register const struct ip6_hdr *ip6;
        register int advance;

-       register int len;
+       u_int len;
+       const u_char *ipend;

        register const u_char *cp;
        register const u_char *cp;

+       register u_int payload_len;

        int nh;
        int nh;

+       int fragmented = 0;

        u_int flow;
        u_int flow;

-       
+

        ip6 = (const struct ip6_hdr *)bp;
 
        ip6 = (const struct ip6_hdr *)bp;
 

-#ifdef LBL_ALIGN
-       /*
-        * The IP6 header is not 16-byte aligned, so copy into abuf.
-        * This will never happen with BPF.  It does happen raw packet
-        * dumps from -r.
-        */
-       if ((u_long)ip6 & 15) {
-               static u_char *abuf;
-
-               if (abuf == NULL)
-                       abuf = malloc(snaplen);
-               memcpy(abuf, ip6, min(length, snaplen));
-               snapend += abuf - (u_char *)ip6;
-               packetp = abuf;
-               ip6 = (struct ip6_hdr *)abuf;
-       }
-#endif
-       if ((u_char *)(ip6 + 1) > snapend) {
-               printf("[|ip6]");
-               return;
-       }
+       TCHECK(*ip6);

        if (length < sizeof (struct ip6_hdr)) {
        if (length < sizeof (struct ip6_hdr)) {

-               (void)printf("truncated-ip6 %d", length);
+               (void)printf("truncated-ip6 %u", length);

                return;
        }
                return;
        }

-       advance = sizeof(struct ip6_hdr);

 
 

-       len = ntohs(ip6->ip6_plen);
-       if (length < len + advance)
-               (void)printf("truncated-ip6 - %d bytes missing!",
-                       len + advance - length);
+        if (!eflag)
+            printf("IP6 ");
+
+       payload_len = EXTRACT_16BITS(&ip6->ip6_plen);
+       len = payload_len + sizeof(struct ip6_hdr);
+       if (length < len)
+               (void)printf("truncated-ip6 - %u bytes missing!",
+                       len - length);
+
+        if (vflag) {
+            flow = EXTRACT_32BITS(&ip6->ip6_flow);
+            printf("(");
+#if 0
+            /* rfc1883 */
+            if (flow & 0x0f000000)
+               (void)printf("pri 0x%02x, ", (flow & 0x0f000000) >> 24);
+            if (flow & 0x00ffffff)
+               (void)printf("flowlabel 0x%06x, ", flow & 0x00ffffff);
+#else
+            /* RFC 2460 */
+            if (flow & 0x0ff00000)
+               (void)printf("class 0x%02x, ", (flow & 0x0ff00000) >> 20);
+            if (flow & 0x000fffff)
+               (void)printf("flowlabel 0x%05x, ", flow & 0x000fffff);
+#endif
+
+            (void)printf("hlim %u, next-header: %s (%u), length: %u) ",
+                         ip6->ip6_hlim,
+                         tok2str(ipproto_values,"unknown",ip6->ip6_nxt),
+                         ip6->ip6_nxt,
+                         payload_len);
+        }
+
+       /*
+        * Cut off the snapshot length to the end of the IP payload.
+        */
+       ipend = bp + len;
+       if (ipend < snapend)
+               snapend = ipend;

 
        cp = (const u_char *)ip6;
 
        cp = (const u_char *)ip6;

+       advance = sizeof(struct ip6_hdr);

        nh = ip6->ip6_nxt;
        nh = ip6->ip6_nxt;

-       while (cp < snapend) {
+       while (cp < snapend && advance > 0) {

                cp += advance;
                cp += advance;

+               len -= advance;

 
 

-               if (cp == (u_char *)(ip6 + 1)
-                && nh != IPPROTO_TCP && nh != IPPROTO_UDP) {
+               if (cp == (const u_char *)(ip6 + 1) &&
+                   nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
+                   nh != IPPROTO_SCTP) {

                        (void)printf("%s > %s: ", ip6addr_string(&ip6->ip6_src),
                                     ip6addr_string(&ip6->ip6_dst));
                }
                        (void)printf("%s > %s: ", ip6addr_string(&ip6->ip6_src),
                                     ip6addr_string(&ip6->ip6_dst));
                }


@@ -117,108 +133,90 @@ ip6_print(register const u_char *bp, register int length)
                case IPPROTO_FRAGMENT:
                        advance = frag6_print(cp, (const u_char *)ip6);
                        if (snapend <= cp + advance)
                case IPPROTO_FRAGMENT:
                        advance = frag6_print(cp, (const u_char *)ip6);
                        if (snapend <= cp + advance)

-                               goto end;
+                               return;

                        nh = *cp;
                        nh = *cp;

+                       fragmented = 1;

                        break;
                        break;

+
+               case IPPROTO_MOBILITY_OLD:
+               case IPPROTO_MOBILITY:
+                       /*
+                        * XXX - we don't use "advance"; the current
+                        * "Mobility Support in IPv6" draft
+                        * (draft-ietf-mobileip-ipv6-24) says that
+                        * the next header field in a mobility header
+                        * should be IPPROTO_NONE, but speaks of
+                        * the possiblity of a future extension in
+                        * which payload can be piggybacked atop a
+                        * mobility header.
+                        */
+                       advance = mobility_print(cp, (const u_char *)ip6);
+                       nh = *cp;
+                       return;

                case IPPROTO_ROUTING:
                        advance = rt6_print(cp, (const u_char *)ip6);
                        nh = *cp;
                        break;
                case IPPROTO_ROUTING:
                        advance = rt6_print(cp, (const u_char *)ip6);
                        nh = *cp;
                        break;

+               case IPPROTO_SCTP:
+                       sctp_print(cp, (const u_char *)ip6, len);
+                       return;

                case IPPROTO_TCP:
                case IPPROTO_TCP:

-                       tcp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp),
-                               (const u_char *)ip6);
-                       goto end;
+                       tcp_print(cp, len, (const u_char *)ip6, fragmented);
+                       return;

                case IPPROTO_UDP:
                case IPPROTO_UDP:

-                       udp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp),
-                               (const u_char *)ip6);
-                       goto end;
+                       udp_print(cp, len, (const u_char *)ip6, fragmented);
+                       return;

                case IPPROTO_ICMPV6:
                case IPPROTO_ICMPV6:

-                       icmp6_print(cp, (const u_char *)ip6);
-                       goto end;
+                       icmp6_print(cp, len, (const u_char *)ip6, fragmented);
+                       return;

                case IPPROTO_AH:
                case IPPROTO_AH:

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

                        nh = *cp;
                        break;
                case IPPROTO_ESP:
                    {
                        nh = *cp;
                        break;
                case IPPROTO_ESP:
                    {

-                       int enh;
-                       advance = esp_print(cp, (const u_char *)ip6, &enh);
-                       if (enh < 0)
-                               goto end;
+                       int enh, padlen;
+                       advance = esp_print(gndo, cp, len, (const u_char *)ip6, &enh, &padlen);

                        nh = enh & 0xff;
                        nh = enh & 0xff;

+                       len -= padlen;

                        break;
                    }
                        break;
                    }

-#ifndef IPPROTO_IPCOMP
-#define IPPROTO_IPCOMP 108
-#endif

                case IPPROTO_IPCOMP:
                    {
                        int enh;
                case IPPROTO_IPCOMP:
                    {
                        int enh;

-                       advance = ipcomp_print(cp, (const u_char *)ip6, &enh);
-                       if (enh < 0)
-                               goto end;
+                       advance = ipcomp_print(cp, &enh);

                        nh = enh & 0xff;
                        break;
                    }
 
                        nh = enh & 0xff;
                        break;
                    }
 

-#ifndef IPPROTO_PIM
-#define IPPROTO_PIM    103
-#endif

                case IPPROTO_PIM:
                        pim_print(cp, len);
                case IPPROTO_PIM:
                        pim_print(cp, len);

-                       goto end;
-#ifndef IPPROTO_OSPF
-#define IPPROTO_OSPF 89
-#endif
+                       return;

                case IPPROTO_OSPF:
                        ospf6_print(cp, len);
                case IPPROTO_OSPF:
                        ospf6_print(cp, len);

-                       goto end;
+                       return;
+

                case IPPROTO_IPV6:
                        ip6_print(cp, len);
                case IPPROTO_IPV6:
                        ip6_print(cp, len);

-                       goto end;
-#ifndef IPPROTO_IPV4
-#define IPPROTO_IPV4   4
-#endif
+                       return;
+

                case IPPROTO_IPV4:
                case IPPROTO_IPV4:

-                       ip_print(cp, len);
-                       goto end;
+                       ip_print(gndo, cp, len);
+                       return;
+

                case IPPROTO_NONE:
                        (void)printf("no next header");
                case IPPROTO_NONE:
                        (void)printf("no next header");

-                       goto end;
+                       return;

 
                default:
                        (void)printf("ip-proto-%d %d", ip6->ip6_nxt, len);
 
                default:
                        (void)printf("ip-proto-%d %d", ip6->ip6_nxt, len);

-                       goto end;
+                       return;

                }
        }
 
                }
        }
 

- end:
-       
-       flow = ntohl(ip6->ip6_flow);
-#if 0
-       /* rfc1883 */
-       if (flow & 0x0f000000)
-               (void)printf(" [pri 0x%x]", (flow & 0x0f000000) >> 24);
-       if (flow & 0x00ffffff)
-               (void)printf(" [flowlabel 0x%x]", flow & 0x00ffffff);
-#else
-       /* RFC 2460 */
-       if (flow & 0x0ff00000)
-               (void)printf(" [class 0x%x]", (flow & 0x0ff00000) >> 20);
-       if (flow & 0x000fffff)
-               (void)printf(" [flowlabel 0x%x]", flow & 0x000fffff);
-#endif
-
-       if (ip6->ip6_hlim <= 1)
-               (void)printf(" [hlim %d]", (int)ip6->ip6_hlim);
-
-       if (vflag) {
-               printf(" (");
-               (void)printf("len %d", len);
-               if (ip6->ip6_hlim > 1)
-                       (void)printf(", hlim %d", (int)ip6->ip6_hlim);
-               printf(")");
-       }
+       return;
+trunc:
+       (void)printf("[|ip6]");

 }
 
 #endif /* INET6 */
 }
 
 #endif /* INET6 */