icmp: clean up the extension code and comments.

[tcpdump] / print-icmp6.c

diff --git a/print-icmp6.c b/print-icmp6.c
index a0db5bbc40029da166ce103390ace83f3fba87b0..4a335270e5f53b99a8de20005e82682e5a7c65d9 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -22,10 +22,10 @@
 /* \summary: IPv6 Internet Control Message Protocol (ICMPv6) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: IPv6 Internet Control Message Protocol (ICMPv6) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

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


@@ -139,7 +139,7 @@ struct icmp6_hdr {
 #define ICMP6_MAXTYPE                  201
 
 #define ICMP6_DST_UNREACH_NOROUTE      0       /* no route to destination */
 #define ICMP6_MAXTYPE                  201
 
 #define ICMP6_DST_UNREACH_NOROUTE      0       /* no route to destination */

-#define ICMP6_DST_UNREACH_ADMIN                1       /* administratively prohibited */
+#define ICMP6_DST_UNREACH_ADMIN                1       /* administratively prohibited */

 #define ICMP6_DST_UNREACH_NOTNEIGHBOR  2       /* not a neighbor(obsolete) */
 #define ICMP6_DST_UNREACH_BEYONDSCOPE  2       /* beyond scope of source address */
 #define ICMP6_DST_UNREACH_ADDR         3       /* address unreachable */
 #define ICMP6_DST_UNREACH_NOTNEIGHBOR  2       /* not a neighbor(obsolete) */
 #define ICMP6_DST_UNREACH_BEYONDSCOPE  2       /* beyond scope of source address */
 #define ICMP6_DST_UNREACH_ADDR         3       /* address unreachable */


@@ -148,9 +148,10 @@ struct icmp6_hdr {
 #define ICMP6_TIME_EXCEED_TRANSIT      0       /* ttl==0 in transit */
 #define ICMP6_TIME_EXCEED_REASSEMBLY   1       /* ttl==0 in reass */
 
 #define ICMP6_TIME_EXCEED_TRANSIT      0       /* ttl==0 in transit */
 #define ICMP6_TIME_EXCEED_REASSEMBLY   1       /* ttl==0 in reass */
 

-#define ICMP6_PARAMPROB_HEADER                 0       /* erroneous header field */
+#define ICMP6_PARAMPROB_HEADER                 0       /* erroneous header field */

 #define ICMP6_PARAMPROB_NEXTHEADER     1       /* unrecognized next header */
 #define ICMP6_PARAMPROB_OPTION         2       /* unrecognized option */
 #define ICMP6_PARAMPROB_NEXTHEADER     1       /* unrecognized next header */
 #define ICMP6_PARAMPROB_OPTION         2       /* unrecognized option */

+#define ICMP6_PARAMPROB_FRAGHDRCHAIN   3       /* incomplete header chain */

 
 #define ICMP6_INFOMSG_MASK             0x80    /* all informational messages */
 
 
 #define ICMP6_INFOMSG_MASK             0x80    /* all informational messages */
 


@@ -175,7 +176,7 @@ struct icmp6_hdr {
  */
 struct mld6_hdr {
        struct icmp6_hdr        mld6_hdr;
  */
 struct mld6_hdr {
        struct icmp6_hdr        mld6_hdr;

-       struct in6_addr         mld6_addr; /* multicast address */
+       nd_ipv6                 mld6_addr; /* multicast address */

 };
 
 #define mld6_type      mld6_hdr.icmp6_type
 };
 
 #define mld6_type      mld6_hdr.icmp6_type


@@ -216,6 +217,7 @@ struct nd_router_advert {   /* router advertisement */
 #define ND_RA_FLAG_MANAGED     0x80
 #define ND_RA_FLAG_OTHER       0x40
 #define ND_RA_FLAG_HOME_AGENT  0x20
 #define ND_RA_FLAG_MANAGED     0x80
 #define ND_RA_FLAG_OTHER       0x40
 #define ND_RA_FLAG_HOME_AGENT  0x20

+#define ND_RA_FLAG_IPV6ONLY    0x02

 
 /*
  * Router preference values based on draft-draves-ipngwg-router-selection-01.
 
 /*
  * Router preference values based on draft-draves-ipngwg-router-selection-01.


@@ -232,7 +234,7 @@ struct nd_router_advert {   /* router advertisement */
 
 struct nd_neighbor_solicit {   /* neighbor solicitation */
        struct icmp6_hdr        nd_ns_hdr;
 
 struct nd_neighbor_solicit {   /* neighbor solicitation */
        struct icmp6_hdr        nd_ns_hdr;

-       struct in6_addr         nd_ns_target;   /*target address */
+       nd_ipv6                 nd_ns_target;   /*target address */

        /* could be followed by options */
 };
 
        /* could be followed by options */
 };
 


@@ -243,7 +245,7 @@ struct nd_neighbor_solicit {        /* neighbor solicitation */
 
 struct nd_neighbor_advert {    /* neighbor advertisement */
        struct icmp6_hdr        nd_na_hdr;
 
 struct nd_neighbor_advert {    /* neighbor advertisement */
        struct icmp6_hdr        nd_na_hdr;

-       struct in6_addr         nd_na_target;   /* target address */
+       nd_ipv6                 nd_na_target;   /* target address */

        /* could be followed by options */
 };
 
        /* could be followed by options */
 };
 


@@ -258,8 +260,8 @@ struct nd_neighbor_advert { /* neighbor advertisement */
 
 struct nd_redirect {           /* redirect */
        struct icmp6_hdr        nd_rd_hdr;
 
 struct nd_redirect {           /* redirect */
        struct icmp6_hdr        nd_rd_hdr;

-       struct in6_addr         nd_rd_target;   /* target address */
-       struct in6_addr         nd_rd_dst;      /* destination address */
+       nd_ipv6                 nd_rd_target;   /* target address */
+       nd_ipv6                 nd_rd_dst;      /* destination address */

        /* could be followed by options */
 };
 
        /* could be followed by options */
 };
 


@@ -286,14 +288,14 @@ struct nd_opt_hdr {               /* Neighbor discovery option header */
 #define ND_OPT_DNSSL                   31
 
 struct nd_opt_prefix_info {    /* prefix information */
 #define ND_OPT_DNSSL                   31
 
 struct nd_opt_prefix_info {    /* prefix information */

-       nd_uint8_t              nd_opt_pi_type;
-       nd_uint8_t              nd_opt_pi_len;
-       nd_uint8_t              nd_opt_pi_prefix_len;
-       nd_uint8_t              nd_opt_pi_flags_reserved;
-       nd_uint32_t             nd_opt_pi_valid_time;
-       nd_uint32_t             nd_opt_pi_preferred_time;
-       nd_uint32_t             nd_opt_pi_reserved2;
-       struct in6_addr nd_opt_pi_prefix;
+       nd_uint8_t      nd_opt_pi_type;
+       nd_uint8_t      nd_opt_pi_len;
+       nd_uint8_t      nd_opt_pi_prefix_len;
+       nd_uint8_t      nd_opt_pi_flags_reserved;
+       nd_uint32_t     nd_opt_pi_valid_time;
+       nd_uint32_t     nd_opt_pi_preferred_time;
+       nd_uint32_t     nd_opt_pi_reserved2;
+       nd_ipv6         nd_opt_pi_prefix;

 };
 
 #define ND_OPT_PI_FLAG_ONLINK          0x80
 };
 
 #define ND_OPT_PI_FLAG_ONLINK          0x80


@@ -320,7 +322,7 @@ struct nd_opt_rdnss {               /* RDNSS RFC 6106 5.1 */
        nd_uint8_t      nd_opt_rdnss_len;
        nd_uint16_t     nd_opt_rdnss_reserved;
        nd_uint32_t     nd_opt_rdnss_lifetime;
        nd_uint8_t      nd_opt_rdnss_len;
        nd_uint16_t     nd_opt_rdnss_reserved;
        nd_uint32_t     nd_opt_rdnss_lifetime;

-       struct in6_addr nd_opt_rdnss_addr[1];   /* variable-length */
+       nd_ipv6         nd_opt_rdnss_addr[1];   /* variable-length */

 };
 
 struct nd_opt_dnssl {          /* DNSSL RFC 6106 5.2 */
 };
 
 struct nd_opt_dnssl {          /* DNSSL RFC 6106 5.2 */


@@ -440,7 +442,7 @@ struct rr_pco_match {               /* match prefix part */
        nd_uint8_t              rpm_minlen;
        nd_uint8_t              rpm_maxlen;
        nd_uint16_t             rpm_reserved;
        nd_uint8_t              rpm_minlen;
        nd_uint8_t              rpm_maxlen;
        nd_uint16_t             rpm_reserved;

-       struct  in6_addr        rpm_prefix;
+       nd_ipv6                 rpm_prefix;

 };
 
 #define RPM_PCO_ADD            1
 };
 
 #define RPM_PCO_ADD            1


@@ -456,7 +458,7 @@ struct rr_pco_use {         /* use prefix part */
        nd_uint32_t     rpu_vltime;
        nd_uint32_t     rpu_pltime;
        nd_uint32_t     rpu_flags;
        nd_uint32_t     rpu_vltime;
        nd_uint32_t     rpu_pltime;
        nd_uint32_t     rpu_flags;

-       struct  in6_addr rpu_prefix;
+       nd_ipv6         rpu_prefix;

 };
 #define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK 0x80
 #define ICMP6_RR_PCOUSE_RAFLAGS_AUTO   0x40
 };
 #define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK 0x80
 #define ICMP6_RR_PCOUSE_RAFLAGS_AUTO   0x40


@@ -470,7 +472,7 @@ struct rr_result {          /* router renumbering result message */
        nd_uint8_t      rrr_ordinal;
        nd_uint8_t      rrr_matchedlen;
        nd_uint32_t     rrr_ifid;
        nd_uint8_t      rrr_ordinal;
        nd_uint8_t      rrr_matchedlen;
        nd_uint32_t     rrr_ifid;

-       struct  in6_addr rrr_prefix;
+       nd_ipv6         rrr_prefix;

 };
 /* network endian */
 #define ICMP6_RR_RESULT_FLAGS_OOB              ((uint16_t)htons(0x0002))
 };
 /* network endian */
 #define ICMP6_RR_RESULT_FLAGS_OOB              ((uint16_t)htons(0x0002))


@@ -479,7 +481,7 @@ struct rr_result {          /* router renumbering result message */
 static const char *get_rtpref(u_int);
 static const char *get_lifetime(uint32_t);
 static void print_lladdr(netdissect_options *ndo, const u_char *, size_t);
 static const char *get_rtpref(u_int);
 static const char *get_lifetime(uint32_t);
 static void print_lladdr(netdissect_options *ndo, const u_char *, size_t);

-static void icmp6_opt_print(netdissect_options *ndo, const u_char *, int);
+static int icmp6_opt_print(netdissect_options *ndo, const u_char *, int);

 static void mld6_print(netdissect_options *ndo, const u_char *);
 static void mldv2_report_print(netdissect_options *ndo, const u_char *, u_int);
 static void mldv2_query_print(netdissect_options *ndo, const u_char *, u_int);
 static void mld6_print(netdissect_options *ndo, const u_char *);
 static void mldv2_report_print(netdissect_options *ndo, const u_char *, u_int);
 static void mldv2_query_print(netdissect_options *ndo, const u_char *, u_int);


@@ -488,10 +490,6 @@ static void dnsname_print(netdissect_options *ndo, const u_char *, const u_char
 static void icmp6_nodeinfo_print(netdissect_options *ndo, u_int, const u_char *, const u_char *);
 static void icmp6_rrenum_print(netdissect_options *ndo, const u_char *, const u_char *);
 
 static void icmp6_nodeinfo_print(netdissect_options *ndo, u_int, const u_char *, const u_char *);
 static void icmp6_rrenum_print(netdissect_options *ndo, const u_char *, const u_char *);
 

-#ifndef abs
-#define abs(a) ((0 < (a)) ? (a) : -(a))
-#endif
-

 /*
  * DIO: Updated to RFC6550, as published in 2012: section 6. (page 30)
  */
 /*
  * DIO: Updated to RFC6550, as published in 2012: section 6. (page 30)
  */


@@ -698,6 +696,7 @@ static const struct tok icmp6_opt_ra_flag_values[] = {
     { ND_RA_FLAG_MANAGED, "managed" },
     { ND_RA_FLAG_OTHER, "other stateful"},
     { ND_RA_FLAG_HOME_AGENT, "home agent"},
     { ND_RA_FLAG_MANAGED, "managed" },
     { ND_RA_FLAG_OTHER, "other stateful"},
     { ND_RA_FLAG_HOME_AGENT, "home agent"},

+    { ND_RA_FLAG_IPV6ONLY, "ipv6 only"},

     { 0,       NULL }
 };
 
     { 0,       NULL }
 };
 


@@ -708,7 +707,6 @@ static const struct tok icmp6_nd_na_flag_values[] = {
     { 0,       NULL }
 };
 
     { 0,       NULL }
 };
 

-

 static const struct tok icmp6_opt_values[] = {
    { ND_OPT_SOURCE_LINKADDR, "source link-address"},
    { ND_OPT_TARGET_LINKADDR, "destination link-address"},
 static const struct tok icmp6_opt_values[] = {
    { ND_OPT_SOURCE_LINKADDR, "source link-address"},
    { ND_OPT_TARGET_LINKADDR, "destination link-address"},


@@ -769,14 +767,14 @@ print_lladdr(netdissect_options *ndo, const uint8_t *p, size_t l)
        ep = p + l;
        while (l > 0 && q < ep) {
                if (q > p)
        ep = p + l;
        while (l > 0 && q < ep) {
                if (q > p)

-                        ND_PRINT((ndo,":"));
-               ND_PRINT((ndo,"%02x", EXTRACT_U_1(q)));
+                        ND_PRINT(":");
+               ND_PRINT("%02x", GET_U_1(q));

                q++;
                l--;
        }
 }
 
                q++;
                l--;
        }
 }
 

-static int icmp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,
+static uint16_t icmp6_cksum(netdissect_options *ndo, const struct ip6_hdr *ip6,

        const struct icmp6_hdr *icp, u_int len)
 {
        return nextproto6_cksum(ndo, ip6, (const uint8_t *)(const void *)icp, len, len,
        const struct icmp6_hdr *icp, u_int len)
 {
        return nextproto6_cksum(ndo, ip6, (const uint8_t *)(const void *)icp, len, len,


@@ -813,18 +811,17 @@ rpl_printopts(netdissect_options *ndo, const uint8_t *opts, u_int length)
 
        while (length != 0) {
                opt = (const struct rpl_genoption *)opts;
 
        while (length != 0) {
                opt = (const struct rpl_genoption *)opts;

-               ND_TCHECK_1(opt->rpl_dio_type);
-               dio_type = EXTRACT_U_1(opt->rpl_dio_type);
+               dio_type = GET_U_1(opt->rpl_dio_type);

                if (dio_type == RPL_OPT_PAD1) {
                         optlen = 1;
                if (dio_type == RPL_OPT_PAD1) {
                         optlen = 1;

-                        ND_PRINT((ndo, " opt:pad1"));
+                        ND_PRINT(" opt:pad1");

                 } else {
                        if (length < RPL_GENOPTION_LEN)
                                goto trunc;
                 } else {
                        if (length < RPL_GENOPTION_LEN)
                                goto trunc;

-                       optlen = EXTRACT_U_1(opt->rpl_dio_len)+RPL_GENOPTION_LEN;
-                        ND_PRINT((ndo, " opt:%s len:%u ",
+                       optlen = GET_U_1(opt->rpl_dio_len)+RPL_GENOPTION_LEN;
+                        ND_PRINT(" opt:%s len:%u ",

                                   tok2str(rpl_subopt_values, "subopt:%u", dio_type),
                                   tok2str(rpl_subopt_values, "subopt:%u", dio_type),

-                                  optlen));
+                                  optlen);

                         ND_TCHECK_LEN(opt, optlen);
                         if (length < optlen)
                                goto trunc;
                         ND_TCHECK_LEN(opt, optlen);
                         if (length < optlen)
                                goto trunc;


@@ -840,8 +837,7 @@ rpl_printopts(netdissect_options *ndo, const uint8_t *opts, u_int length)
         }
         return;
 trunc:
         }
         return;
 trunc:

-       ND_PRINT((ndo," [|truncated]"));
-       return;
+       nd_print_trunc(ndo);

 }
 
 static void
 }
 
 static void


@@ -849,28 +845,25 @@ rpl_dio_print(netdissect_options *ndo,
               const u_char *bp, u_int length)
 {
         const struct nd_rpl_dio *dio = (const struct nd_rpl_dio *)bp;
               const u_char *bp, u_int length)
 {
         const struct nd_rpl_dio *dio = (const struct nd_rpl_dio *)bp;

-        const char *dagid_str;

 
 

-        ND_TCHECK_SIZE(dio);
-        dagid_str = ip6addr_string (ndo, dio->rpl_dagid);
-
-        ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u,rank:%u,%smop:%s,prf:%u]",
-                  dagid_str,
-                  EXTRACT_U_1(dio->rpl_dtsn),
-                  EXTRACT_U_1(dio->rpl_instanceid),
-                  EXTRACT_BE_U_2(dio->rpl_dagrank),
-                  RPL_DIO_GROUNDED(EXTRACT_U_1(dio->rpl_mopprf)) ? "grounded,":"",
-                  tok2str(rpl_mop_values, "mop%u", RPL_DIO_MOP(EXTRACT_U_1(dio->rpl_mopprf))),
-                  RPL_DIO_PRF(EXTRACT_U_1(dio->rpl_mopprf))));
+        ND_ICHECK_ZU(length, <, sizeof(struct nd_rpl_dio));
+        ND_PRINT(" [dagid:%s,seq:%u,instance:%u,rank:%u,%smop:%s,prf:%u]",
+                  GET_IP6ADDR_STRING(dio->rpl_dagid),
+                  GET_U_1(dio->rpl_dtsn),
+                  GET_U_1(dio->rpl_instanceid),
+                  GET_BE_U_2(dio->rpl_dagrank),
+                  RPL_DIO_GROUNDED(GET_U_1(dio->rpl_mopprf)) ? "grounded,":"",
+                  tok2str(rpl_mop_values, "mop%u",
+                          RPL_DIO_MOP(GET_U_1(dio->rpl_mopprf))),
+                  RPL_DIO_PRF(GET_U_1(dio->rpl_mopprf)));

 
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp + sizeof(struct nd_rpl_dio),
                               length - sizeof(struct nd_rpl_dio));
         }
 
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp + sizeof(struct nd_rpl_dio),
                               length - sizeof(struct nd_rpl_dio));
         }

-       return;
-trunc:
-       ND_PRINT((ndo," [|truncated]"));
-       return;
+        return;
+invalid:
+        nd_print_invalid(ndo);

 }
 
 static void
 }
 
 static void


