Get rid of unneeded includes of <netinet/in_systm.h> and <netinet/ip.h>.

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index c3e8309c77e9e536c410e260e59058f10ff25a92..d1593995e3597785296018e988638dd3a6333725 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.7 2000-07-11 00:55:22 assar Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.21 2001-11-16 02:17:36 itojun Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -36,75 +36,70 @@ static const char rcsid[] =
 #include <sys/socket.h>
 
 #include <netinet/in.h>
 #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>

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

+#include <string.h>

 
 #include "interface.h"
 #include "addrtoname.h"
 
 
 #include "interface.h"
 #include "addrtoname.h"
 

-#include <netinet/ip6.h>
+#include "ip6.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 const struct ip6_hdr *ip6;

-       register int hlen;
-       register int len;
+       register int advance;
+       register u_int len;

        register const u_char *cp;
        int nh;
        register const u_char *cp;
        int nh;

+       int fragmented = 0;

        u_int flow;
        
        ip6 = (const struct ip6_hdr *)bp;
 
 #ifdef LBL_ALIGN
        /*
        u_int flow;
        
        ip6 = (const struct ip6_hdr *)bp;
 
 #ifdef LBL_ALIGN
        /*

-        * The IP header is not word aligned, so copy into abuf.
-        * This will never happen with BPF.  It does happen raw packet
-        * dumps from -r.
+        * The IP6 header is not 16-byte aligned, so copy into abuf.

         */
         */

-       if ((int)ip & (sizeof(long)-1)) {
+       if ((u_long)ip6 & 15) {

                static u_char *abuf;
 
                static u_char *abuf;
 

-               if (abuf == 0)
-                       abuf = (u_char *)malloc(snaplen);
-               bcopy((char *)ip, (char *)abuf, min(length, snaplen));
-               snapend += abuf - (u_char *)ip;
+               if (abuf == NULL) {
+                       abuf = malloc(snaplen);
+                       if (abuf == NULL)
+                               error("ip6_print: malloc");
+               }
+               memcpy(abuf, ip6, min(length, snaplen));
+               snapend += abuf - (u_char *)ip6;

                packetp = abuf;
                packetp = abuf;

-               ip = (struct ip6_hdr *)abuf;
+               ip6 = (struct ip6_hdr *)abuf;
+               bp = abuf;

        }
 #endif
        }
 #endif

-       if ((u_char *)(ip6 + 1) > snapend) {
-               printf("[|ip6]");
-               return;
-       }
+       TCHECK(*ip6);

        if (length < sizeof (struct ip6_hdr)) {
                (void)printf("truncated-ip6 %d", length);
                return;
        }
        if (length < sizeof (struct ip6_hdr)) {
                (void)printf("truncated-ip6 %d", length);
                return;
        }

-       hlen = sizeof(struct ip6_hdr);
+       advance = sizeof(struct ip6_hdr);

 
        len = ntohs(ip6->ip6_plen);
 
        len = ntohs(ip6->ip6_plen);

-       if (length < len + hlen)
+       if (length < len + advance)

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

-                       len + hlen - length);
+                       len + advance - length);

 
        cp = (const u_char *)ip6;
        nh = ip6->ip6_nxt;
        while (cp < snapend) {
 
        cp = (const u_char *)ip6;
        nh = ip6->ip6_nxt;
        while (cp < snapend) {

-               cp += hlen;
+               cp += advance;

 
 

-               if (cp == (u_char *)(ip6 + 1)
+               if (cp == (const u_char *)(ip6 + 1)

                 && nh != IPPROTO_TCP && nh != IPPROTO_UDP) {
                        (void)printf("%s > %s: ", ip6addr_string(&ip6->ip6_src),
                                     ip6addr_string(&ip6->ip6_dst));
                 && nh != IPPROTO_TCP && nh != IPPROTO_UDP) {
                        (void)printf("%s > %s: ", ip6addr_string(&ip6->ip6_src),
                                     ip6addr_string(&ip6->ip6_dst));


@@ -112,45 +107,47 @@ ip6_print(register const u_char *bp, register int length)
 
                switch (nh) {
                case IPPROTO_HOPOPTS:
 
                switch (nh) {
                case IPPROTO_HOPOPTS:

-                       hlen = hbhopt_print(cp);
+                       advance = hbhopt_print(cp);

                        nh = *cp;
                        break;
                case IPPROTO_DSTOPTS:
                        nh = *cp;
                        break;
                case IPPROTO_DSTOPTS:

-                       hlen = dstopt_print(cp);
+                       advance = dstopt_print(cp);

                        nh = *cp;
                        break;
                case IPPROTO_FRAGMENT:
                        nh = *cp;
                        break;
                case IPPROTO_FRAGMENT:

-                       hlen = frag6_print(cp, (const u_char *)ip6);
-                       if (snapend <= cp + hlen)
+                       advance = frag6_print(cp, (const u_char *)ip6);
+                       if (snapend <= cp + advance)

                                goto end;
                        nh = *cp;
                                goto end;
                        nh = *cp;

+                       fragmented = 1;

                        break;
                case IPPROTO_ROUTING:
                        break;
                case IPPROTO_ROUTING:

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

                        nh = *cp;
                        break;
                case IPPROTO_TCP:
                        tcp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp),
                        nh = *cp;
                        break;
                case IPPROTO_TCP:
                        tcp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp),

-                               (const u_char *)ip6);
+                               (const u_char *)ip6, fragmented);

                        goto end;
                case IPPROTO_UDP:
                        udp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp),
                        goto end;
                case IPPROTO_UDP:
                        udp_print(cp, len + sizeof(struct ip6_hdr) - (cp - bp),

-                               (const u_char *)ip6);
+                               (const u_char *)ip6, fragmented);

                        goto end;
                case IPPROTO_ICMPV6:
                        icmp6_print(cp, (const u_char *)ip6);
                        goto end;
                case IPPROTO_AH:
                        goto end;
                case IPPROTO_ICMPV6:
                        icmp6_print(cp, (const u_char *)ip6);
                        goto end;
                case IPPROTO_AH:

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

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

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

                        if (enh < 0)
                                goto end;
                        nh = enh & 0xff;
                        if (enh < 0)
                                goto end;
                        nh = enh & 0xff;

+                       len -= padlen;

                        break;
                    }
 #ifndef IPPROTO_IPCOMP
                        break;
                    }
 #ifndef IPPROTO_IPCOMP


@@ -159,7 +156,7 @@ ip6_print(register const u_char *bp, register int length)
                case IPPROTO_IPCOMP:
                    {
                        int enh;
                case IPPROTO_IPCOMP:
                    {
                        int enh;

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

                        if (enh < 0)
                                goto end;
                        nh = enh & 0xff;
                        if (enh < 0)
                                goto end;
                        nh = enh & 0xff;


@@ -224,6 +221,9 @@ ip6_print(register const u_char *bp, register int length)
                        (void)printf(", hlim %d", (int)ip6->ip6_hlim);
                printf(")");
        }
                        (void)printf(", hlim %d", (int)ip6->ip6_hlim);
                printf(")");
        }

+       return;
+trunc:
+       (void)printf("[|ip6]");

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