When checking for pcap_if_t, add $V_INCLS to CFLAGS, so we look at the

[tcpdump] / print-ip6.c

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

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.39 2003-11-19 06:31:28 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ip6.c,v 1.43 2004-05-01 10:15:33 hannes Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -67,12 +67,39 @@ ip6_print(register const u_char *bp, register u_int length)
                return;
        }
 
                return;
        }
 

+        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 - %d bytes missing!",
                        len - length);
 
        payload_len = EXTRACT_16BITS(&ip6->ip6_plen);
        len = payload_len + sizeof(struct ip6_hdr);
        if (length < len)
                (void)printf("truncated-ip6 - %d 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), payload-len %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.
         */
        /*
         * Cut off the snapshot length to the end of the IP payload.
         */


@@ -106,35 +133,42 @@ ip6_print(register const u_char *bp, register u_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;
                        fragmented = 1;
                        break;
 
                        nh = *cp;
                        fragmented = 1;
                        break;
 

+               case IPPROTO_MOBILITY_OLD:

                case IPPROTO_MOBILITY:
                        /*
                case IPPROTO_MOBILITY:
                        /*

-                        * XXX - we don't use "advance"; is this
-                        * header always a final header?
+                        * 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;
                         */
                        advance = mobility_print(cp, (const u_char *)ip6);
                        nh = *cp;

-                       goto end;
+                       return;

                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);
                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);

-                       goto end;
+                       return;

                case IPPROTO_TCP:
                        tcp_print(cp, len, (const u_char *)ip6, fragmented);
                case IPPROTO_TCP:
                        tcp_print(cp, len, (const u_char *)ip6, fragmented);

-                       goto end;
+                       return;

                case IPPROTO_UDP:
                        udp_print(cp, len, (const u_char *)ip6, fragmented);
                case IPPROTO_UDP:
                        udp_print(cp, len, (const u_char *)ip6, fragmented);

-                       goto end;
+                       return;

                case IPPROTO_ICMPV6:
                        icmp6_print(cp, len, (const u_char *)ip6, fragmented);
                case IPPROTO_ICMPV6:
                        icmp6_print(cp, len, (const u_char *)ip6, fragmented);

-                       goto end;
+                       return;

                case IPPROTO_AH:
                        advance = ah_print(cp);
                        nh = *cp;
                case IPPROTO_AH:
                        advance = ah_print(cp);
                        nh = *cp;


@@ -142,7 +176,7 @@ ip6_print(register const u_char *bp, register u_int length)
                case IPPROTO_ESP:
                    {
                        int enh, padlen;
                case IPPROTO_ESP:
                    {
                        int enh, padlen;

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

                        nh = enh & 0xff;
                        len -= padlen;
                        break;
                        nh = enh & 0xff;
                        len -= padlen;
                        break;


@@ -157,56 +191,29 @@ ip6_print(register const u_char *bp, register u_int length)
 
                case IPPROTO_PIM:
                        pim_print(cp, len);
 
                case IPPROTO_PIM:
                        pim_print(cp, len);

-                       goto end;
+                       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;
+                       return;

 
                case IPPROTO_IPV4:
                        ip_print(cp, len);
 
                case IPPROTO_IPV4:
                        ip_print(cp, len);

-                       goto end;
+                       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 = EXTRACT_32BITS(&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 %u]", ip6->ip6_hlim);
-
-       if (vflag) {
-               printf(" (");
-               (void)printf("len %u", payload_len);
-               if (ip6->ip6_hlim > 1)
-                       (void)printf(", hlim %d", (int)ip6->ip6_hlim);
-               printf(")");
-       }

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