@@ -881,42 +874,32 @@ rpl_dao_print(netdissect_options *ndo,
         const char *dagid_str = "<elided>";
         uint8_t rpl_flags;
 
         const char *dagid_str = "<elided>";
         uint8_t rpl_flags;
 

-        ND_TCHECK_SIZE(dao);
-        if (length < ND_RPL_DAO_MIN_LEN)
-               goto tooshort;
+        ND_ICHECK_U(length, <, ND_RPL_DAO_MIN_LEN);

 
         bp += ND_RPL_DAO_MIN_LEN;
         length -= ND_RPL_DAO_MIN_LEN;
 
         bp += ND_RPL_DAO_MIN_LEN;
         length -= ND_RPL_DAO_MIN_LEN;

-        rpl_flags = EXTRACT_U_1(dao->rpl_flags);
+        rpl_flags = GET_U_1(dao->rpl_flags);

         if(RPL_DAO_D(rpl_flags)) {
         if(RPL_DAO_D(rpl_flags)) {

-                ND_TCHECK_LEN(dao->rpl_dagid, DAGID_LEN);
-                if (length < DAGID_LEN)
-                       goto tooshort;
-                dagid_str = ip6addr_string (ndo, dao->rpl_dagid);
+                ND_ICHECK_U(length, <, DAGID_LEN);
+                dagid_str = GET_IP6ADDR_STRING(dao->rpl_dagid);

                 bp += DAGID_LEN;
                 length -= DAGID_LEN;
         }
 
                 bp += DAGID_LEN;
                 length -= DAGID_LEN;
         }
 

-        ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u%s%s,%02x]",
+        ND_PRINT(" [dagid:%s,seq:%u,instance:%u%s%s,flags:%02x]",

                   dagid_str,
                   dagid_str,

-                  EXTRACT_U_1(dao->rpl_daoseq),
-                  EXTRACT_U_1(dao->rpl_instanceid),
+                  GET_U_1(dao->rpl_daoseq),
+                  GET_U_1(dao->rpl_instanceid),

                   RPL_DAO_K(rpl_flags) ? ",acK":"",
                   RPL_DAO_D(rpl_flags) ? ",Dagid":"",
                   RPL_DAO_K(rpl_flags) ? ",acK":"",
                   RPL_DAO_D(rpl_flags) ? ",Dagid":"",

-                  rpl_flags));
+                  rpl_flags);

 
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp, length);
         }
 
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp, length);
         }

-       return;
-
-trunc:
-       ND_PRINT((ndo," [|truncated]"));
-       return;
-
-tooshort:
-       ND_PRINT((ndo," [|length too short]"));
-       return;
+        return;
+invalid:
+        nd_print_invalid(ndo);

 }
 
 static void
 }
 
 static void


@@ -926,40 +909,30 @@ rpl_daoack_print(netdissect_options *ndo,
         const struct nd_rpl_daoack *daoack = (const struct nd_rpl_daoack *)bp;
         const char *dagid_str = "<elided>";
 
         const struct nd_rpl_daoack *daoack = (const struct nd_rpl_daoack *)bp;
         const char *dagid_str = "<elided>";
 

-        ND_TCHECK_LEN(daoack, ND_RPL_DAOACK_MIN_LEN);
-        if (length < ND_RPL_DAOACK_MIN_LEN)
-               goto tooshort;
+        ND_ICHECK_U(length, <, ND_RPL_DAOACK_MIN_LEN);

 
         bp += ND_RPL_DAOACK_MIN_LEN;
         length -= ND_RPL_DAOACK_MIN_LEN;
 
         bp += ND_RPL_DAOACK_MIN_LEN;
         length -= ND_RPL_DAOACK_MIN_LEN;

-        if(RPL_DAOACK_D(EXTRACT_U_1(daoack->rpl_flags))) {
-                ND_TCHECK_LEN(daoack->rpl_dagid, DAGID_LEN);
-                if (length < DAGID_LEN)
-                       goto tooshort;
-                dagid_str = ip6addr_string (ndo, daoack->rpl_dagid);
+        if(RPL_DAOACK_D(GET_U_1(daoack->rpl_flags))) {
+                ND_ICHECK_U(length, <, DAGID_LEN);
+                dagid_str = GET_IP6ADDR_STRING(daoack->rpl_dagid);

                 bp += DAGID_LEN;
                 length -= DAGID_LEN;
         }
 
                 bp += DAGID_LEN;
                 length -= DAGID_LEN;
         }
 

-        ND_PRINT((ndo, " [dagid:%s,seq:%u,instance:%u,status:%u]",
+        ND_PRINT(" [dagid:%s,seq:%u,instance:%u,status:%u]",

                   dagid_str,
                   dagid_str,

-                  EXTRACT_U_1(daoack->rpl_daoseq),
-                  EXTRACT_U_1(daoack->rpl_instanceid),
-                  EXTRACT_U_1(daoack->rpl_status)));
+                  GET_U_1(daoack->rpl_daoseq),
+                  GET_U_1(daoack->rpl_instanceid),
+                  GET_U_1(daoack->rpl_status));

 
         /* no officially defined options for DAOACK, but print any we find */
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp, length);
         }
 
         /* no officially defined options for DAOACK, but print any we find */
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp, length);
         }

-       return;
-
-trunc:
-       ND_PRINT((ndo," [|dao-truncated]"));
-       return;
-
-tooshort:
-       ND_PRINT((ndo," [|dao-length too short]"));
-       return;
+        return;
+invalid:
+        nd_print_invalid(ndo);

 }
 
 static void
 }
 
 static void


@@ -971,55 +944,54 @@ rpl_print(netdissect_options *ndo,
         int basecode= icmp6_code & 0x7f;
 
         if(secured) {
         int basecode= icmp6_code & 0x7f;
 
         if(secured) {

-                ND_PRINT((ndo, ", (SEC) [worktodo]"));
+                ND_PRINT(", (SEC) [worktodo]");

                 /* XXX
                  * the next header pointer needs to move forward to
                  * skip the secure part.
                  */
                 return;
         } else {
                 /* XXX
                  * the next header pointer needs to move forward to
                  * skip the secure part.
                  */
                 return;
         } else {

-                ND_PRINT((ndo, ", (CLR)"));
+                ND_PRINT(", (CLR)");

         }
 
         switch(basecode) {
         case ND_RPL_DAG_IS:
         }
 
         switch(basecode) {
         case ND_RPL_DAG_IS:

-                ND_PRINT((ndo, "DODAG Information Solicitation"));
+                ND_PRINT("DODAG Information Solicitation");

                 if(ndo->ndo_vflag) {
                 }
                 break;
         case ND_RPL_DAG_IO:
                 if(ndo->ndo_vflag) {
                 }
                 break;
         case ND_RPL_DAG_IO:

-                ND_PRINT((ndo, "DODAG Information Object"));
+                ND_PRINT("DODAG Information Object");

                 if(ndo->ndo_vflag) {
                         rpl_dio_print(ndo, bp, length);
                 }
                 break;
         case ND_RPL_DAO:
                 if(ndo->ndo_vflag) {
                         rpl_dio_print(ndo, bp, length);
                 }
                 break;
         case ND_RPL_DAO:

-                ND_PRINT((ndo, "Destination Advertisement Object"));
+                ND_PRINT("Destination Advertisement Object");

                 if(ndo->ndo_vflag) {
                         rpl_dao_print(ndo, bp, length);
                 }
                 break;
         case ND_RPL_DAO_ACK:
                 if(ndo->ndo_vflag) {
                         rpl_dao_print(ndo, bp, length);
                 }
                 break;
         case ND_RPL_DAO_ACK:

-                ND_PRINT((ndo, "Destination Advertisement Object Ack"));
+                ND_PRINT("Destination Advertisement Object Ack");

                 if(ndo->ndo_vflag) {
                         rpl_daoack_print(ndo, bp, length);
                 }
                 break;
         default:
                 if(ndo->ndo_vflag) {
                         rpl_daoack_print(ndo, bp, length);
                 }
                 break;
         default:

-                ND_PRINT((ndo, "RPL message, unknown code %u",icmp6_code));
+                ND_PRINT("RPL message, unknown code %u",icmp6_code);

                 break;
         }
        return;
 
 #if 0
 trunc:
                 break;
         }
        return;
 
 #if 0
 trunc:

-       ND_PRINT((ndo," [|truncated]"));
+       nd_print_trunc(ndo);

        return;
 #endif
 
 }
 
        return;
 #endif
 
 }
 

-

 void
 icmp6_print(netdissect_options *ndo,
             const u_char *bp, u_int length, const u_char *bp2, int fragmented)
 void
 icmp6_print(netdissect_options *ndo,
             const u_char *bp, u_int length, const u_char *bp2, int fragmented)


