icmp: clean up the extension code and comments.

[tcpdump] / print-icmp6.c

diff --git a/print-icmp6.c b/print-icmp6.c
index 4fa35b2e01379d7da51e1f8e1b257cd6c2ef2576..4a335270e5f53b99a8de20005e82682e5a7c65d9 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -490,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)
  */


@@ -711,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"},


@@ -816,7 +811,6 @@ 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 = GET_U_1(opt->rpl_dio_type);
                if (dio_type == RPL_OPT_PAD1) {
                         optlen = 1;
                dio_type = GET_U_1(opt->rpl_dio_type);
                if (dio_type == RPL_OPT_PAD1) {
                         optlen = 1;


@@ -844,7 +838,6 @@ rpl_printopts(netdissect_options *ndo, const uint8_t *opts, u_int length)
         return;
 trunc:
        nd_print_trunc(ndo);
         return;
 trunc:
        nd_print_trunc(ndo);

-       return;

 }
 
 static void
 }
 
 static void


@@ -852,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_ICHECK_ZU(length, <, sizeof(struct nd_rpl_dio));

         ND_PRINT(" [dagid:%s,seq:%u,instance:%u,rank:%u,%smop:%s,prf:%u]",
         ND_PRINT(" [dagid:%s,seq:%u,instance:%u,rank:%u,%smop:%s,prf:%u]",

-                  dagid_str,
+                  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,":"",
                   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))),
+                  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));
         }
                   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));
         }

-       return;
-trunc:
-       nd_print_trunc(ndo);
-       return;
+        return;
+invalid:
+        nd_print_invalid(ndo);

 }
 
 static void
 }
 
 static void


@@ -884,23 +874,19 @@ 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;
         rpl_flags = GET_U_1(dao->rpl_flags);
         if(RPL_DAO_D(rpl_flags)) {
 
         bp += ND_RPL_DAO_MIN_LEN;
         length -= ND_RPL_DAO_MIN_LEN;
         rpl_flags = GET_U_1(dao->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(" [dagid:%s,seq:%u,instance:%u%s%s,%02x]",
+        ND_PRINT(" [dagid:%s,seq:%u,instance:%u%s%s,flags:%02x]",

                   dagid_str,
                   GET_U_1(dao->rpl_daoseq),
                   GET_U_1(dao->rpl_instanceid),
                   dagid_str,
                   GET_U_1(dao->rpl_daoseq),
                   GET_U_1(dao->rpl_instanceid),


@@ -911,15 +897,9 @@ rpl_dao_print(netdissect_options *ndo,
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp, length);
         }
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp, length);
         }

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

 }
 
 static void
 }
 
 static void


@@ -929,17 +909,13 @@ 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;
         if(RPL_DAOACK_D(GET_U_1(daoack->rpl_flags))) {
 
         bp += ND_RPL_DAOACK_MIN_LEN;
         length -= ND_RPL_DAOACK_MIN_LEN;
         if(RPL_DAOACK_D(GET_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);
+                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;
         }


@@ -954,15 +930,9 @@ rpl_daoack_print(netdissect_options *ndo,
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp, length);
         }
         if(ndo->ndo_vflag > 1) {
                 rpl_printopts(ndo, bp, length);
         }

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

 }
 
 static void
 }
 
 static void


@@ -1022,7 +992,6 @@ trunc:
 
 }
 
 
 }
 

-

 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)


@@ -1052,7 +1021,6 @@ icmp6_print(netdissect_options *ndo,
                uint16_t sum, udp_sum;
 
                if (ND_TTEST_LEN(bp, length)) {
                uint16_t sum, udp_sum;
 
                if (ND_TTEST_LEN(bp, length)) {

-                       ND_TCHECK_2(dp->icmp6_cksum);

                        udp_sum = GET_BE_U_2(dp->icmp6_cksum);
                        sum = icmp6_cksum(ndo, ip, dp, length);
                        if (sum != 0)
                        udp_sum = GET_BE_U_2(dp->icmp6_cksum);
                        sum = icmp6_cksum(ndo, ip, dp, length);
                        if (sum != 0)


@@ -1064,7 +1032,6 @@ icmp6_print(netdissect_options *ndo,
                }
        }
 
                }
        }
 

