Regenerate config files.

[tcpdump] / print-ip6opts.c

diff --git a/print-ip6opts.c b/print-ip6opts.c
index ac0ac905e1284bbe417a9c9fe7c8472a8af9adbf..4c16d80221294f5d2a1e812d6bfb2d05df9fb5e6 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


@@ -27,52 +27,22 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+/* \summary: IPv6 header option printer */
+

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-ip6opts.c,v 1.9 2001-05-09 02:47:26 itojun Exp $";
-#endif
-
-#ifdef INET6
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <stdio.h>
+#include <netdissect-stdinc.h>

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

-#include "interface.h"
+#include "netdissect.h"

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

-
-/* 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_ALTCOA        0x4
-#define IP6SOPT_ALTCOA_MINLEN  18
-#define IP6SOPT_UI            0x2
-#define IP6SOPT_UI_MINLEN       4
-
-static void ip6_sopt_print(const u_char *, int);
+#include "extract.h"

 
 static void
 
 static void

-ip6_sopt_print(const u_char *bp, int len)
+ip6_sopt_print(netdissect_options *ndo, const u_char *bp, int len)

 {
     int i;
     int optlen;
 {
     int i;
     int optlen;


@@ -91,50 +61,38 @@ ip6_sopt_print(const u_char *bp, int len)
 
        switch (bp[i]) {
        case IP6OPT_PAD1:
 
        switch (bp[i]) {
        case IP6OPT_PAD1:

-            printf(", pad1");
+            ND_PRINT((ndo, ", pad1"));

            break;
        case IP6OPT_PADN:
            if (len - i < IP6OPT_MINLEN) {
            break;
        case IP6OPT_PADN:
            if (len - i < IP6OPT_MINLEN) {

-               printf(", padn: trunc");
-               goto trunc;
-           }
-            printf(", padn");
-           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_UI:
-             if (len - i < IP6SOPT_UI_MINLEN) {
-               printf(", ui: trunc");
+               ND_PRINT((ndo, ", padn: trunc"));

                goto trunc;
            }
                goto trunc;
            }

-            printf("(ui: 0x%04x) ", ntohs(*(u_int16_t *)&bp[i + 2]));
+            ND_PRINT((ndo, ", padn"));

            break;
        default:
            if (len - i < IP6OPT_MINLEN) {
            break;
        default:
            if (len - i < IP6OPT_MINLEN) {

-               printf(", sopt_type %d: trunc)", bp[i]);
+               ND_PRINT((ndo, ", sopt_type %d: trunc)", bp[i]));

                goto trunc;
            }
                goto trunc;
            }

-           printf(", sopt_type 0x%02x: len=%d", bp[i], bp[i + 1]);
+           ND_PRINT((ndo, ", sopt_type 0x%02x: len=%d", bp[i], bp[i + 1]));

            break;
        }
     }
     return;
 
 trunc:
            break;
        }
     }
     return;
 
 trunc:

-    printf("[trunc] ");
+    ND_PRINT((ndo, "[trunc] "));

 }
 
 }
 

-void
-ip6_opt_print(const u_char *bp, int len)
+static void
+ip6_opt_print(netdissect_options *ndo, const u_char *bp, int len)

 {
     int i;
 {
     int i;

-    int optlen;
+    int optlen = 0;

 
 

+    if (len == 0)
+        return;

     for (i = 0; i < len; i += optlen) {
        if (bp[i] == IP6OPT_PAD1)
            optlen = 1;
     for (i = 0; i < len; i += optlen) {
        if (bp[i] == IP6OPT_PAD1)
            optlen = 1;


@@ -149,185 +107,107 @@ ip6_opt_print(const u_char *bp, int len)
 
        switch (bp[i]) {
        case IP6OPT_PAD1:
 
        switch (bp[i]) {
        case IP6OPT_PAD1:

-            printf("(pad1)");
+            ND_PRINT((ndo, "(pad1)"));

            break;
        case IP6OPT_PADN:
            if (len - i < IP6OPT_MINLEN) {
            break;
        case IP6OPT_PADN:
            if (len - i < IP6OPT_MINLEN) {

-               printf("(padn: trunc)");
+               ND_PRINT((ndo, "(padn: trunc)"));

                goto trunc;
            }
                goto trunc;
            }

-            printf("(padn)");
+            ND_PRINT((ndo, "(padn)"));

            break;
        case IP6OPT_ROUTER_ALERT:
            if (len - i < IP6OPT_RTALERT_LEN) {
            break;
        case IP6OPT_ROUTER_ALERT:
            if (len - i < IP6OPT_RTALERT_LEN) {

-               printf("(rtalert: trunc)");
+               ND_PRINT((ndo, "(rtalert: trunc)"));

                goto trunc;
            }
            if (bp[i + 1] != IP6OPT_RTALERT_LEN - 2) {
                goto trunc;
            }
            if (bp[i + 1] != IP6OPT_RTALERT_LEN - 2) {

-               printf("(rtalert: invalid len %d)", bp[i + 1]);
+               ND_PRINT((ndo, "(rtalert: invalid len %d)", bp[i + 1]));

                goto trunc;
            }
                goto trunc;
            }

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

            break;
        case IP6OPT_JUMBO:
            if (len - i < IP6OPT_JUMBO_LEN) {
            break;
        case IP6OPT_JUMBO:
            if (len - i < IP6OPT_JUMBO_LEN) {

-               printf("(jumbo: trunc)");
+               ND_PRINT((ndo, "(jumbo: trunc)"));

                goto trunc;
            }
            if (bp[i + 1] != IP6OPT_JUMBO_LEN - 2) {
                goto trunc;
            }
            if (bp[i + 1] != IP6OPT_JUMBO_LEN - 2) {

-               printf("(jumbo: invalid len %d)", bp[i + 1]);
+               ND_PRINT((ndo, "(jumbo: invalid len %d)", bp[i + 1]));

                goto trunc;
            }
                goto trunc;
            }

-           printf("(jumbo: %u) ", (u_int32_t)ntohl(*(u_int32_t *)&bp[i + 2]));
+           ND_PRINT((ndo, "(jumbo: %u) ", EXTRACT_32BITS(&bp[i + 2])));

            break;
         case IP6OPT_HOME_ADDRESS:
            if (len - i < IP6OPT_HOMEADDR_MINLEN) {
            break;
         case IP6OPT_HOME_ADDRESS:
            if (len - i < IP6OPT_HOMEADDR_MINLEN) {

-               printf("(homeaddr: trunc)");
+               ND_PRINT((ndo, "(homeaddr: trunc)"));

                goto trunc;
            }
            if (bp[i + 1] < IP6OPT_HOMEADDR_MINLEN - 2) {
                goto trunc;
            }
            if (bp[i + 1] < IP6OPT_HOMEADDR_MINLEN - 2) {

-               printf("(homeaddr: invalid len %d)", bp[i + 1]);
+               ND_PRINT((ndo, "(homeaddr: invalid len %d)", bp[i + 1]));

                goto trunc;
            }
                goto trunc;
            }

-           printf("(homeaddr: %s", ip6addr_string(&bp[i + 2]));
+           ND_PRINT((ndo, "(homeaddr: %s", ip6addr_string(ndo, &bp[i + 2])));

             if (bp[i + 1] > IP6OPT_HOMEADDR_MINLEN - 2) {
             if (bp[i + 1] > IP6OPT_HOMEADDR_MINLEN - 2) {

-               ip6_sopt_print(&bp[i + IP6OPT_HOMEADDR_MINLEN],
+               ip6_sopt_print(ndo, &bp[i + IP6OPT_HOMEADDR_MINLEN],

                    (optlen - 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("R");
-           if (bp[i + 2] & 0x10)
-                   printf("D");
-           if (bp[i + 2] & 0x0f)
-                   printf("res");
-           printf(", prefixlen: %u", bp[i + 3]);
-           printf(", sequence: %u",
-               (u_int16_t)ntohs(*(u_int16_t *)&bp[i + 4]));
-           printf(", lifetime: %u",
-               (u_int32_t)ntohs(*(u_int32_t *)&bp[i + 8]));
-
-           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]);
-           printf(", sequence: %u",
-               (u_int16_t)ntohs(*(u_int16_t *)&bp[i + 3]));
-           printf(", lifetime: %u",
-               (u_int32_t)ntohs(*(u_int32_t *)&bp[i + 7]));
-           printf(", refresh: %u",
-               (u_int32_t)ntohs(*(u_int32_t *)&bp[i + 11]));
-
-           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(")");
+            ND_PRINT((ndo, ")"));

            break;
        default:
            if (len - i < IP6OPT_MINLEN) {
            break;
        default:
            if (len - i < IP6OPT_MINLEN) {

-               printf("(type %d: trunc)", bp[i]);
+               ND_PRINT((ndo, "(type %d: trunc)", bp[i]));

                goto trunc;
            }
                goto trunc;
            }

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

            break;
        }
     }
            break;
        }
     }

-
-#if 0
-end:
-#endif
+    ND_PRINT((ndo, " "));

     return;
 
 trunc:
     return;
 
 trunc:

-    printf("[trunc] ");
+    ND_PRINT((ndo, "[trunc] "));

 }
 
 int
 }
 
 int

-hbhopt_print(register const u_char *bp)
+hbhopt_print(netdissect_options *ndo, register const u_char *bp)

 {
 {

-    const struct ip6_hbh *dp = (struct ip6_hbh *)bp;
-    register const u_char *ep;
+    const struct ip6_hbh *dp = (const struct ip6_hbh *)bp;

     int hbhlen = 0;
 
     int hbhlen = 0;
 

-    /* 'ep' points to the end of available data. */
-    ep = snapend;
-    TCHECK(dp->ip6h_len);
+    ND_TCHECK(dp->ip6h_len);

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