@@ -1029,35 +1001,39 @@ icmp6_print(netdissect_options *ndo,
        const struct ip6_hdr *ip;
        const struct ip6_hdr *oip;
        const struct udphdr *ouh;
        const struct ip6_hdr *ip;
        const struct ip6_hdr *oip;
        const struct udphdr *ouh;

-       u_int dport;
+       uint16_t dport;

        const u_char *ep;
        u_int prot;
 
        const u_char *ep;
        u_int prot;
 

+       ndo->ndo_protocol = "icmp6";

        dp = (const struct icmp6_hdr *)bp;
        ip = (const struct ip6_hdr *)bp2;
        oip = (const struct ip6_hdr *)(dp + 1);
        /* 'ep' points to the end of available data. */
        ep = ndo->ndo_snapend;
        dp = (const struct icmp6_hdr *)bp;
        ip = (const struct ip6_hdr *)bp2;
        oip = (const struct ip6_hdr *)(dp + 1);
        /* 'ep' points to the end of available data. */
        ep = ndo->ndo_snapend;

+       if (length == 0) {
+               ND_PRINT("ICMP6, length 0");
+               nd_print_invalid(ndo);
+               return;
+       }

 
        if (ndo->ndo_vflag && !fragmented) {
                uint16_t sum, udp_sum;
 
                if (ND_TTEST_LEN(bp, length)) {
 
        if (ndo->ndo_vflag && !fragmented) {
                uint16_t sum, udp_sum;
 
                if (ND_TTEST_LEN(bp, length)) {

-                       ND_TCHECK(dp->icmp6_cksum);
-                       udp_sum = EXTRACT_BE_U_2(dp->icmp6_cksum);
+                       udp_sum = GET_BE_U_2(dp->icmp6_cksum);

                        sum = icmp6_cksum(ndo, ip, dp, length);
                        if (sum != 0)
                        sum = icmp6_cksum(ndo, ip, dp, length);
                        if (sum != 0)

-                               ND_PRINT((ndo,"[bad icmp6 cksum 0x%04x -> 0x%04x!] ",
+                               ND_PRINT("[bad icmp6 cksum 0x%04x -> 0x%04x!] ",

                                                 udp_sum,
                                                 udp_sum,

-                                                in_cksum_shouldbe(udp_sum, sum)));
+                                                in_cksum_shouldbe(udp_sum, sum));

                        else
                        else

-                               ND_PRINT((ndo,"[icmp6 sum ok] "));
+                               ND_PRINT("[icmp6 sum ok] ");

                }
        }
 
                }
        }
 

-       ND_TCHECK_1(dp->icmp6_type);
-       icmp6_type = EXTRACT_U_1(dp->icmp6_type);
-       ND_PRINT((ndo,"ICMP6, %s", tok2str(icmp6_type_values,"unknown icmp6 type (%u)",icmp6_type)));
+       icmp6_type = GET_U_1(dp->icmp6_type);
+       ND_PRINT("ICMP6, %s", tok2str(icmp6_type_values,"unknown icmp6 type (%u)",icmp6_type));

 
         /* display cosmetics: print the packet length for printer that use the vflag now */
         if (ndo->ndo_vflag && (icmp6_type == ND_ROUTER_SOLICIT ||
 
         /* display cosmetics: print the packet length for printer that use the vflag now */
         if (ndo->ndo_vflag && (icmp6_type == ND_ROUTER_SOLICIT ||


@@ -1067,48 +1043,46 @@ icmp6_print(netdissect_options *ndo,
                       icmp6_type == ND_REDIRECT ||
                       icmp6_type == ICMP6_HADISCOV_REPLY ||
                       icmp6_type == ICMP6_MOBILEPREFIX_ADVERT ))
                       icmp6_type == ND_REDIRECT ||
                       icmp6_type == ICMP6_HADISCOV_REPLY ||
                       icmp6_type == ICMP6_MOBILEPREFIX_ADVERT ))

-                ND_PRINT((ndo,", length %u", length));
+                ND_PRINT(", length %u", length);

 
 

-       ND_TCHECK_1(dp->icmp6_code);
-       icmp6_code = EXTRACT_U_1(dp->icmp6_code);
+       icmp6_code = GET_U_1(dp->icmp6_code);

 
        switch (icmp6_type) {
        case ICMP6_DST_UNREACH:
 
        switch (icmp6_type) {
        case ICMP6_DST_UNREACH:

-               ND_TCHECK(oip->ip6_dst);
-                ND_PRINT((ndo,", %s", tok2str(icmp6_dst_unreach_code_values,"unknown unreach code (%u)",icmp6_code)));
+                ND_PRINT(", %s", tok2str(icmp6_dst_unreach_code_values,"unknown unreach code (%u)",icmp6_code));

                switch (icmp6_code) {
 
                case ICMP6_DST_UNREACH_NOROUTE: /* fall through */
                case ICMP6_DST_UNREACH_ADMIN:
                case ICMP6_DST_UNREACH_ADDR:
                switch (icmp6_code) {
 
                case ICMP6_DST_UNREACH_NOROUTE: /* fall through */
                case ICMP6_DST_UNREACH_ADMIN:
                case ICMP6_DST_UNREACH_ADDR:

-                        ND_PRINT((ndo," %s",ip6addr_string(ndo, &oip->ip6_dst)));
+                        ND_PRINT(" %s",GET_IP6ADDR_STRING(oip->ip6_dst));

                         break;
                case ICMP6_DST_UNREACH_BEYONDSCOPE:
                         break;
                case ICMP6_DST_UNREACH_BEYONDSCOPE:

-                       ND_PRINT((ndo," %s, source address %s",
-                              ip6addr_string(ndo, &oip->ip6_dst),
-                                  ip6addr_string(ndo, &oip->ip6_src)));
+                       ND_PRINT(" %s, source address %s",
+                              GET_IP6ADDR_STRING(oip->ip6_dst),
+                                  GET_IP6ADDR_STRING(oip->ip6_src));

                        break;
                case ICMP6_DST_UNREACH_NOPORT:
                        if ((ouh = get_upperlayer(ndo, (const u_char *)oip, &prot))
                            == NULL)
                                goto trunc;
 
                        break;
                case ICMP6_DST_UNREACH_NOPORT:
                        if ((ouh = get_upperlayer(ndo, (const u_char *)oip, &prot))
                            == NULL)
                                goto trunc;
 

-                       dport = EXTRACT_BE_U_2(ouh->uh_dport);
+                       dport = GET_BE_U_2(ouh->uh_dport);

                        switch (prot) {
                        case IPPROTO_TCP:
                        switch (prot) {
                        case IPPROTO_TCP:

-                               ND_PRINT((ndo,", %s tcp port %s",
-                                       ip6addr_string(ndo, &oip->ip6_dst),
-                                          tcpport_string(ndo, dport)));
+                               ND_PRINT(", %s tcp port %s",
+                                       GET_IP6ADDR_STRING(oip->ip6_dst),
+                                          tcpport_string(ndo, dport));

                                break;
                        case IPPROTO_UDP:
                                break;
                        case IPPROTO_UDP:

-                               ND_PRINT((ndo,", %s udp port %s",
-                                       ip6addr_string(ndo, &oip->ip6_dst),
-                                          udpport_string(ndo, dport)));
+                               ND_PRINT(", %s udp port %s",
+                                       GET_IP6ADDR_STRING(oip->ip6_dst),
+                                          udpport_string(ndo, dport));

                                break;
                        default:
                                break;
                        default:

-                               ND_PRINT((ndo,", %s protocol %u port %u unreachable",
-                                       ip6addr_string(ndo, &oip->ip6_dst),
-                                          prot, dport));
+                               ND_PRINT(", %s protocol %u port %u unreachable",
+                                       GET_IP6ADDR_STRING(oip->ip6_dst),
+                                          prot, dport);

                                break;
                        }
                        break;
                                break;
                        }
                        break;


@@ -1121,55 +1095,60 @@ icmp6_print(netdissect_options *ndo,
                }
                break;
        case ICMP6_PACKET_TOO_BIG:
                }
                break;
        case ICMP6_PACKET_TOO_BIG:

-               ND_TCHECK_4(dp->icmp6_mtu);
-               ND_PRINT((ndo,", mtu %u", EXTRACT_BE_U_4(dp->icmp6_mtu)));
+               ND_PRINT(", mtu %u", GET_BE_U_4(dp->icmp6_mtu));

                break;
        case ICMP6_TIME_EXCEEDED:
                break;
        case ICMP6_TIME_EXCEEDED:

-               ND_TCHECK(oip->ip6_dst);

                switch (icmp6_code) {
                case ICMP6_TIME_EXCEED_TRANSIT:
                switch (icmp6_code) {
                case ICMP6_TIME_EXCEED_TRANSIT:

-                       ND_PRINT((ndo," for %s",
-                                  ip6addr_string(ndo, &oip->ip6_dst)));
+                       ND_PRINT(" for %s",
+                                  GET_IP6ADDR_STRING(oip->ip6_dst));

                        break;
                case ICMP6_TIME_EXCEED_REASSEMBLY:
                        break;
                case ICMP6_TIME_EXCEED_REASSEMBLY:

-                       ND_PRINT((ndo," (reassembly)"));
+                       ND_PRINT(" (reassembly)");

                        break;
                default:
                        break;
                default:

-                        ND_PRINT((ndo,", unknown code (%u)", icmp6_code));
+                        ND_PRINT(", unknown code (%u)", icmp6_code);

                        break;
                }
                break;
        case ICMP6_PARAM_PROB:
                        break;
                }
                break;
        case ICMP6_PARAM_PROB:

-               ND_TCHECK(oip->ip6_dst);
+               ND_TCHECK_16(oip->ip6_dst);

                switch (icmp6_code) {
                case ICMP6_PARAMPROB_HEADER:
                switch (icmp6_code) {
                case ICMP6_PARAMPROB_HEADER:

-                        ND_PRINT((ndo,", erroneous - octet %u", EXTRACT_BE_U_4(dp->icmp6_pptr)));
+                        ND_PRINT(", erroneous - octet %u",
+                                GET_BE_U_4(dp->icmp6_pptr));

                         break;
                case ICMP6_PARAMPROB_NEXTHEADER:
                         break;
                case ICMP6_PARAMPROB_NEXTHEADER:

-                        ND_PRINT((ndo,", next header - octet %u", EXTRACT_BE_U_4(dp->icmp6_pptr)));
+                        ND_PRINT(", next header - octet %u",
+                                GET_BE_U_4(dp->icmp6_pptr));

                         break;
                case ICMP6_PARAMPROB_OPTION:
                         break;
                case ICMP6_PARAMPROB_OPTION:

-                        ND_PRINT((ndo,", option - octet %u", EXTRACT_BE_U_4(dp->icmp6_pptr)));
+                        ND_PRINT(", option - octet %u",
+                                GET_BE_U_4(dp->icmp6_pptr));
+                        break;
+               case ICMP6_PARAMPROB_FRAGHDRCHAIN:
+                        ND_PRINT(", incomplete header chain - octet %u",
+                                GET_BE_U_4(dp->icmp6_pptr));

                         break;
                default:
                         break;
                default:

-                        ND_PRINT((ndo,", code-#%u",
-                                  icmp6_code));
+                        ND_PRINT(", code-#%u",
+                                  icmp6_code);

                         break;
                }
                break;
        case ICMP6_ECHO_REQUEST:
        case ICMP6_ECHO_REPLY:
                         break;
                }
                break;
        case ICMP6_ECHO_REQUEST:
        case ICMP6_ECHO_REPLY:

-                ND_TCHECK_2(dp->icmp6_seq);
-                ND_PRINT((ndo,", seq %u", EXTRACT_BE_U_2(dp->icmp6_seq)));
+                ND_PRINT(", id %u, seq %u", GET_BE_U_2(dp->icmp6_id),
+                        GET_BE_U_2(dp->icmp6_seq));

                break;
        case ICMP6_MEMBERSHIP_QUERY:
                if (length == MLD_MINLEN) {
                        mld6_print(ndo, (const u_char *)dp);
                } else if (length >= MLDV2_MINLEN) {
                break;
        case ICMP6_MEMBERSHIP_QUERY:
                if (length == MLD_MINLEN) {
                        mld6_print(ndo, (const u_char *)dp);
                } else if (length >= MLDV2_MINLEN) {

-                       ND_PRINT((ndo," v2"));
+                       ND_PRINT(" v2");

                        mldv2_query_print(ndo, (const u_char *)dp, length);
                } else {
                        mldv2_query_print(ndo, (const u_char *)dp, length);
                } else {

-                        ND_PRINT((ndo," unknown-version (len %u) ", length));
+                        ND_PRINT(" unknown-version (len %u) ", length);

                }
                break;
        case ICMP6_MEMBERSHIP_REPORT:
                }
                break;
        case ICMP6_MEMBERSHIP_REPORT:


@@ -1181,8 +1160,9 @@ icmp6_print(netdissect_options *ndo,
        case ND_ROUTER_SOLICIT:
 #define RTSOLLEN 8
                if (ndo->ndo_vflag) {
        case ND_ROUTER_SOLICIT:
 #define RTSOLLEN 8
                if (ndo->ndo_vflag) {

-                       icmp6_opt_print(ndo, (const u_char *)dp + RTSOLLEN,
-                                       length - RTSOLLEN);
+                       if (icmp6_opt_print(ndo, (const u_char *)dp + RTSOLLEN,
+                                           length - RTSOLLEN) == -1)
+                               goto trunc;

                }
                break;
        case ND_ROUTER_ADVERT:
                }
                break;
        case ND_ROUTER_ADVERT:


@@ -1191,30 +1171,30 @@ icmp6_print(netdissect_options *ndo,
                        const struct nd_router_advert *p;
 
                        p = (const struct nd_router_advert *)dp;
                        const struct nd_router_advert *p;
 
                        p = (const struct nd_router_advert *)dp;

-                       ND_TCHECK(p->nd_ra_retransmit);
-                       ND_PRINT((ndo,"\n\thop limit %u, Flags [%s]"
-                                  ", pref %s, router lifetime %us, reachable time %us, retrans time %us",
-                                  EXTRACT_U_1(p->nd_ra_curhoplimit),
-                                  bittok2str(icmp6_opt_ra_flag_values,"none",EXTRACT_U_1(p->nd_ra_flags_reserved)),
-                                  get_rtpref(EXTRACT_U_1(p->nd_ra_flags_reserved)),
-                                  EXTRACT_BE_U_2(p->nd_ra_router_lifetime),
-                                  EXTRACT_BE_U_4(p->nd_ra_reachable),
-                                  EXTRACT_BE_U_4(p->nd_ra_retransmit)));
-
-                       icmp6_opt_print(ndo, (const u_char *)dp + RTADVLEN,
-                                       length - RTADVLEN);
+                       ND_PRINT("\n\thop limit %u, Flags [%s]"
+                                  ", pref %s, router lifetime %us, reachable time %ums, retrans timer %ums",
+                                  GET_U_1(p->nd_ra_curhoplimit),
+                                  bittok2str(icmp6_opt_ra_flag_values,"none",GET_U_1(p->nd_ra_flags_reserved)),
+                                  get_rtpref(GET_U_1(p->nd_ra_flags_reserved)),
+                                  GET_BE_U_2(p->nd_ra_router_lifetime),
+                                  GET_BE_U_4(p->nd_ra_reachable),
+                                  GET_BE_U_4(p->nd_ra_retransmit));
+
+                       if (icmp6_opt_print(ndo, (const u_char *)dp + RTADVLEN,
+                                           length - RTADVLEN) == -1)
+                               goto trunc;

                }
                break;
        case ND_NEIGHBOR_SOLICIT:
            {
                const struct nd_neighbor_solicit *p;
                p = (const struct nd_neighbor_solicit *)dp;
                }
                break;
        case ND_NEIGHBOR_SOLICIT:
            {
                const struct nd_neighbor_solicit *p;
                p = (const struct nd_neighbor_solicit *)dp;

-               ND_TCHECK(p->nd_ns_target);
-               ND_PRINT((ndo,", who has %s", ip6addr_string(ndo, &p->nd_ns_target)));
+               ND_PRINT(", who has %s", GET_IP6ADDR_STRING(p->nd_ns_target));

                if (ndo->ndo_vflag) {
 #define NDSOLLEN 24
                if (ndo->ndo_vflag) {
 #define NDSOLLEN 24

-                       icmp6_opt_print(ndo, (const u_char *)dp + NDSOLLEN,
-                                       length - NDSOLLEN);
+                       if (icmp6_opt_print(ndo, (const u_char *)dp + NDSOLLEN,
+                                           length - NDSOLLEN) == -1)
+                               goto trunc;

                }
            }
                break;
                }
            }
                break;


@@ -1223,36 +1203,37 @@ icmp6_print(netdissect_options *ndo,
                const struct nd_neighbor_advert *p;
 
                p = (const struct nd_neighbor_advert *)dp;
                const struct nd_neighbor_advert *p;
 
                p = (const struct nd_neighbor_advert *)dp;

-               ND_TCHECK(p->nd_na_target);
-               ND_PRINT((ndo,", tgt is %s",
-                          ip6addr_string(ndo, &p->nd_na_target)));
+               ND_PRINT(", tgt is %s",
+                          GET_IP6ADDR_STRING(p->nd_na_target));

                if (ndo->ndo_vflag) {
                if (ndo->ndo_vflag) {

-                        ND_PRINT((ndo,", Flags [%s]",
+                        ND_PRINT(", Flags [%s]",

                                   bittok2str(icmp6_nd_na_flag_values,
                                              "none",
                                   bittok2str(icmp6_nd_na_flag_values,
                                              "none",

-                                             EXTRACT_BE_U_4(p->nd_na_flags_reserved))));
+                                             GET_BE_U_4(p->nd_na_flags_reserved)));

 #define NDADVLEN 24
 #define NDADVLEN 24

-                       icmp6_opt_print(ndo, (const u_char *)dp + NDADVLEN,
-                                       length - NDADVLEN);
+                       if (icmp6_opt_print(ndo, (const u_char *)dp + NDADVLEN,
+                                           length - NDADVLEN) == -1)
+                               goto trunc;

 #undef NDADVLEN
                }
            }
                break;
        case ND_REDIRECT:
 #undef NDADVLEN
                }
            }
                break;
        case ND_REDIRECT:

-#define RDR(i) ((const struct nd_redirect *)(i))
-                         ND_TCHECK(RDR(dp)->nd_rd_dst);
-                         ND_PRINT((ndo,", %s", ip6addr_string(ndo, &RDR(dp)->nd_rd_dst)));
-               ND_TCHECK(RDR(dp)->nd_rd_target);
-               ND_PRINT((ndo," to %s",
-                          ip6addr_string(ndo, &RDR(dp)->nd_rd_target)));
+           {
+               const struct nd_redirect *p;
+
+               p = (const struct nd_redirect *)dp;
+               ND_PRINT(", %s", GET_IP6ADDR_STRING(p->nd_rd_dst));
+               ND_PRINT(" to %s", GET_IP6ADDR_STRING(p->nd_rd_target));

 #define REDIRECTLEN 40
                if (ndo->ndo_vflag) {
 #define REDIRECTLEN 40
                if (ndo->ndo_vflag) {

-                       icmp6_opt_print(ndo, (const u_char *)dp + REDIRECTLEN,
-                                       length - REDIRECTLEN);
+                       if (icmp6_opt_print(ndo, (const u_char *)dp + REDIRECTLEN,
+                                           length - REDIRECTLEN) == -1)
+                               goto trunc;
+#undef REDIRECTLEN

                }
                }

+           }

                break;
                break;

-#undef REDIRECTLEN
-#undef RDR

        case ICMP6_ROUTER_RENUMBERING:
                icmp6_rrenum_print(ndo, bp, ep);
                break;
        case ICMP6_ROUTER_RENUMBERING:
                icmp6_rrenum_print(ndo, bp, ep);
                break;


@@ -1268,21 +1249,20 @@ icmp6_print(netdissect_options *ndo,
                break;
        case ICMP6_MOBILEPREFIX_SOLICIT: /* fall through */
        case ICMP6_HADISCOV_REQUEST:
                break;
        case ICMP6_MOBILEPREFIX_SOLICIT: /* fall through */
        case ICMP6_HADISCOV_REQUEST:

-                ND_TCHECK(dp->icmp6_data16[0]);
-                ND_PRINT((ndo,", id 0x%04x", EXTRACT_BE_U_2(&dp->icmp6_data16[0])));
+                ND_PRINT(", id 0x%04x", GET_BE_U_2(dp->icmp6_data16[0]));

                 break;
        case ICMP6_HADISCOV_REPLY:
                if (ndo->ndo_vflag) {
                 break;
        case ICMP6_HADISCOV_REPLY:
                if (ndo->ndo_vflag) {

-                       const struct in6_addr *in6;

                        const u_char *cp;
                        const u_char *cp;

+                       const u_char *p;

 
 

-                       ND_TCHECK(dp->icmp6_data16[0]);
-                       ND_PRINT((ndo,", id 0x%04x", EXTRACT_BE_U_2(&dp->icmp6_data16[0])));
+                       ND_PRINT(", id 0x%04x",
+                                GET_BE_U_2(dp->icmp6_data16[0]));

                        cp = (const u_char *)dp + length;
                        cp = (const u_char *)dp + length;

-                       in6 = (const struct in6_addr *)(dp + 1);
-                       for (; (const u_char *)in6 < cp; in6++) {
-                               ND_TCHECK_SIZE(in6);
-                               ND_PRINT((ndo,", %s", ip6addr_string(ndo, in6)));
+                       p = (const u_char *)(dp + 1);
+                       while (p < cp) {
+                               ND_PRINT(", %s", GET_IP6ADDR_STRING(p));
+                               p += 16;

                        }
                }
                break;
                        }
                }
                break;


@@ -1290,19 +1270,19 @@ icmp6_print(netdissect_options *ndo,
                if (ndo->ndo_vflag) {
                        uint16_t flags;
 
                if (ndo->ndo_vflag) {
                        uint16_t flags;
 

-                       ND_TCHECK_2(dp->icmp6_data16[0]);
-                       ND_PRINT((ndo,", id 0x%04x", EXTRACT_BE_U_2(dp->icmp6_data16[0])));
-                       ND_TCHECK_2(dp->icmp6_data16[1]);
-                       flags = EXTRACT_BE_U_2(dp->icmp6_data16[1]);
+                       ND_PRINT(", id 0x%04x",
+                                GET_BE_U_2(dp->icmp6_data16[0]));
+                       flags = GET_BE_U_2(dp->icmp6_data16[1]);

                        if (flags & 0xc000)
                        if (flags & 0xc000)

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

                        if (flags & 0x8000)
                        if (flags & 0x8000)

-                               ND_PRINT((ndo,"M"));
+                               ND_PRINT("M");

                        if (flags & 0x4000)
                        if (flags & 0x4000)

-                               ND_PRINT((ndo,"O"));
+                               ND_PRINT("O");

 #define MPADVLEN 8
 #define MPADVLEN 8

-                       icmp6_opt_print(ndo, (const u_char *)dp + MPADVLEN,
-                                       length - MPADVLEN);
+                       if (icmp6_opt_print(ndo, (const u_char *)dp + MPADVLEN,
+                                           length - MPADVLEN) == -1)
+                               goto trunc;

                }
                break;
         case ND_RPL_MESSAGE:
                }
                break;
         case ND_RPL_MESSAGE:


@@ -1310,16 +1290,16 @@ icmp6_print(netdissect_options *ndo,
                 rpl_print(ndo, icmp6_code, dp->icmp6_data, length-sizeof(struct icmp6_hdr)+4);
                 break;
        default:
                 rpl_print(ndo, icmp6_code, dp->icmp6_data, length-sizeof(struct icmp6_hdr)+4);
                 break;
        default:

-                ND_PRINT((ndo,", length %u", length));
+                ND_PRINT(", length %u", length);

                 if (ndo->ndo_vflag <= 1)
                         print_unknown_data(ndo, bp,"\n\t", length);
                 return;
         }
         if (!ndo->ndo_vflag)
                 if (ndo->ndo_vflag <= 1)
                         print_unknown_data(ndo, bp,"\n\t", length);
                 return;
         }
         if (!ndo->ndo_vflag)

-                ND_PRINT((ndo,", length %u", length));
+                ND_PRINT(", length %u", length);

        return;
 trunc:
        return;
 trunc:

-       ND_PRINT((ndo, "[|icmp6]"));
+       nd_print_trunc(ndo);

 }
 
 static const struct udphdr *
 }
 
 static const struct udphdr *


@@ -1337,10 +1317,10 @@ get_upperlayer(netdissect_options *ndo, const u_char *bp, u_int *prot)
        /* 'ep' points to the end of available data. */
        ep = ndo->ndo_snapend;
 
        /* 'ep' points to the end of available data. */
        ep = ndo->ndo_snapend;
 

-       if (!ND_TTEST(ip6->ip6_nxt))
+       if (!ND_TTEST_1(ip6->ip6_nxt))

                return NULL;
 
                return NULL;
 

-       nh = EXTRACT_U_1(ip6->ip6_nxt);
+       nh = GET_U_1(ip6->ip6_nxt);

        hlen = sizeof(struct ip6_hdr);
 
        while (bp < ep) {
        hlen = sizeof(struct ip6_hdr);
 
        while (bp < ep) {


@@ -1350,7 +1330,7 @@ get_upperlayer(netdissect_options *ndo, const u_char *bp, u_int *prot)
                case IPPROTO_UDP:
                case IPPROTO_TCP:
                        uh = (const struct udphdr *)bp;
                case IPPROTO_UDP:
                case IPPROTO_TCP:
                        uh = (const struct udphdr *)bp;

-                       if (ND_TTEST(uh->uh_dport)) {
+                       if (ND_TTEST_2(uh->uh_dport)) {

                                *prot = nh;
                                return(uh);
                        }
                                *prot = nh;
                                return(uh);
                        }


@@ -1362,29 +1342,29 @@ get_upperlayer(netdissect_options *ndo, const u_char *bp, u_int *prot)
                case IPPROTO_DSTOPTS:
                case IPPROTO_ROUTING:
                        hbh = (const struct ip6_hbh *)bp;
                case IPPROTO_DSTOPTS:
                case IPPROTO_ROUTING:
                        hbh = (const struct ip6_hbh *)bp;

-                       if (!ND_TTEST(hbh->ip6h_len))
+                       if (!ND_TTEST_1(hbh->ip6h_len))

                                return(NULL);
                                return(NULL);

-                       nh = EXTRACT_U_1(hbh->ip6h_nxt);
-                       hlen = (EXTRACT_U_1(hbh->ip6h_len) + 1) << 3;
+                       nh = GET_U_1(hbh->ip6h_nxt);
+                       hlen = (GET_U_1(hbh->ip6h_len) + 1) << 3;

                        break;
 
                case IPPROTO_FRAGMENT: /* this should be odd, but try anyway */
                        fragh = (const struct ip6_frag *)bp;
                        break;
 
                case IPPROTO_FRAGMENT: /* this should be odd, but try anyway */
                        fragh = (const struct ip6_frag *)bp;

-                       if (!ND_TTEST(fragh->ip6f_offlg))
+                       if (!ND_TTEST_2(fragh->ip6f_offlg))

                                return(NULL);
                        /* fragments with non-zero offset are meaningless */
                                return(NULL);
                        /* fragments with non-zero offset are meaningless */

-                       if ((EXTRACT_BE_U_2(fragh->ip6f_offlg) & IP6F_OFF_MASK) != 0)
+                       if ((GET_BE_U_2(fragh->ip6f_offlg) & IP6F_OFF_MASK) != 0)

                                return(NULL);
                                return(NULL);

-                       nh = EXTRACT_U_1(fragh->ip6f_nxt);
+                       nh = GET_U_1(fragh->ip6f_nxt);

                        hlen = sizeof(struct ip6_frag);
                        break;
 
                case IPPROTO_AH:
                        ah = (const struct ah *)bp;
                        hlen = sizeof(struct ip6_frag);
                        break;
 
                case IPPROTO_AH:
                        ah = (const struct ah *)bp;

-                       if (!ND_TTEST(ah->ah_len))
+                       if (!ND_TTEST_1(ah->ah_len))

                                return(NULL);
                                return(NULL);

-                       nh = EXTRACT_U_1(ah->ah_nxt);
-                       hlen = (EXTRACT_U_1(ah->ah_len) + 2) << 2;
+                       nh = GET_U_1(ah->ah_nxt);
+                       hlen = (GET_U_1(ah->ah_len) + 2) << 2;

                        break;
 
                default:        /* unknown or undecodable header */
                        break;
 
                default:        /* unknown or undecodable header */


@@ -1396,11 +1376,12 @@ get_upperlayer(netdissect_options *ndo, const u_char *bp, u_int *prot)
        return(NULL);           /* should be notreached, though */
 }
 
        return(NULL);           /* should be notreached, though */
 }
 

-static void
+static int

 icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
 {
        const struct nd_opt_hdr *op;
 icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
 {
        const struct nd_opt_hdr *op;

-       uint8_t opt_type, opt_len;
+       uint8_t opt_type;
+       u_int opt_len;

        const struct nd_opt_prefix_info *opp;
        const struct nd_opt_mtu *opm;
        const struct nd_opt_rdnss *oprd;
        const struct nd_opt_prefix_info *opp;
        const struct nd_opt_mtu *opm;
        const struct nd_opt_rdnss *oprd;


@@ -1409,13 +1390,10 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
        const struct nd_opt_homeagent_info *oph;
        const struct nd_opt_route_info *opri;
        const u_char *cp, *ep, *domp;
        const struct nd_opt_homeagent_info *oph;
        const struct nd_opt_route_info *opri;
        const u_char *cp, *ep, *domp;

-       struct in6_addr in6;
-       const struct in6_addr *in6p;
+       nd_ipv6 in6;

        size_t l;
        u_int i;
 
        size_t l;
        u_int i;
 

-#define ECHECK(var) if ((const u_char *)&(var) > ep - sizeof(var)) return
-

        cp = bp;
        /* 'ep' points to the end of available data. */
        ep = ndo->ndo_snapend;
        cp = bp;
        /* 'ep' points to the end of available data. */
        ep = ndo->ndo_snapend;


@@ -1423,21 +1401,21 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
        while (cp < ep) {
                op = (const struct nd_opt_hdr *)cp;
 
        while (cp < ep) {
                op = (const struct nd_opt_hdr *)cp;
 

-               ECHECK(op->nd_opt_len);
+               ND_TCHECK_1(op->nd_opt_len);

                if (resid <= 0)
                if (resid <= 0)

-                       return;
-               opt_type = EXTRACT_U_1(op->nd_opt_type);
-               opt_len = EXTRACT_U_1(op->nd_opt_len);
+                       return 0;
+               opt_type = GET_U_1(op->nd_opt_type);
+               opt_len = GET_U_1(op->nd_opt_len);

                if (opt_len == 0)
                        goto trunc;
                if (cp + (opt_len << 3) > ep)
                        goto trunc;
 
                if (opt_len == 0)
                        goto trunc;
                if (cp + (opt_len << 3) > ep)
                        goto trunc;
 

-                ND_PRINT((ndo,"\n\t  %s option (%u), length %u (%u): ",
+                ND_PRINT("\n\t  %s option (%u), length %u (%u): ",

                           tok2str(icmp6_opt_values, "unknown", opt_type),
                           opt_type,
                           opt_len << 3,
                           tok2str(icmp6_opt_values, "unknown", opt_type),
                           opt_type,
                           opt_len << 3,

-                          opt_len));
+                          opt_len);

 
                switch (opt_type) {
                case ND_OPT_SOURCE_LINKADDR:
 
                switch (opt_type) {
                case ND_OPT_SOURCE_LINKADDR:


@@ -1450,14 +1428,14 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
                        break;
                case ND_OPT_PREFIX_INFORMATION:
                        opp = (const struct nd_opt_prefix_info *)op;
                        break;
                case ND_OPT_PREFIX_INFORMATION:
                        opp = (const struct nd_opt_prefix_info *)op;

-                       ND_TCHECK(opp->nd_opt_pi_prefix);
-                        ND_PRINT((ndo,"%s/%u%s, Flags [%s], valid time %s",
-                                  ip6addr_string(ndo, &opp->nd_opt_pi_prefix),
-                                  EXTRACT_U_1(opp->nd_opt_pi_prefix_len),
+                        ND_PRINT("%s/%u%s, Flags [%s], valid time %s",
+                                  GET_IP6ADDR_STRING(opp->nd_opt_pi_prefix),
+                                  GET_U_1(opp->nd_opt_pi_prefix_len),

                                   (opt_len != 4) ? "badlen" : "",
                                   (opt_len != 4) ? "badlen" : "",

-                                  bittok2str(icmp6_opt_pi_flag_values, "none", EXTRACT_U_1(opp->nd_opt_pi_flags_reserved)),
-                                  get_lifetime(EXTRACT_BE_U_4(opp->nd_opt_pi_valid_time))));
-                        ND_PRINT((ndo,", pref. time %s", get_lifetime(EXTRACT_BE_U_4(opp->nd_opt_pi_preferred_time))));
+                                  bittok2str(icmp6_opt_pi_flag_values, "none", GET_U_1(opp->nd_opt_pi_flags_reserved)),
+                                  get_lifetime(GET_BE_U_4(opp->nd_opt_pi_valid_time)));
+                        ND_PRINT(", pref. time %s",
+                                get_lifetime(GET_BE_U_4(opp->nd_opt_pi_preferred_time)));

                        break;
                case ND_OPT_REDIRECTED_HEADER:
                         print_unknown_data(ndo, bp,"\n\t    ",opt_len<<3);
                        break;
                case ND_OPT_REDIRECTED_HEADER:
                         print_unknown_data(ndo, bp,"\n\t    ",opt_len<<3);


@@ -1465,75 +1443,70 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
                        break;
                case ND_OPT_MTU:
                        opm = (const struct nd_opt_mtu *)op;
                        break;
                case ND_OPT_MTU:
                        opm = (const struct nd_opt_mtu *)op;

-                       ND_TCHECK(opm->nd_opt_mtu_mtu);
-                       ND_PRINT((ndo," %u%s",
-                               EXTRACT_BE_U_4(opm->nd_opt_mtu_mtu),
-                               (opt_len != 1) ? "bad option length" : "" ));
+                       ND_PRINT(" %u%s",
+                               GET_BE_U_4(opm->nd_opt_mtu_mtu),
+                               (opt_len != 1) ? "bad option length" : "" );

                         break;
                case ND_OPT_RDNSS:
                        oprd = (const struct nd_opt_rdnss *)op;
                        l = (opt_len - 1) / 2;
                         break;
                case ND_OPT_RDNSS:
                        oprd = (const struct nd_opt_rdnss *)op;
                        l = (opt_len - 1) / 2;

-                       ND_PRINT((ndo," lifetime %us,",
-                                  EXTRACT_BE_U_4(oprd->nd_opt_rdnss_lifetime)));
+                       ND_PRINT(" lifetime %us,",
+                                  GET_BE_U_4(oprd->nd_opt_rdnss_lifetime));

                        for (i = 0; i < l; i++) {
                        for (i = 0; i < l; i++) {

-                               ND_TCHECK(oprd->nd_opt_rdnss_addr[i]);
-                               ND_PRINT((ndo," addr: %s",
-                                          ip6addr_string(ndo, &oprd->nd_opt_rdnss_addr[i])));
+                               ND_PRINT(" addr: %s",
+                                          GET_IP6ADDR_STRING(oprd->nd_opt_rdnss_addr[i]));

                        }
                        break;
                case ND_OPT_DNSSL:
                        opds = (const struct nd_opt_dnssl *)op;
                        }
                        break;
                case ND_OPT_DNSSL:
                        opds = (const struct nd_opt_dnssl *)op;

-                       ND_PRINT((ndo," lifetime %us, domain(s):",
-                                  EXTRACT_BE_U_4(opds->nd_opt_dnssl_lifetime)));
+                       ND_PRINT(" lifetime %us, domain(s):",
+                                  GET_BE_U_4(opds->nd_opt_dnssl_lifetime));

                        domp = cp + 8; /* domain names, variable-sized, RFC1035-encoded */
                        domp = cp + 8; /* domain names, variable-sized, RFC1035-encoded */

-                       while (domp < cp + (opt_len << 3) && EXTRACT_U_1(domp) != '\0')
+                       while (domp < cp + (opt_len << 3) && GET_U_1(domp) != '\0')

                        {
                        {

-                               ND_PRINT((ndo, " "));
-                               if ((domp = ns_nprint (ndo, domp, bp)) == NULL)
+                               ND_PRINT(" ");
+                               if ((domp = fqdn_print(ndo, domp, bp)) == NULL)

                                        goto trunc;
                        }
                        break;
                case ND_OPT_ADVINTERVAL:
                        opa = (const struct nd_opt_advinterval *)op;
                                        goto trunc;
                        }
                        break;
                case ND_OPT_ADVINTERVAL:
                        opa = (const struct nd_opt_advinterval *)op;

-                       ND_TCHECK(opa->nd_opt_adv_interval);
-                       ND_PRINT((ndo," %ums", EXTRACT_BE_U_4(opa->nd_opt_adv_interval)));
+                       ND_PRINT(" %ums",
+                                GET_BE_U_4(opa->nd_opt_adv_interval));

                        break;
                 case ND_OPT_HOMEAGENT_INFO:
                        oph = (const struct nd_opt_homeagent_info *)op;
                        break;
                 case ND_OPT_HOMEAGENT_INFO:
                        oph = (const struct nd_opt_homeagent_info *)op;

-                       ND_TCHECK(oph->nd_opt_hai_lifetime);
-                       ND_PRINT((ndo," preference %u, lifetime %u",
-                                  EXTRACT_BE_U_2(oph->nd_opt_hai_preference),
-                                  EXTRACT_BE_U_2(oph->nd_opt_hai_lifetime)));
+                       ND_PRINT(" preference %u, lifetime %u",
+                                  GET_BE_U_2(oph->nd_opt_hai_preference),
+                                  GET_BE_U_2(oph->nd_opt_hai_lifetime));

                        break;
                case ND_OPT_ROUTE_INFO:
                        opri = (const struct nd_opt_route_info *)op;
                        break;
                case ND_OPT_ROUTE_INFO:
                        opri = (const struct nd_opt_route_info *)op;

-                       ND_TCHECK(opri->nd_opt_rti_lifetime);
+                       ND_TCHECK_4(opri->nd_opt_rti_lifetime);

                        memset(&in6, 0, sizeof(in6));
                        memset(&in6, 0, sizeof(in6));

-                       in6p = (const struct in6_addr *)(opri + 1);

                        switch (opt_len) {
                        case 1:
                                break;
                        case 2:
                        switch (opt_len) {
                        case 1:
                                break;
                        case 2:

-                               ND_TCHECK_8(in6p);
-                               memcpy(&in6, opri + 1, 8);
+                               GET_CPY_BYTES(&in6, opri + 1, 8);

                                break;
                        case 3:
                                break;
                        case 3:

-                               ND_TCHECK_SIZE(in6p);
-                               memcpy(&in6, opri + 1, sizeof(in6));
+                               GET_CPY_BYTES(&in6, opri + 1, 16);

                                break;
                        default:
                                goto trunc;
                        }
                                break;
                        default:
                                goto trunc;
                        }

-                       ND_PRINT((ndo," %s/%u", ip6addr_string(ndo, &in6),
-                                  EXTRACT_U_1(opri->nd_opt_rti_prefixlen)));
-                       ND_PRINT((ndo,", pref=%s", get_rtpref(EXTRACT_U_1(opri->nd_opt_rti_flags))));
-                       ND_PRINT((ndo,", lifetime=%s",
-                                  get_lifetime(EXTRACT_BE_U_4(opri->nd_opt_rti_lifetime))));
+                       ND_PRINT(" %s/%u", ip6addr_string(ndo, (const u_char *)&in6), /* local buffer, not packet data; don't use GET_IP6ADDR_STRING() */
+                                  GET_U_1(opri->nd_opt_rti_prefixlen));
+                       ND_PRINT(", pref=%s",
+                                get_rtpref(GET_U_1(opri->nd_opt_rti_flags)));
+                       ND_PRINT(", lifetime=%s",
+                                  get_lifetime(GET_BE_U_4(opri->nd_opt_rti_lifetime)));

                        break;
                default:
                         if (ndo->ndo_vflag <= 1) {
                                 print_unknown_data(ndo,cp+2,"\n\t  ", (opt_len << 3) - 2); /* skip option header */
                        break;
                default:
                         if (ndo->ndo_vflag <= 1) {
                                 print_unknown_data(ndo,cp+2,"\n\t  ", (opt_len << 3) - 2); /* skip option header */

-                            return;
+                            return 0;

                         }
                         break;
                }
                         }
                         break;
                }


@@ -1544,12 +1517,10 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
                cp += opt_len << 3;
                resid -= opt_len << 3;
        }
                cp += opt_len << 3;
                resid -= opt_len << 3;
        }

-       return;
+       return 0;

 
 

- trunc:
-       ND_PRINT((ndo, "[ndp opt]"));
-       return;
-#undef ECHECK
+trunc:
+       return -1;

 }
 
 static void
 }
 
 static void


@@ -1564,8 +1535,8 @@ mld6_print(netdissect_options *ndo, const u_char *bp)
        if ((const u_char *)mp + sizeof(*mp) > ep)
                return;
 
        if ((const u_char *)mp + sizeof(*mp) > ep)
                return;
 

-       ND_PRINT((ndo,"max resp delay: %d ", EXTRACT_BE_U_2(mp->mld6_maxdelay)));
-       ND_PRINT((ndo,"addr: %s", ip6addr_string(ndo, &mp->mld6_addr)));
+       ND_PRINT("max resp delay: %u ", GET_BE_U_2(mp->mld6_maxdelay));
+       ND_PRINT("addr: %s", GET_IP6ADDR_STRING(mp->mld6_addr));

 }
 
 static void
 }
 
 static void


@@ -1577,53 +1548,45 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len)
 
     /* Minimum len is 8 */
     if (len < 8) {
 
     /* Minimum len is 8 */
     if (len < 8) {

-            ND_PRINT((ndo," [invalid len %u]", len));
+            ND_PRINT(" [invalid len %u]", len);

             return;
     }
 
             return;
     }
 