-       ND_TCHECK_1(dp->icmp6_type);

        icmp6_type = GET_U_1(dp->icmp6_type);
        ND_PRINT("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));
 


@@ -1078,12 +1045,10 @@ icmp6_print(netdissect_options *ndo,
                       icmp6_type == ICMP6_MOBILEPREFIX_ADVERT ))
                 ND_PRINT(", length %u", length);
 
                       icmp6_type == ICMP6_MOBILEPREFIX_ADVERT ))
                 ND_PRINT(", length %u", length);
 

-       ND_TCHECK_1(dp->icmp6_code);

        icmp6_code = GET_U_1(dp->icmp6_code);
 
        switch (icmp6_type) {
        case ICMP6_DST_UNREACH:
        icmp6_code = GET_U_1(dp->icmp6_code);
 
        switch (icmp6_type) {
        case ICMP6_DST_UNREACH:

-               ND_TCHECK_16(oip->ip6_dst);

                 ND_PRINT(", %s", tok2str(icmp6_dst_unreach_code_values,"unknown unreach code (%u)",icmp6_code));
                switch (icmp6_code) {
 
                 ND_PRINT(", %s", tok2str(icmp6_dst_unreach_code_values,"unknown unreach code (%u)",icmp6_code));
                switch (icmp6_code) {
 


@@ -1130,11 +1095,9 @@ 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(", mtu %u", GET_BE_U_4(dp->icmp6_mtu));
                break;
        case ICMP6_TIME_EXCEEDED:
                ND_PRINT(", mtu %u", GET_BE_U_4(dp->icmp6_mtu));
                break;
        case ICMP6_TIME_EXCEEDED:

-               ND_TCHECK_16(oip->ip6_dst);

                switch (icmp6_code) {
                case ICMP6_TIME_EXCEED_TRANSIT:
                        ND_PRINT(" for %s",
                switch (icmp6_code) {
                case ICMP6_TIME_EXCEED_TRANSIT:
                        ND_PRINT(" for %s",


@@ -1175,8 +1138,6 @@ icmp6_print(netdissect_options *ndo,
                break;
        case ICMP6_ECHO_REQUEST:
        case ICMP6_ECHO_REPLY:
                break;
        case ICMP6_ECHO_REQUEST:
        case ICMP6_ECHO_REPLY:

-                /* The check below covers both icmp6_id and icmp6_seq. */
-                ND_TCHECK_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;
                 ND_PRINT(", id %u, seq %u", GET_BE_U_2(dp->icmp6_id),
                         GET_BE_U_2(dp->icmp6_seq));
                break;


@@ -1210,7 +1171,6 @@ 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_4(p->nd_ra_retransmit);

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


@@ -1229,7 +1189,6 @@ icmp6_print(netdissect_options *ndo,
            {
                const struct nd_neighbor_solicit *p;
                p = (const struct nd_neighbor_solicit *)dp;
            {
                const struct nd_neighbor_solicit *p;
                p = (const struct nd_neighbor_solicit *)dp;

-               ND_TCHECK_16(p->nd_ns_target);

                ND_PRINT(", who has %s", GET_IP6ADDR_STRING(p->nd_ns_target));
                if (ndo->ndo_vflag) {
 #define NDSOLLEN 24
                ND_PRINT(", who has %s", GET_IP6ADDR_STRING(p->nd_ns_target));
                if (ndo->ndo_vflag) {
 #define NDSOLLEN 24


@@ -1244,7 +1203,6 @@ 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_16(p->nd_na_target);

                ND_PRINT(", tgt is %s",
                           GET_IP6ADDR_STRING(p->nd_na_target));
                if (ndo->ndo_vflag) {
                ND_PRINT(", tgt is %s",
                           GET_IP6ADDR_STRING(p->nd_na_target));
                if (ndo->ndo_vflag) {


@@ -1265,9 +1223,7 @@ icmp6_print(netdissect_options *ndo,
                const struct nd_redirect *p;
 
                p = (const struct nd_redirect *)dp;
                const struct nd_redirect *p;
 
                p = (const struct nd_redirect *)dp;

-               ND_TCHECK_16(p->nd_rd_dst);

                ND_PRINT(", %s", GET_IP6ADDR_STRING(p->nd_rd_dst));
                ND_PRINT(", %s", GET_IP6ADDR_STRING(p->nd_rd_dst));

-               ND_TCHECK_16(p->nd_rd_target);

                ND_PRINT(" to %s", GET_IP6ADDR_STRING(p->nd_rd_target));
 #define REDIRECTLEN 40
                if (ndo->ndo_vflag) {
                ND_PRINT(" to %s", GET_IP6ADDR_STRING(p->nd_rd_target));
 #define REDIRECTLEN 40
                if (ndo->ndo_vflag) {


@@ -1293,7 +1249,6 @@ 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_2(dp->icmp6_data16[0]);

                 ND_PRINT(", id 0x%04x", GET_BE_U_2(dp->icmp6_data16[0]));
                 break;
        case ICMP6_HADISCOV_REPLY:
                 ND_PRINT(", id 0x%04x", GET_BE_U_2(dp->icmp6_data16[0]));
                 break;
        case ICMP6_HADISCOV_REPLY:


@@ -1301,13 +1256,11 @@ icmp6_print(netdissect_options *ndo,
                        const u_char *cp;
                        const u_char *p;
 
                        const u_char *cp;
                        const u_char *p;
 

-                       ND_TCHECK_2(dp->icmp6_data16[0]);

                        ND_PRINT(", id 0x%04x",
                                 GET_BE_U_2(dp->icmp6_data16[0]));
                        cp = (const u_char *)dp + length;
                        p = (const u_char *)(dp + 1);
                        while (p < cp) {
                        ND_PRINT(", id 0x%04x",
                                 GET_BE_U_2(dp->icmp6_data16[0]));
                        cp = (const u_char *)dp + length;
                        p = (const u_char *)(dp + 1);
                        while (p < cp) {

-                               ND_TCHECK_16(p);

                                ND_PRINT(", %s", GET_IP6ADDR_STRING(p));
                                p += 16;
                        }
                                ND_PRINT(", %s", GET_IP6ADDR_STRING(p));
                                p += 16;
                        }


@@ -1317,10 +1270,8 @@ 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(", id 0x%04x",
                                 GET_BE_U_2(dp->icmp6_data16[0]));
                        ND_PRINT(", id 0x%04x",
                                 GET_BE_U_2(dp->icmp6_data16[0]));

-                       ND_TCHECK_2(dp->icmp6_data16[1]);

                        flags = GET_BE_U_2(dp->icmp6_data16[1]);
                        if (flags & 0xc000)
                                ND_PRINT(" ");
                        flags = GET_BE_U_2(dp->icmp6_data16[1]);
                        if (flags & 0xc000)
                                ND_PRINT(" ");


@@ -1429,7 +1380,8 @@ 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;


@@ -1476,7 +1428,6 @@ 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_16(opp->nd_opt_pi_prefix);

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


@@ -1492,7 +1443,6 @@ 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_4(opm->nd_opt_mtu_mtu);

                        ND_PRINT(" %u%s",
                                GET_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" : "" );


@@ -1503,7 +1453,6 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
                        ND_PRINT(" lifetime %us,",
                                   GET_BE_U_4(oprd->nd_opt_rdnss_lifetime));
                        for (i = 0; i < l; i++) {
                        ND_PRINT(" lifetime %us,",
                                   GET_BE_U_4(oprd->nd_opt_rdnss_lifetime));
                        for (i = 0; i < l; i++) {

-                               ND_TCHECK_16(oprd->nd_opt_rdnss_addr[i]);

                                ND_PRINT(" addr: %s",
                                           GET_IP6ADDR_STRING(oprd->nd_opt_rdnss_addr[i]));
                        }
                                ND_PRINT(" addr: %s",
                                           GET_IP6ADDR_STRING(oprd->nd_opt_rdnss_addr[i]));
                        }


@@ -1522,13 +1471,11 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
                        break;
                case ND_OPT_ADVINTERVAL:
                        opa = (const struct nd_opt_advinterval *)op;
                        break;
                case ND_OPT_ADVINTERVAL:
                        opa = (const struct nd_opt_advinterval *)op;

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

-                       ND_TCHECK_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));
                        ND_PRINT(" preference %u, lifetime %u",
                                   GET_BE_U_2(oph->nd_opt_hai_preference),
                                   GET_BE_U_2(oph->nd_opt_hai_lifetime));


@@ -1541,17 +1488,15 @@ icmp6_opt_print(netdissect_options *ndo, const u_char *bp, int resid)
                        case 1:
                                break;
                        case 2:
                        case 1:
                                break;
                        case 2:

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

                                break;
                        case 3:
                                break;
                        case 3:

-                               ND_TCHECK_16(opri + 1);
-                               memcpy(&in6, opri + 1, 16);
+                               GET_CPY_BYTES(&in6, opri + 1, 16);

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

-                       ND_PRINT(" %s/%u", ip6addr_string(ndo, (const u_char *)&in6),
+                       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)));
                                   GET_U_1(opri->nd_opt_rti_prefixlen));
                        ND_PRINT(", pref=%s",
                                 get_rtpref(GET_U_1(opri->nd_opt_rti_flags)));


@@ -1607,7 +1552,6 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len)
             return;
     }
 
             return;
     }
 

-    ND_TCHECK_2(icp->icmp6_data16[1]);

     ngroups = GET_BE_U_2(icp->icmp6_data16[1]);
     ND_PRINT(", %u group record(s)", ngroups);
     if (ndo->ndo_vflag > 0) {
     ngroups = GET_BE_U_2(icp->icmp6_data16[1]);
     ND_PRINT(", %u group record(s)", ngroups);
     if (ndo->ndo_vflag > 0) {


@@ -1619,7 +1563,6 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len)
                     ND_PRINT(" [invalid number of groups]");
                     return;
            }
                     ND_PRINT(" [invalid number of groups]");
                     return;
            }

-            ND_TCHECK_LEN(bp + 4 + group, sizeof(nd_ipv6));

             ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + group + 4));
            ND_PRINT(" %s", tok2str(mldv2report2str, " [v2-report-#%u]",
                                          GET_U_1(bp + group)));
             ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + group + 4));
            ND_PRINT(" %s", tok2str(mldv2report2str, " [v2-report-#%u]",
                                          GET_U_1(bp + group)));


@@ -1635,8 +1578,6 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len)
                /* Print the sources */
                     ND_PRINT(" {");
                 for (j = 0; j < nsrcs; j++) {
                /* Print the sources */
                     ND_PRINT(" {");
                 for (j = 0; j < nsrcs; j++) {

-                    ND_TCHECK_LEN(bp + group + 20 + (j * sizeof(nd_ipv6)),
-                                  sizeof(nd_ipv6));

                    ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + group + 20 + (j * sizeof(nd_ipv6))));
                }
                 ND_PRINT(" }");
                    ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + group + 20 + (j * sizeof(nd_ipv6))));
                }
                 ND_PRINT(" }");


@@ -1646,10 +1587,6 @@ mldv2_report_print(netdissect_options *ndo, const u_char *bp, u_int len)
            ND_PRINT("]");
         }
     }
            ND_PRINT("]");
         }
     }