-    TCHECK2(*dp, hbhlen);
-    printf("HBH ");
-    if (vflag)
-       ip6_opt_print((const u_char *)dp + sizeof(*dp), hbhlen - sizeof(*dp));
+    ND_TCHECK2(*dp, hbhlen);
+    ND_PRINT((ndo, "HBH "));
+    if (ndo->ndo_vflag)
+       ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp), hbhlen - sizeof(*dp));

 
     return(hbhlen);
 
   trunc:
 
     return(hbhlen);
 
   trunc:

-    fputs("[|HBH]", stdout);
-    return(hbhlen);
+    ND_PRINT((ndo, "[|HBH]"));
+    return(-1);

 }
 
 int
 }
 
 int

-dstopt_print(register const u_char *bp)
+dstopt_print(netdissect_options *ndo, register const u_char *bp)

 {
 {

-    const struct ip6_dest *dp = (struct ip6_dest *)bp;
-    register const u_char *ep;
+    const struct ip6_dest *dp = (const struct ip6_dest *)bp;

     int dstoptlen = 0;
 
     int dstoptlen = 0;
 

-    /* 'ep' points to the end of available data. */
-    ep = snapend;
-    TCHECK(dp->ip6d_len);
+    ND_TCHECK(dp->ip6d_len);

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

-    TCHECK2(*dp, dstoptlen);
-    printf("DSTOPT ");
-    if (vflag) {
-       ip6_opt_print((const u_char *)dp + sizeof(*dp),
+    ND_TCHECK2(*dp, dstoptlen);
+    ND_PRINT((ndo, "DSTOPT "));
+    if (ndo->ndo_vflag) {
+       ip6_opt_print(ndo, (const u_char *)dp + sizeof(*dp),

            dstoptlen - sizeof(*dp));
     }
 
     return(dstoptlen);
 
   trunc:
            dstoptlen - sizeof(*dp));
     }
 
     return(dstoptlen);
 
   trunc:

-    fputs("[|DSTOPT]", stdout);
-    return(dstoptlen);
+    ND_PRINT((ndo, "[|DSTOPT]"));
+    return(-1);

 }
 }

-#endif /* INET6 */