-    ND_TCHECK(icp->icmp6_data16[1]);
-    ngroups = EXTRACT_BE_U_2(&icp->icmp6_data16[1]);
-    ND_PRINT((ndo,", %u group record(s)", ngroups));
+    ngroups = GET_BE_U_2(icp->icmp6_data16[1]);
+    ND_PRINT(", %u group record(s)", ngroups);

     if (ndo->ndo_vflag > 0) {
        /* Print the group records */
        group = 8;
         for (i = 0; i < ngroups; i++) {
            /* type(1) + auxlen(1) + numsrc(2) + grp(16) */
            if (len < group + 20) {
     if (ndo->ndo_vflag > 0) {
        /* Print the group records */
        group = 8;
         for (i = 0; i < ngroups; i++) {
            /* type(1) + auxlen(1) + numsrc(2) + grp(16) */
            if (len < group + 20) {

-                    ND_PRINT((ndo," [invalid number of groups]"));
+                    ND_PRINT(" [invalid number of groups]");

                     return;
            }
                     return;
            }

-            ND_TCHECK_LEN(bp + 4 + group, sizeof(struct in6_addr));
-            ND_PRINT((ndo," [gaddr %s", ip6addr_string(ndo, bp + group + 4)));
-           ND_PRINT((ndo," %s", tok2str(mldv2report2str, " [v2-report-#%u]",
-                                         EXTRACT_U_1(bp + group))));
-            nsrcs = EXTRACT_BE_U_2(bp + group + 2);
+            ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + group + 4));
+           ND_PRINT(" %s", tok2str(mldv2report2str, " [v2-report-#%u]",
+                                         GET_U_1(bp + group)));
+            nsrcs = GET_BE_U_2(bp + group + 2);

            /* Check the number of sources and print them */
            /* Check the number of sources and print them */

-           if (len < group + 20 + (nsrcs * sizeof(struct in6_addr))) {
-                    ND_PRINT((ndo," [invalid number of sources %u]", nsrcs));
+           if (len < group + 20 + (nsrcs * sizeof(nd_ipv6))) {
+                    ND_PRINT(" [invalid number of sources %u]", nsrcs);

                     return;
            }
             if (ndo->ndo_vflag == 1)
                     return;
            }
             if (ndo->ndo_vflag == 1)

-                    ND_PRINT((ndo,", %u source(s)", nsrcs));
+                    ND_PRINT(", %u source(s)", nsrcs);

             else {
                /* Print the sources */
             else {
                /* Print the sources */

-                    ND_PRINT((ndo," {"));
+                    ND_PRINT(" {");

                 for (j = 0; j < nsrcs; j++) {
                 for (j = 0; j < nsrcs; j++) {

-                    ND_TCHECK_LEN(bp + group + 20 + (j * sizeof(struct in6_addr)),
-                                  sizeof(struct in6_addr));
-                   ND_PRINT((ndo," %s", ip6addr_string(ndo, bp + group + 20 + (j * sizeof(struct in6_addr)))));
+                   ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + group + 20 + (j * sizeof(nd_ipv6))));

                }
                }

-                ND_PRINT((ndo," }"));
+                ND_PRINT(" }");

             }
            /* Next group record */
             }
            /* Next group record */