-    return;
-trunc:
-    nd_print_trunc(ndo);
-    return;

 }
 
 static void
 }
 
 static void


@@ -1666,7 +1603,6 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len)
         ND_PRINT(" [invalid len %u]", len);
        return;
     }
         ND_PRINT(" [invalid len %u]", len);
        return;
     }

-    ND_TCHECK_2(icp->icmp6_data16[0]);

     mrc = GET_BE_U_2(icp->icmp6_data16[0]);
     if (mrc < 32768) {
        mrt = mrc;
     mrc = GET_BE_U_2(icp->icmp6_data16[0]);
     if (mrc < 32768) {
        mrt = mrc;


@@ -1676,11 +1612,9 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len)
     if (ndo->ndo_vflag) {
             ND_PRINT(" [max resp delay=%u]", mrt);
     }
     if (ndo->ndo_vflag) {
             ND_PRINT(" [max resp delay=%u]", mrt);
     }

-    ND_TCHECK_LEN(bp + 8, sizeof(nd_ipv6));

     ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + 8));
 
     if (ndo->ndo_vflag) {
     ND_PRINT(" [gaddr %s", GET_IP6ADDR_STRING(bp + 8));
 
     if (ndo->ndo_vflag) {

-        ND_TCHECK_1(bp + 25);

        if (GET_U_1(bp + 24) & 0x08) {
                ND_PRINT(" sflag");
        }
        if (GET_U_1(bp + 24) & 0x08) {
                ND_PRINT(" sflag");
        }


@@ -1696,7 +1630,6 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len)
        ND_PRINT(" qqi=%u", qqi);
     }
 
        ND_PRINT(" qqi=%u", qqi);
     }
 

