Update from current NetBSD version of ieee80211_radiotap.h.

[tcpdump] / print-ip6opts.c

diff --git a/print-ip6opts.c b/print-ip6opts.c
index e087af3fc8e318e1baedf956629c35c865207f17..0a4fcf814b819744b78a8ca27cab514ca8844539 100644 (file)
--- a/print-ip6opts.c
+++ b/print-ip6opts.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.
 /*
  * Copyright (C) 1998 WIDE Project.
  * All rights reserved.

- * 
+ *

  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:


@@ -13,7 +13,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.

- * 
+ *

  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE


@@ -32,58 +32,139 @@
 #endif
 
 #ifndef lint
 #endif
 
 #ifndef lint

-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.5 2000-04-28 11:14:48 itojun Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.17.2.1 2005-04-20 22:19:06 guy Exp $";

 #endif
 
 #ifdef INET6
 #endif
 
 #ifdef INET6

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

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

+#include "ip6.h"
+

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

+#include "extract.h"

 
 

-void
-ip6_opt_print(const u_char *bp, int len)
+/* items outside of rfc2292bis */
+#ifndef IP6OPT_MINLEN
+#define IP6OPT_MINLEN  2
+#endif
+#ifndef IP6OPT_RTALERT_LEN
+#define IP6OPT_RTALERT_LEN     4
+#endif
+#ifndef IP6OPT_JUMBO_LEN
+#define IP6OPT_JUMBO_LEN       6
+#endif
+#define IP6OPT_HOMEADDR_MINLEN 18
+#define IP6OPT_BU_MINLEN       10
+#define IP6OPT_BA_MINLEN       13
+#define IP6OPT_BR_MINLEN        2
+#define IP6SOPT_UI            0x2
+#define IP6SOPT_UI_MINLEN       4
+#define IP6SOPT_ALTCOA        0x3
+#define IP6SOPT_ALTCOA_MINLEN  18
+#define IP6SOPT_AUTH          0x4
+#define IP6SOPT_AUTH_MINLEN     6
+
+static void ip6_sopt_print(const u_char *, int);
+
+static void
+ip6_sopt_print(const u_char *bp, int len)

 {
     int i;
     int optlen;
 
     for (i = 0; i < len; i += optlen) {
 {
     int i;
     int optlen;
 
     for (i = 0; i < len; i += optlen) {

+       if (bp[i] == IP6OPT_PAD1)
+           optlen = 1;
+       else {
+           if (i + 1 < len)
+               optlen = bp[i + 1] + 2;
+           else
+               goto trunc;
+       }
+       if (i + optlen > len)
+           goto trunc;
+

        switch (bp[i]) {
        switch (bp[i]) {

-#ifndef IP6OPT_PAD1
-#define IP6OPT_PAD1    0x00
-#endif

        case IP6OPT_PAD1:
        case IP6OPT_PAD1:

+            printf(", pad1");
+           break;
+       case IP6OPT_PADN:
+           if (len - i < IP6OPT_MINLEN) {
+               printf(", padn: trunc");
+               goto trunc;
+           }
+            printf(", padn");
+           break;
+        case IP6SOPT_UI:
+             if (len - i < IP6SOPT_UI_MINLEN) {
+               printf(", ui: trunc");
+               goto trunc;
+           }
+            printf(", ui: 0x%04x ", EXTRACT_16BITS(&bp[i + 2]));
+           break;
+        case IP6SOPT_ALTCOA:
+             if (len - i < IP6SOPT_ALTCOA_MINLEN) {
+               printf(", altcoa: trunc");
+               goto trunc;
+           }
+            printf(", alt-CoA: %s", ip6addr_string(&bp[i+2]));
+           break;
+        case IP6SOPT_AUTH:
+             if (len - i < IP6SOPT_AUTH_MINLEN) {
+               printf(", auth: trunc");
+               goto trunc;
+           }
+            printf(", auth spi: 0x%08x", EXTRACT_32BITS(&bp[i + 2]));
+           break;
+       default:
+           if (len - i < IP6OPT_MINLEN) {
+               printf(", sopt_type %d: trunc)", bp[i]);
+               goto trunc;
+           }
+           printf(", sopt_type 0x%02x: len=%d", bp[i], bp[i + 1]);
+           break;
+       }
+    }
+    return;
+
+trunc:
+    printf("[trunc] ");
+}
+
+void
+ip6_opt_print(const u_char *bp, int len)
+{
+    int i;
+    int optlen = 0;
+
+    for (i = 0; i < len; i += optlen) {
+       if (bp[i] == IP6OPT_PAD1)

            optlen = 1;
            optlen = 1;

+       else {
+           if (i + 1 < len)
+               optlen = bp[i + 1] + 2;
+           else
+               goto trunc;
+       }
+       if (i + optlen > len)
+           goto trunc;
+
+       switch (bp[i]) {
+       case IP6OPT_PAD1:
+            printf("(pad1)");

            break;
            break;

-#ifndef IP6OPT_PADN
-#define IP6OPT_PADN    0x01
-#endif

        case IP6OPT_PADN:
        case IP6OPT_PADN:

-#ifndef IP6OPT_MINLEN
-#define IP6OPT_MINLEN  2
-#endif

            if (len - i < IP6OPT_MINLEN) {
                printf("(padn: trunc)");
                goto trunc;
            }
            if (len - i < IP6OPT_MINLEN) {
                printf("(padn: trunc)");
                goto trunc;
            }

-           optlen = bp[i + 1] + 2;
+            printf("(padn)");

            break;
            break;

-#ifndef IP6OPT_RTALERT
-#define IP6OPT_RTALERT 0x05
-#endif
-       case IP6OPT_RTALERT:
-#ifndef IP6OPT_RTALERT_LEN
-#define IP6OPT_RTALERT_LEN     4
-#endif
+       case IP6OPT_ROUTER_ALERT:

            if (len - i < IP6OPT_RTALERT_LEN) {
                printf("(rtalert: trunc)");
                goto trunc;
            if (len - i < IP6OPT_RTALERT_LEN) {
                printf("(rtalert: trunc)");
                goto trunc;


@@ -92,16 +173,9 @@ ip6_opt_print(const u_char *bp, int len)
                printf("(rtalert: invalid len %d)", bp[i + 1]);
                goto trunc;
            }
                printf("(rtalert: invalid len %d)", bp[i + 1]);
                goto trunc;
            }

-           printf("(rtalert: 0x%04x) ", ntohs(*(u_int16_t *)&bp[i + 2]));
-           optlen = IP6OPT_RTALERT_LEN;
+           printf("(rtalert: 0x%04x) ", EXTRACT_16BITS(&bp[i + 2]));

            break;
            break;

-#ifndef IP6OPT_JUMBO
-#define IP6OPT_JUMBO   0xC2
-#endif

        case IP6OPT_JUMBO:
        case IP6OPT_JUMBO:

-#ifndef IP6OPT_JUMBO_LEN
-#define IP6OPT_JUMBO_LEN       6
-#endif

            if (len - i < IP6OPT_JUMBO_LEN) {
                printf("(jumbo: trunc)");
                goto trunc;
            if (len - i < IP6OPT_JUMBO_LEN) {
                printf("(jumbo: trunc)");
                goto trunc;


@@ -110,16 +184,94 @@ ip6_opt_print(const u_char *bp, int len)
                printf("(jumbo: invalid len %d)", bp[i + 1]);
                goto trunc;
            }
                printf("(jumbo: invalid len %d)", bp[i + 1]);
                goto trunc;
            }

-           printf("(jumbo: %u) ", (u_int32_t)ntohl(*(u_int32_t *)&bp[i + 2]));
-           optlen = IP6OPT_JUMBO_LEN;
+           printf("(jumbo: %u) ", EXTRACT_32BITS(&bp[i + 2]));
+           break;
+        case IP6OPT_HOME_ADDRESS:
+           if (len - i < IP6OPT_HOMEADDR_MINLEN) {
+               printf("(homeaddr: trunc)");
+               goto trunc;
+           }
+           if (bp[i + 1] < IP6OPT_HOMEADDR_MINLEN - 2) {
+               printf("(homeaddr: invalid len %d)", bp[i + 1]);
+               goto trunc;
+           }
+           printf("(homeaddr: %s", ip6addr_string(&bp[i + 2]));
+            if (bp[i + 1] > IP6OPT_HOMEADDR_MINLEN - 2) {
+               ip6_sopt_print(&bp[i + IP6OPT_HOMEADDR_MINLEN],
+                   (optlen - IP6OPT_HOMEADDR_MINLEN));
+           }
+            printf(")");
+           break;
+        case IP6OPT_BINDING_UPDATE:
+           if (len - i < IP6OPT_BU_MINLEN) {
+               printf("(bu: trunc)");
+               goto trunc;
+           }
+           if (bp[i + 1] < IP6OPT_BU_MINLEN - 2) {
+               printf("(bu: invalid len %d)", bp[i + 1]);
+               goto trunc;
+           }
+           printf("(bu: ");
+           if (bp[i + 2] & 0x80)
+                   printf("A");
+           if (bp[i + 2] & 0x40)
+                   printf("H");
+           if (bp[i + 2] & 0x20)
+                   printf("S");
+           if (bp[i + 2] & 0x10)
+                   printf("D");
+           if ((bp[i + 2] & 0x0f) || bp[i + 3] || bp[i + 4])
+                   printf("res");
+           printf(", sequence: %u", bp[i + 5]);
+           printf(", lifetime: %u", EXTRACT_32BITS(&bp[i + 6]));
+
+           if (bp[i + 1] > IP6OPT_BU_MINLEN - 2) {
+               ip6_sopt_print(&bp[i + IP6OPT_BU_MINLEN],
+                   (optlen - IP6OPT_BU_MINLEN));
+           }
+           printf(")");
+           break;
+       case IP6OPT_BINDING_ACK:
+           if (len - i < IP6OPT_BA_MINLEN) {
+               printf("(ba: trunc)");
+               goto trunc;
+           }
+           if (bp[i + 1] < IP6OPT_BA_MINLEN - 2) {
+               printf("(ba: invalid len %d)", bp[i + 1]);
+               goto trunc;
+           }
+           printf("(ba: ");
+           printf("status: %u", bp[i + 2]);
+           if (bp[i + 3])
+                   printf("res");
+           printf(", sequence: %u", bp[i + 4]);
+           printf(", lifetime: %u", EXTRACT_32BITS(&bp[i + 5]));
+           printf(", refresh: %u", EXTRACT_32BITS(&bp[i + 9]));
+
+           if (bp[i + 1] > IP6OPT_BA_MINLEN - 2) {
+               ip6_sopt_print(&bp[i + IP6OPT_BA_MINLEN],
+                   (optlen - IP6OPT_BA_MINLEN));
+           }
+            printf(")");
+           break;
+        case IP6OPT_BINDING_REQ:
+           if (len - i < IP6OPT_BR_MINLEN) {
+               printf("(br: trunc)");
+               goto trunc;
+           }
+            printf("(br");
+            if (bp[i + 1] > IP6OPT_BR_MINLEN - 2) {
+               ip6_sopt_print(&bp[i + IP6OPT_BR_MINLEN],
+                   (optlen - IP6OPT_BR_MINLEN));
+           }
+            printf(")");

            break;
        default:
            if (len - i < IP6OPT_MINLEN) {
                printf("(type %d: trunc)", bp[i]);
                goto trunc;
            }
            break;
        default:
            if (len - i < IP6OPT_MINLEN) {
                printf("(type %d: trunc)", bp[i]);
                goto trunc;
            }

-           printf("(type 0x%02x: len=%d) ", bp[i], bp[i + 1]);
-           optlen = bp[i + 1] + 2;
+           printf("(opt_type 0x%02x: len=%d) ", bp[i], bp[i + 1]);

            break;
        }
     }
            break;
        }
     }


@@ -137,14 +289,11 @@ int
 hbhopt_print(register const u_char *bp)
 {
     const struct ip6_hbh *dp = (struct ip6_hbh *)bp;
 hbhopt_print(register const u_char *bp)
 {
     const struct ip6_hbh *dp = (struct ip6_hbh *)bp;

-    register const u_char *ep;

     int hbhlen = 0;
 
     int hbhlen = 0;
 

-    /* 'ep' points to the end of avaible data. */
-    ep = snapend;

     TCHECK(dp->ip6h_len);
     hbhlen = (int)((dp->ip6h_len + 1) << 3);
     TCHECK(dp->ip6h_len);
     hbhlen = (int)((dp->ip6h_len + 1) << 3);

-    TCHECK2(dp, hbhlen);
+    TCHECK2(*dp, hbhlen);

     printf("HBH ");
     if (vflag)
        ip6_opt_print((const u_char *)dp + sizeof(*dp), hbhlen - sizeof(*dp));
     printf("HBH ");
     if (vflag)
        ip6_opt_print((const u_char *)dp + sizeof(*dp), hbhlen - sizeof(*dp));


@@ -153,21 +302,18 @@ hbhopt_print(register const u_char *bp)
 
   trunc:
     fputs("[|HBH]", stdout);
 
   trunc:
     fputs("[|HBH]", stdout);

-    return(hbhlen);
+    return(-1);

 }
 
 int
 dstopt_print(register const u_char *bp)
 {
     const struct ip6_dest *dp = (struct ip6_dest *)bp;
 }
 
 int
 dstopt_print(register const u_char *bp)
 {
     const struct ip6_dest *dp = (struct ip6_dest *)bp;

-    register const u_char *ep;

     int dstoptlen = 0;
 
     int dstoptlen = 0;
 

-    /* 'ep' points to the end of avaible data. */
-    ep = snapend;

     TCHECK(dp->ip6d_len);
     dstoptlen = (int)((dp->ip6d_len + 1) << 3);
     TCHECK(dp->ip6d_len);
     dstoptlen = (int)((dp->ip6d_len + 1) << 3);

-    TCHECK2(dp, dstoptlen);
+    TCHECK2(*dp, dstoptlen);

     printf("DSTOPT ");
     if (vflag) {
        ip6_opt_print((const u_char *)dp + sizeof(*dp),
     printf("DSTOPT ");
     if (vflag) {
        ip6_opt_print((const u_char *)dp + sizeof(*dp),


@@ -178,6 +324,6 @@ dstopt_print(register const u_char *bp)
 
   trunc:
     fputs("[|DSTOPT]", stdout);
 
   trunc:
     fputs("[|DSTOPT]", stdout);

-    return(dstoptlen);
+    return(-1);

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