-            group += 20 + nsrcs * sizeof(struct in6_addr);
-           ND_PRINT((ndo,"]"));
+            group += 20 + nsrcs * sizeof(nd_ipv6);
+           ND_PRINT("]");

         }
     }
         }
     }

-    return;
-trunc:
-    ND_PRINT((ndo,"[|icmp6]"));
-    return;

 }
 
 static void
 }
 
 static void


@@ -1637,60 +1600,50 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len)
 
     /* Minimum len is 28 */
     if (len < 28) {
 
     /* Minimum len is 28 */
     if (len < 28) {

-        ND_PRINT((ndo," [invalid len %u]", len));
+        ND_PRINT(" [invalid len %u]", len);

        return;
     }
        return;
     }

-    ND_TCHECK(icp->icmp6_data16[0]);
-    mrc = EXTRACT_BE_U_2(&icp->icmp6_data16[0]);
+    mrc = GET_BE_U_2(icp->icmp6_data16[0]);

     if (mrc < 32768) {
        mrt = mrc;
     } else {
         mrt = ((mrc & 0x0fff) | 0x1000) << (((mrc & 0x7000) >> 12) + 3);
     }
     if (ndo->ndo_vflag) {
     if (mrc < 32768) {
        mrt = mrc;
     } else {
         mrt = ((mrc & 0x0fff) | 0x1000) << (((mrc & 0x7000) >> 12) + 3);
     }
     if (ndo->ndo_vflag) {

-            ND_PRINT((ndo," [max resp delay=%u]", mrt));
+            ND_PRINT(" [max resp delay=%u]", mrt);

     }
     }