-    ND_TCHECK_2(bp + 26);

     nsrcs = GET_BE_U_2(bp + 26);
     if (nsrcs > 0) {
        if (len < 28 + nsrcs * sizeof(nd_ipv6))
     nsrcs = GET_BE_U_2(bp + 26);
     if (nsrcs > 0) {
        if (len < 28 + nsrcs * sizeof(nd_ipv6))


@@ -1704,8 +1637,6 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len)
        else if (ndo->ndo_vflag > 1) {
            ND_PRINT(" {");
            for (i = 0; i < nsrcs; i++) {
        else if (ndo->ndo_vflag > 1) {
            ND_PRINT(" {");
            for (i = 0; i < nsrcs; i++) {

-               ND_TCHECK_LEN(bp + 28 + (i * sizeof(nd_ipv6)),
-                              sizeof(nd_ipv6));

                ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + 28 + (i * sizeof(nd_ipv6))));
            }
            ND_PRINT(" }");
                ND_PRINT(" %s", GET_IP6ADDR_STRING(bp + 28 + (i * sizeof(nd_ipv6))));
            }
            ND_PRINT(" }");


@@ -1713,10 +1644,6 @@ mldv2_query_print(netdissect_options *ndo, const u_char *bp, u_int len)
                 ND_PRINT(", %u source(s)", nsrcs);
     }
     ND_PRINT("]");
                 ND_PRINT(", %u source(s)", nsrcs);
     }
     ND_PRINT("]");

-    return;
-trunc:
-    nd_print_trunc(ndo);
-    return;

 }
 
 static void
 }
 
 static void


@@ -1825,7 +1752,6 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp,
                        break;
                }
 
                        break;
                }
 

-

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


@@ -1944,7 +1870,6 @@ icmp6_nodeinfo_print(netdissect_options *ndo, u_int icmp6len, const u_char *bp,
                                ND_PRINT(", ");
                        ND_PRINT("DNS name");
                        cp = (const u_char *)(ni6 + 1) + 4;
                                ND_PRINT(", ");
                        ND_PRINT("DNS name");
                        cp = (const u_char *)(ni6 + 1) + 4;

-                       ND_TCHECK_1(cp);

                        if (GET_U_1(cp) == ep - cp - 1) {
                                /* icmp-name-lookup-03, pascal string */
                                if (ndo->ndo_vflag)
                        if (GET_U_1(cp) == ep - cp - 1) {
                                /* icmp-name-lookup-03, pascal string */
                                if (ndo->ndo_vflag)