-    ND_TCHECK_LEN(bp + 8, sizeof(struct in6_addr));
-    ND_PRINT((ndo," [gaddr %s", ip6addr_string(ndo, bp + 8)));
+    ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + 8));

 
     if (ndo->ndo_vflag) {
 
     if (ndo->ndo_vflag) {

-        ND_TCHECK_1(bp + 25);
-       if (EXTRACT_U_1(bp + 24) & 0x08) {
-               ND_PRINT((ndo," sflag"));
+       if (GET_U_1(bp + 24) & 0x08) {
+               ND_PRINT(" sflag");

        }
        }

-       if (EXTRACT_U_1(bp + 24) & 0x07) {
-               ND_PRINT((ndo," robustness=%u", EXTRACT_U_1(bp + 24) & 0x07));
+       if (GET_U_1(bp + 24) & 0x07) {
+               ND_PRINT(" robustness=%u", GET_U_1(bp + 24) & 0x07);

        }
        }

-       if (EXTRACT_U_1(bp + 25) < 128) {
-               qqi = EXTRACT_U_1(bp + 25);
+       if (GET_U_1(bp + 25) < 128) {
+               qqi = GET_U_1(bp + 25);

        } else {
        } else {

-               qqi = ((EXTRACT_U_1(bp + 25) & 0x0f) | 0x10) <<
-                      (((EXTRACT_U_1(bp + 25) & 0x70) >> 4) + 3);
+               qqi = ((GET_U_1(bp + 25) & 0x0f) | 0x10) <<
+                      (((GET_U_1(bp + 25) & 0x70) >> 4) + 3);

        }
        }

-       ND_PRINT((ndo," qqi=%u", qqi));
+       ND_PRINT(" qqi=%u", qqi);

     }
 
     }
 

-    ND_TCHECK_2(bp + 26);
-    nsrcs = EXTRACT_BE_U_2(bp + 26);
+    nsrcs = GET_BE_U_2(bp + 26);

     if (nsrcs > 0) {
     if (nsrcs > 0) {

-       if (len < 28 + nsrcs * sizeof(struct in6_addr))
-           ND_PRINT((ndo," [invalid number of sources]"));
+       if (len < 28 + nsrcs * sizeof(nd_ipv6))
+           ND_PRINT(" [invalid number of sources]");

        else if (ndo->ndo_vflag > 1) {
        else if (ndo->ndo_vflag > 1) {

-           ND_PRINT((ndo," {"));
+           ND_PRINT(" {");

            for (i = 0; i < nsrcs; i++) {
            for (i = 0; i < nsrcs; i++) {

-               ND_TCHECK_LEN(bp + 28 + (i * sizeof(struct in6_addr)),
-                              sizeof(struct in6_addr));
-               ND_PRINT((ndo," %s", ip6addr_string(ndo, bp + 28 + (i * sizeof(struct in6_addr)))));
+               ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + 28 + (i * sizeof(nd_ipv6))));

            }
            }

-           ND_PRINT((ndo," }"));
+           ND_PRINT(" }");

        } else
        } else

-                ND_PRINT((ndo,", %u source(s)", nsrcs));
+                ND_PRINT(", %u source(s)", nsrcs);

     }
     }

-    ND_PRINT((ndo,"]"));
-    return;
-trunc:
-    ND_PRINT((ndo,"[|icmp6]"));
-    return;
+    ND_PRINT("]");

 }
 
 static void
 }
 
 static void


@@ -1699,35 +1652,35 @@ dnsname_print(netdissect_options *ndo, const u_char *cp, const u_char *ep)
        int i;
 
        /* DNS name decoding - no decompression */
        int i;
 
        /* DNS name decoding - no decompression */

-       ND_PRINT((ndo,", \""));
+       ND_PRINT(", \"");

        while (cp < ep) {
        while (cp < ep) {

-               i = EXTRACT_U_1(cp);
+               i = GET_U_1(cp);

                cp++;
                if (i) {
                        if (i > ep - cp) {
                cp++;
                if (i) {
                        if (i > ep - cp) {

-                               ND_PRINT((ndo,"???"));
+                               ND_PRINT("???");

                                break;
                        }
                        while (i-- && cp < ep) {
                                break;
                        }
                        while (i-- && cp < ep) {

-                               safeputchar(ndo, EXTRACT_U_1(cp));
+                               fn_print_char(ndo, GET_U_1(cp));

                                cp++;
                        }
                                cp++;
                        }

-                       if (cp + 1 < ep && EXTRACT_U_1(cp))
-                               ND_PRINT((ndo,"."));
+                       if (cp + 1 < ep && GET_U_1(cp))
+                               ND_PRINT(".");

                } else {
                        if (cp == ep) {
                                /* FQDN */
                } else {
                        if (cp == ep) {
                                /* FQDN */

-                               ND_PRINT((ndo,"."));
-                       } else if (cp + 1 == ep && EXTRACT_U_1(cp) == '\0') {
+                               ND_PRINT(".");
+                       } else if (cp + 1 == ep && GET_U_1(cp) == '\0') {

                                /* truncated */
                        } else {
                                /* invalid */
                                /* truncated */
                        } else {
                                /* invalid */

-                               ND_PRINT((ndo,"???"));
+                               ND_PRINT("???");

                        }
                        break;
                }
        }
                        }
                        break;
                }
        }

-       ND_PRINT((ndo,"\""));
+       ND_PRINT("\"");

 }
 
 static void
 }
 
 static void


@@ -1745,238 +1698,234 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp,
        ni6 = (const struct icmp6_nodeinfo *)bp;
        siz = ep - bp;
 
        ni6 = (const struct icmp6_nodeinfo *)bp;
        siz = ep - bp;
 

-       switch (EXTRACT_U_1(ni6->ni_type)) {
+       switch (GET_U_1(ni6->ni_type)) {

        case ICMP6_NI_QUERY:
                if (siz == sizeof(*dp) + 4) {
                        /* KAME who-are-you */
        case ICMP6_NI_QUERY:
                if (siz == sizeof(*dp) + 4) {
                        /* KAME who-are-you */

-                       ND_PRINT((ndo," who-are-you request"));
+                       ND_PRINT(" who-are-you request");

                        break;
                }
                        break;
                }

-               ND_PRINT((ndo," node information query"));
+               ND_PRINT(" node information query");

 
                ND_TCHECK_LEN(dp, sizeof(*ni6));
                ni6 = (const struct icmp6_nodeinfo *)dp;
 
                ND_TCHECK_LEN(dp, sizeof(*ni6));
                ni6 = (const struct icmp6_nodeinfo *)dp;

-               ND_PRINT((ndo," ("));   /*)*/
-               switch (EXTRACT_BE_U_2(ni6->ni_qtype)) {
+               ND_PRINT(" ("); /*)*/
+               switch (GET_BE_U_2(ni6->ni_qtype)) {

                case NI_QTYPE_NOOP:
                case NI_QTYPE_NOOP:

-                       ND_PRINT((ndo,"noop"));
+                       ND_PRINT("noop");

                        break;
                case NI_QTYPE_SUPTYPES:
                        break;
                case NI_QTYPE_SUPTYPES:

-                       ND_PRINT((ndo,"supported qtypes"));
-                       i = EXTRACT_BE_U_2(ni6->ni_flags);
+                       ND_PRINT("supported qtypes");
+                       i = GET_BE_U_2(ni6->ni_flags);

                        if (i)
                        if (i)

-                               ND_PRINT((ndo," [%s]", (i & 0x01) ? "C" : ""));
+                               ND_PRINT(" [%s]", (i & 0x01) ? "C" : "");

                        break;
                case NI_QTYPE_FQDN:
                        break;
                case NI_QTYPE_FQDN:

-                       ND_PRINT((ndo,"DNS name"));
+                       ND_PRINT("DNS name");

                        break;
                case NI_QTYPE_NODEADDR:
                        break;
                case NI_QTYPE_NODEADDR:

-                       ND_PRINT((ndo,"node addresses"));
-                       i = EXTRACT_BE_U_2(ni6->ni_flags);
+                       ND_PRINT("node addresses");
+                       i = GET_BE_U_2(ni6->ni_flags);

                        if (!i)
                                break;
                        /* NI_NODEADDR_FLAG_TRUNCATE undefined for query */
                        if (!i)
                                break;
                        /* NI_NODEADDR_FLAG_TRUNCATE undefined for query */

-                       ND_PRINT((ndo," [%s%s%s%s%s%s]",
+                       ND_PRINT(" [%s%s%s%s%s%s]",

                            (i & NI_NODEADDR_FLAG_ANYCAST) ? "a" : "",
                            (i & NI_NODEADDR_FLAG_GLOBAL) ? "G" : "",
                            (i & NI_NODEADDR_FLAG_SITELOCAL) ? "S" : "",
                            (i & NI_NODEADDR_FLAG_LINKLOCAL) ? "L" : "",
                            (i & NI_NODEADDR_FLAG_COMPAT) ? "C" : "",
                            (i & NI_NODEADDR_FLAG_ANYCAST) ? "a" : "",
                            (i & NI_NODEADDR_FLAG_GLOBAL) ? "G" : "",
                            (i & NI_NODEADDR_FLAG_SITELOCAL) ? "S" : "",
                            (i & NI_NODEADDR_FLAG_LINKLOCAL) ? "L" : "",
                            (i & NI_NODEADDR_FLAG_COMPAT) ? "C" : "",

-                           (i & NI_NODEADDR_FLAG_ALL) ? "A" : ""));
+                           (i & NI_NODEADDR_FLAG_ALL) ? "A" : "");

                        break;
                default:
                        break;
                default:

-                       ND_PRINT((ndo,"unknown"));
+                       ND_PRINT("unknown");

                        break;
                }
 
                        break;
                }
 

-               if (EXTRACT_BE_U_2(ni6->ni_qtype) == NI_QTYPE_NOOP ||
-                   EXTRACT_BE_U_2(ni6->ni_qtype) == NI_QTYPE_SUPTYPES) {
+               if (GET_BE_U_2(ni6->ni_qtype) == NI_QTYPE_NOOP ||
+                   GET_BE_U_2(ni6->ni_qtype) == NI_QTYPE_SUPTYPES) {

                        if (siz != sizeof(*ni6))
                                if (ndo->ndo_vflag)
                        if (siz != sizeof(*ni6))
                                if (ndo->ndo_vflag)

-                                       ND_PRINT((ndo,", invalid len"));
+                                       ND_PRINT(", invalid len");

                        /*(*/
                        /*(*/

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

                        break;
                }
 
                        break;
                }
 

-

                /* XXX backward compat, icmp-name-lookup-03 */
                if (siz == sizeof(*ni6)) {
                /* XXX backward compat, icmp-name-lookup-03 */
                if (siz == sizeof(*ni6)) {

-                       ND_PRINT((ndo,", 03 draft"));
+                       ND_PRINT(", 03 draft");

                        /*(*/
                        /*(*/

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

                        break;
                }
 
                        break;
                }
 

-               switch (EXTRACT_U_1(ni6->ni_code)) {
+               cp = (const u_char *)(ni6 + 1);
+               switch (GET_U_1(ni6->ni_code)) {

                case ICMP6_NI_SUBJ_IPV6:
                case ICMP6_NI_SUBJ_IPV6:

-                       if (!ND_TTEST_LEN(dp, sizeof(*ni6) + sizeof(struct in6_addr)))
+                       if (!ND_TTEST_LEN(dp, sizeof(*ni6) + sizeof(nd_ipv6)))

                                break;
                                break;

-                       if (siz != sizeof(*ni6) + sizeof(struct in6_addr)) {
+                       if (siz != sizeof(*ni6) + sizeof(nd_ipv6)) {

                                if (ndo->ndo_vflag)
                                if (ndo->ndo_vflag)

-                                       ND_PRINT((ndo,", invalid subject len"));
+                                       ND_PRINT(", invalid subject len");

                                break;
                        }
                                break;
                        }

-                       ND_PRINT((ndo,", subject=%s",
-                                  ip6addr_string(ndo, ni6 + 1)));
+                       ND_PRINT(", subject=%s",
+                                  GET_IP6ADDR_STRING(cp));

                        break;
                case ICMP6_NI_SUBJ_FQDN:
                        break;
                case ICMP6_NI_SUBJ_FQDN:

-                       ND_PRINT((ndo,", subject=DNS name"));
-                       cp = (const u_char *)(ni6 + 1);
-                       if (EXTRACT_U_1(cp) == ep - cp - 1) {
+                       ND_PRINT(", subject=DNS name");
+                       if (GET_U_1(cp) == ep - cp - 1) {

                                /* icmp-name-lookup-03, pascal string */
                                if (ndo->ndo_vflag)
                                /* icmp-name-lookup-03, pascal string */
                                if (ndo->ndo_vflag)

-                                       ND_PRINT((ndo,", 03 draft"));
+                                       ND_PRINT(", 03 draft");

                                cp++;
                                cp++;

-                               ND_PRINT((ndo,", \""));
+                               ND_PRINT(", \"");

                                while (cp < ep) {
                                while (cp < ep) {

-                                       safeputchar(ndo, EXTRACT_U_1(cp));
+                                       fn_print_char(ndo, GET_U_1(cp));

                                        cp++;
                                }
                                        cp++;
                                }

-                               ND_PRINT((ndo,"\""));
+                               ND_PRINT("\"");

                        } else
                                dnsname_print(ndo, cp, ep);
                        break;
                case ICMP6_NI_SUBJ_IPV4:
                        } else
                                dnsname_print(ndo, cp, ep);
                        break;
                case ICMP6_NI_SUBJ_IPV4:

-                       if (!ND_TTEST_LEN(dp, sizeof(*ni6) + sizeof(struct in_addr)))
+                       if (!ND_TTEST_LEN(dp, sizeof(*ni6) + sizeof(nd_ipv4)))

                                break;
                                break;

-                       if (siz != sizeof(*ni6) + sizeof(struct in_addr)) {
+                       if (siz != sizeof(*ni6) + sizeof(nd_ipv4)) {

                                if (ndo->ndo_vflag)
                                if (ndo->ndo_vflag)

-                                       ND_PRINT((ndo,", invalid subject len"));
+                                       ND_PRINT(", invalid subject len");

                                break;
                        }
                                break;
                        }

-                       ND_PRINT((ndo,", subject=%s",
-                                  ipaddr_string(ndo, ni6 + 1)));
+                       ND_PRINT(", subject=%s",
+                                  GET_IPADDR_STRING(cp));

                        break;
                default:
                        break;
                default:

-                       ND_PRINT((ndo,", unknown subject"));
+                       ND_PRINT(", unknown subject");

                        break;
                }
 
                /*(*/
                        break;
                }
 
                /*(*/

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

                break;
 
        case ICMP6_NI_REPLY:
                break;
 
        case ICMP6_NI_REPLY:

-               if (icmp6len > siz) {
-                       ND_PRINT((ndo,"[|icmp6: node information reply]"));
-                       break;
-               }
+               if (icmp6len > siz)
+                       goto trunc;

 
                needcomma = 0;
 
                ND_TCHECK_LEN(dp, sizeof(*ni6));
                ni6 = (const struct icmp6_nodeinfo *)dp;
 
                needcomma = 0;
 
                ND_TCHECK_LEN(dp, sizeof(*ni6));
                ni6 = (const struct icmp6_nodeinfo *)dp;

-               ND_PRINT((ndo," node information reply"));
-               ND_PRINT((ndo," ("));   /*)*/
-               switch (EXTRACT_U_1(ni6->ni_code)) {
+               ND_PRINT(" node information reply");
+               ND_PRINT(" ("); /*)*/
+               switch (GET_U_1(ni6->ni_code)) {

                case ICMP6_NI_SUCCESS:
                        if (ndo->ndo_vflag) {
                case ICMP6_NI_SUCCESS:
                        if (ndo->ndo_vflag) {

-                               ND_PRINT((ndo,"success"));
+                               ND_PRINT("success");

                                needcomma++;
                        }
                        break;
                case ICMP6_NI_REFUSED:
                                needcomma++;
                        }
                        break;
                case ICMP6_NI_REFUSED:

-                       ND_PRINT((ndo,"refused"));
+                       ND_PRINT("refused");

                        needcomma++;
                        if (siz != sizeof(*ni6))
                                if (ndo->ndo_vflag)
                        needcomma++;
                        if (siz != sizeof(*ni6))
                                if (ndo->ndo_vflag)

-                                       ND_PRINT((ndo,", invalid length"));
+                                       ND_PRINT(", invalid length");

                        break;
                case ICMP6_NI_UNKNOWN:
                        break;
                case ICMP6_NI_UNKNOWN:

-                       ND_PRINT((ndo,"unknown"));
+                       ND_PRINT("unknown");

                        needcomma++;
                        if (siz != sizeof(*ni6))
                                if (ndo->ndo_vflag)
                        needcomma++;
                        if (siz != sizeof(*ni6))
                                if (ndo->ndo_vflag)

-                                       ND_PRINT((ndo,", invalid length"));
+                                       ND_PRINT(", invalid length");

                        break;
                }
 
                        break;
                }
 

-               if (EXTRACT_U_1(ni6->ni_code) != ICMP6_NI_SUCCESS) {
+               if (GET_U_1(ni6->ni_code) != ICMP6_NI_SUCCESS) {

                        /*(*/
                        /*(*/

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

                        break;
                }
 
                        break;
                }
 

-               switch (EXTRACT_BE_U_2(ni6->ni_qtype)) {
+               switch (GET_BE_U_2(ni6->ni_qtype)) {

                case NI_QTYPE_NOOP:
                        if (needcomma)
                case NI_QTYPE_NOOP:
                        if (needcomma)

-                               ND_PRINT((ndo,", "));
-                       ND_PRINT((ndo,"noop"));
+                               ND_PRINT(", ");
+                       ND_PRINT("noop");

                        if (siz != sizeof(*ni6))
                                if (ndo->ndo_vflag)
                        if (siz != sizeof(*ni6))
                                if (ndo->ndo_vflag)

-                                       ND_PRINT((ndo,", invalid length"));
+                                       ND_PRINT(", invalid length");

                        break;
                case NI_QTYPE_SUPTYPES:
                        if (needcomma)
                        break;
                case NI_QTYPE_SUPTYPES:
                        if (needcomma)

-                               ND_PRINT((ndo,", "));
-                       ND_PRINT((ndo,"supported qtypes"));
-                       i = EXTRACT_BE_U_2(ni6->ni_flags);
+                               ND_PRINT(", ");
+                       ND_PRINT("supported qtypes");
+                       i = GET_BE_U_2(ni6->ni_flags);

                        if (i)
                        if (i)

-                               ND_PRINT((ndo," [%s]", (i & 0x01) ? "C" : ""));
+                               ND_PRINT(" [%s]", (i & 0x01) ? "C" : "");

                        break;
                case NI_QTYPE_FQDN:
                        if (needcomma)
                        break;
                case NI_QTYPE_FQDN:
                        if (needcomma)

-                               ND_PRINT((ndo,", "));
-                       ND_PRINT((ndo,"DNS name"));
+                               ND_PRINT(", ");
+                       ND_PRINT("DNS name");

                        cp = (const u_char *)(ni6 + 1) + 4;
                        cp = (const u_char *)(ni6 + 1) + 4;

-                       ND_TCHECK_1(cp);
-                       if (EXTRACT_U_1(cp) == ep - cp - 1) {
+                       if (GET_U_1(cp) == ep - cp - 1) {

                                /* icmp-name-lookup-03, pascal string */
                                if (ndo->ndo_vflag)
                                /* icmp-name-lookup-03, pascal string */
                                if (ndo->ndo_vflag)

-                                       ND_PRINT((ndo,", 03 draft"));
+                                       ND_PRINT(", 03 draft");

                                cp++;
                                cp++;

-                               ND_PRINT((ndo,", \""));
+                               ND_PRINT(", \"");

                                while (cp < ep) {
                                while (cp < ep) {

-                                       safeputchar(ndo, EXTRACT_U_1(cp));
+                                       fn_print_char(ndo, GET_U_1(cp));

                                        cp++;
                                }
                                        cp++;
                                }

-                               ND_PRINT((ndo,"\""));
+                               ND_PRINT("\"");

                        } else
                                dnsname_print(ndo, cp, ep);
                        } else
                                dnsname_print(ndo, cp, ep);

-                       if ((EXTRACT_BE_U_2(ni6->ni_flags) & 0x01) != 0)
-                               ND_PRINT((ndo," [TTL=%u]", EXTRACT_BE_U_4(ni6 + 1)));
+                       if ((GET_BE_U_2(ni6->ni_flags) & 0x01) != 0)
+                               ND_PRINT(" [TTL=%u]", GET_BE_U_4(ni6 + 1));

                        break;
                case NI_QTYPE_NODEADDR:
                        if (needcomma)
                        break;
                case NI_QTYPE_NODEADDR:
                        if (needcomma)

-                               ND_PRINT((ndo,", "));
-                       ND_PRINT((ndo,"node addresses"));
+                               ND_PRINT(", ");
+                       ND_PRINT("node addresses");

                        i = sizeof(*ni6);
                        while (i < siz) {
                        i = sizeof(*ni6);
                        while (i < siz) {

-                               if (i + sizeof(uint32_t) + sizeof(struct in6_addr) > siz)
+                               if (i + sizeof(uint32_t) + sizeof(nd_ipv6) > siz)

                                        break;
                                        break;

-                               ND_PRINT((ndo," %s(%u)",
-                                   ip6addr_string(ndo, bp + i + sizeof(uint32_t)),
-                                   EXTRACT_BE_U_4(bp + i)));
-                               i += sizeof(uint32_t) + sizeof(struct in6_addr);
+                               ND_PRINT(" %s(%u)",
+                                   GET_IP6ADDR_STRING(bp + i + sizeof(uint32_t)),
+                                   GET_BE_U_4(bp + i));
+                               i += sizeof(uint32_t) + sizeof(nd_ipv6);

                        }
                        }

-                       i = EXTRACT_BE_U_2(ni6->ni_flags);
+                       i = GET_BE_U_2(ni6->ni_flags);

                        if (!i)
                                break;
                        if (!i)
                                break;

-                       ND_PRINT((ndo," [%s%s%s%s%s%s%s]",
+                       ND_PRINT(" [%s%s%s%s%s%s%s]",

                                   (i & NI_NODEADDR_FLAG_ANYCAST) ? "a" : "",
                                   (i & NI_NODEADDR_FLAG_GLOBAL) ? "G" : "",
                                   (i & NI_NODEADDR_FLAG_SITELOCAL) ? "S" : "",
                                   (i & NI_NODEADDR_FLAG_LINKLOCAL) ? "L" : "",
                                   (i & NI_NODEADDR_FLAG_COMPAT) ? "C" : "",
                                   (i & NI_NODEADDR_FLAG_ALL) ? "A" : "",
                                   (i & NI_NODEADDR_FLAG_ANYCAST) ? "a" : "",
                                   (i & NI_NODEADDR_FLAG_GLOBAL) ? "G" : "",
                                   (i & NI_NODEADDR_FLAG_SITELOCAL) ? "S" : "",
                                   (i & NI_NODEADDR_FLAG_LINKLOCAL) ? "L" : "",
                                   (i & NI_NODEADDR_FLAG_COMPAT) ? "C" : "",
                                   (i & NI_NODEADDR_FLAG_ALL) ? "A" : "",

-                                  (i & NI_NODEADDR_FLAG_TRUNCATE) ? "T" : ""));
+                                  (i & NI_NODEADDR_FLAG_TRUNCATE) ? "T" : "");

                        break;
                default:
                        if (needcomma)
                        break;
                default:
                        if (needcomma)

-                               ND_PRINT((ndo,", "));
-                       ND_PRINT((ndo,"unknown"));
+                               ND_PRINT(", ");
+                       ND_PRINT("unknown");

                        break;
                }
 
                /*(*/
                        break;
                }
 
                /*(*/

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

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

-       ND_PRINT((ndo, "[|icmp6]"));
+       nd_print_trunc(ndo);

 }
 
 static void
 }
 
 static void


@@ -1994,75 +1943,76 @@ icmp6_rrenum_print(netdissect_options *ndo, const u_char *bp, const u_char *ep)
        rr6 = (const struct icmp6_router_renum *)bp;
        cp = (const char *)(rr6 + 1);
 
        rr6 = (const struct icmp6_router_renum *)bp;
        cp = (const char *)(rr6 + 1);
 

-       ND_TCHECK(rr6->rr_reserved);
-       switch (EXTRACT_U_1(rr6->rr_code)) {
+       ND_TCHECK_4(rr6->rr_reserved);
+       switch (GET_U_1(rr6->rr_code)) {

        case ICMP6_ROUTER_RENUMBERING_COMMAND:
        case ICMP6_ROUTER_RENUMBERING_COMMAND:

-               ND_PRINT((ndo,"router renum: command"));
+               ND_PRINT("router renum: command");

                break;
        case ICMP6_ROUTER_RENUMBERING_RESULT:
                break;
        case ICMP6_ROUTER_RENUMBERING_RESULT:

-               ND_PRINT((ndo,"router renum: result"));
+               ND_PRINT("router renum: result");

                break;
        case ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET:
                break;
        case ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET:

-               ND_PRINT((ndo,"router renum: sequence number reset"));
+               ND_PRINT("router renum: sequence number reset");

                break;
        default:
                break;
        default:

-               ND_PRINT((ndo,"router renum: code-#%u", EXTRACT_U_1(rr6->rr_code)));
+               ND_PRINT("router renum: code-#%u", GET_U_1(rr6->rr_code));

                break;
        }
 
                break;
        }
 

-        ND_PRINT((ndo,", seq=%u", EXTRACT_BE_U_4(rr6->rr_seqnum)));
+        ND_PRINT(", seq=%u", GET_BE_U_4(rr6->rr_seqnum));

 
        if (ndo->ndo_vflag) {
 
        if (ndo->ndo_vflag) {

-               uint8_t rr_flags = EXTRACT_U_1(rr6->rr_flags);
+               uint8_t rr_flags = GET_U_1(rr6->rr_flags);

 #define F(x, y)        (rr_flags & (x) ? (y) : "")
 #define F(x, y)        (rr_flags & (x) ? (y) : "")

-               ND_PRINT((ndo,"["));    /*]*/
+               ND_PRINT("[");  /*]*/

                if (rr_flags) {
                if (rr_flags) {

-                       ND_PRINT((ndo,"%s%s%s%s%s,", F(ICMP6_RR_FLAGS_TEST, "T"),
+                       ND_PRINT("%s%s%s%s%s,", F(ICMP6_RR_FLAGS_TEST, "T"),

                                   F(ICMP6_RR_FLAGS_REQRESULT, "R"),
                                   F(ICMP6_RR_FLAGS_FORCEAPPLY, "A"),
                                   F(ICMP6_RR_FLAGS_SPECSITE, "S"),
                                   F(ICMP6_RR_FLAGS_REQRESULT, "R"),
                                   F(ICMP6_RR_FLAGS_FORCEAPPLY, "A"),
                                   F(ICMP6_RR_FLAGS_SPECSITE, "S"),

-                                  F(ICMP6_RR_FLAGS_PREVDONE, "P")));
+                                  F(ICMP6_RR_FLAGS_PREVDONE, "P"));

                }
                }

-                ND_PRINT((ndo,"seg=%u,", EXTRACT_U_1(rr6->rr_segnum)));
-                ND_PRINT((ndo,"maxdelay=%u", EXTRACT_BE_U_2(rr6->rr_maxdelay)));
-               if (EXTRACT_BE_U_4(rr6->rr_reserved))
-                       ND_PRINT((ndo,"rsvd=0x%x", EXTRACT_BE_U_4(rr6->rr_reserved)));
+                ND_PRINT("seg=%u,", GET_U_1(rr6->rr_segnum));
+                ND_PRINT("maxdelay=%u", GET_BE_U_2(rr6->rr_maxdelay));
+               if (GET_BE_U_4(rr6->rr_reserved))
+                       ND_PRINT("rsvd=0x%x", GET_BE_U_4(rr6->rr_reserved));

                /*[*/
                /*[*/

-               ND_PRINT((ndo,"]"));
+               ND_PRINT("]");

 #undef F
        }
 
 #undef F
        }
 

-       if (EXTRACT_U_1(rr6->rr_code) == ICMP6_ROUTER_RENUMBERING_COMMAND) {
+       if (GET_U_1(rr6->rr_code) == ICMP6_ROUTER_RENUMBERING_COMMAND) {

                match = (const struct rr_pco_match *)cp;
                cp = (const char *)(match + 1);
 
                match = (const struct rr_pco_match *)cp;
                cp = (const char *)(match + 1);
 

-               ND_TCHECK(match->rpm_prefix);
+               ND_TCHECK_16(match->rpm_prefix);

 
                if (ndo->ndo_vflag > 1)
 
                if (ndo->ndo_vflag > 1)

-                       ND_PRINT((ndo,"\n\t"));
+                       ND_PRINT("\n\t");

                else
                else

-                       ND_PRINT((ndo," "));
-               ND_PRINT((ndo,"match("));       /*)*/
-               switch (EXTRACT_U_1(match->rpm_code)) {
-               case RPM_PCO_ADD:       ND_PRINT((ndo,"add")); break;
-               case RPM_PCO_CHANGE:    ND_PRINT((ndo,"change")); break;
-               case RPM_PCO_SETGLOBAL: ND_PRINT((ndo,"setglobal")); break;
-               default:                ND_PRINT((ndo,"#%u", EXTRACT_U_1(match->rpm_code))); break;
+                       ND_PRINT(" ");
+               ND_PRINT("match(");     /*)*/
+               switch (GET_U_1(match->rpm_code)) {
+               case RPM_PCO_ADD:       ND_PRINT("add"); break;
+               case RPM_PCO_CHANGE:    ND_PRINT("change"); break;
+               case RPM_PCO_SETGLOBAL: ND_PRINT("setglobal"); break;
+               default:                ND_PRINT("#%u",
+                                                GET_U_1(match->rpm_code)); break;

                }
 
                if (ndo->ndo_vflag) {
                }
 
                if (ndo->ndo_vflag) {

-                       ND_PRINT((ndo,",ord=%u", EXTRACT_U_1(match->rpm_ordinal)));
-                       ND_PRINT((ndo,",min=%u", EXTRACT_U_1(match->rpm_minlen)));
-                       ND_PRINT((ndo,",max=%u", EXTRACT_U_1(match->rpm_maxlen)));
+                       ND_PRINT(",ord=%u", GET_U_1(match->rpm_ordinal));
+                       ND_PRINT(",min=%u", GET_U_1(match->rpm_minlen));
+                       ND_PRINT(",max=%u", GET_U_1(match->rpm_maxlen));

                }
                }

-               if (addrtostr6(&match->rpm_prefix, hbuf, sizeof(hbuf)))
-                       ND_PRINT((ndo,",%s/%u", hbuf, EXTRACT_U_1(match->rpm_matchlen)));
+               if (addrtostr6(match->rpm_prefix, hbuf, sizeof(hbuf)))
+                       ND_PRINT(",%s/%u", hbuf, GET_U_1(match->rpm_matchlen));

                else
                else

-                       ND_PRINT((ndo,",?/%u", EXTRACT_U_1(match->rpm_matchlen)));
+                       ND_PRINT(",?/%u", GET_U_1(match->rpm_matchlen));

                /*(*/
                /*(*/

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

 
 

-               n = EXTRACT_U_1(match->rpm_len) - 3;
+               n = GET_U_1(match->rpm_len) - 3;

                if (n % 4)
                        goto trunc;
                n /= 4;
                if (n % 4)
                        goto trunc;
                n /= 4;


@@ -2070,54 +2020,50 @@ icmp6_rrenum_print(netdissect_options *ndo, const u_char *bp, const u_char *ep)
                        use = (const struct rr_pco_use *)cp;
                        cp = (const char *)(use + 1);
 
                        use = (const struct rr_pco_use *)cp;
                        cp = (const char *)(use + 1);
 

-                       ND_TCHECK(use->rpu_prefix);
+                       ND_TCHECK_16(use->rpu_prefix);

 
                        if (ndo->ndo_vflag > 1)
 
                        if (ndo->ndo_vflag > 1)

-                               ND_PRINT((ndo,"\n\t"));
+                               ND_PRINT("\n\t");

                        else
                        else

-                               ND_PRINT((ndo," "));
-                       ND_PRINT((ndo,"use(")); /*)*/
-                       if (EXTRACT_U_1(use->rpu_flags)) {
-#define F(x, y)        (EXTRACT_U_1(use->rpu_flags) & (x) ? (y) : "")
-                               ND_PRINT((ndo,"%s%s,",
+                               ND_PRINT(" ");
+                       ND_PRINT("use(");       /*)*/
+                       if (GET_U_1(use->rpu_flags)) {
+#define F(x, y)        (GET_U_1(use->rpu_flags) & (x) ? (y) : "")
+                               ND_PRINT("%s%s,",

                                           F(ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME, "V"),
                                           F(ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME, "V"),

-                                          F(ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME, "P")));
+                                          F(ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME, "P"));

 #undef F
                        }
                        if (ndo->ndo_vflag) {
 #undef F
                        }
                        if (ndo->ndo_vflag) {

-                               ND_PRINT((ndo,"mask=0x%x,", EXTRACT_U_1(use->rpu_ramask)));
-                               ND_PRINT((ndo,"raflags=0x%x,", EXTRACT_U_1(use->rpu_raflags)));
-                               if (EXTRACT_BE_U_4(use->rpu_vltime) == 0xffffffff)
-                                       ND_PRINT((ndo,"vltime=infty,"));
+                               ND_PRINT("mask=0x%x,",
+                                        GET_U_1(use->rpu_ramask));
+                               ND_PRINT("raflags=0x%x,",
+                                        GET_U_1(use->rpu_raflags));
+                               if (GET_BE_U_4(use->rpu_vltime) == 0xffffffff)
+                                       ND_PRINT("vltime=infty,");

                                else
                                else

-                                       ND_PRINT((ndo,"vltime=%u,",
-                                                  EXTRACT_BE_U_4(use->rpu_vltime)));
-                               if (EXTRACT_BE_U_4(use->rpu_pltime) == 0xffffffff)
-                                       ND_PRINT((ndo,"pltime=infty,"));
+                                       ND_PRINT("vltime=%u,",
+                                                  GET_BE_U_4(use->rpu_vltime));
+                               if (GET_BE_U_4(use->rpu_pltime) == 0xffffffff)
+                                       ND_PRINT("pltime=infty,");

                                else
                                else

-                                       ND_PRINT((ndo,"pltime=%u,",
-                                                  EXTRACT_BE_U_4(use->rpu_pltime)));
+                                       ND_PRINT("pltime=%u,",
+                                                  GET_BE_U_4(use->rpu_pltime));

                        }
                        }

-                       if (addrtostr6(&use->rpu_prefix, hbuf, sizeof(hbuf)))
-                               ND_PRINT((ndo,"%s/%u/%u", hbuf, EXTRACT_U_1(use->rpu_uselen),
-                                          EXTRACT_U_1(use->rpu_keeplen)));
+                       if (addrtostr6(use->rpu_prefix, hbuf, sizeof(hbuf)))
+                               ND_PRINT("%s/%u/%u", hbuf,
+                                          GET_U_1(use->rpu_uselen),
+                                          GET_U_1(use->rpu_keeplen));

                        else
                        else

-                               ND_PRINT((ndo,"?/%u/%u", EXTRACT_U_1(use->rpu_uselen),
-                                          EXTRACT_U_1(use->rpu_keeplen)));
+                               ND_PRINT("?/%u/%u", GET_U_1(use->rpu_uselen),
+                                          GET_U_1(use->rpu_keeplen));

                        /*(*/
                        /*(*/

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

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

-       ND_PRINT((ndo,"[|icmp6]"));
+       nd_print_trunc(ndo);

 }
 }

-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */