Merge branch 'master' of github.com:the-tcpdump-group/tcpdump

diff --combined print-aodv.c
index 2bbd38338bbb9129120aee07ba104ec114f00bf0,bb7ba33fa8bafc0ea0c45d0a6bb673175663a2ad..cd4084b326bd836b693f0903235cd763145709e9
--- 1/print-aodv.c
--- 2/print-aodv.c
+++ b/print-aodv.c
@@@ -223,9 -223,9 +223,9 @@@ aodv_rreq(netdissect_options *ndo, cons
            EXTRACT_U_1(ap->rreq_type) & RREQ_UNKNOWN ? "[U] " : " ",
            EXTRACT_U_1(ap->rreq_hops),
            EXTRACT_BE_U_4(ap->rreq_id),
 -          ipaddr_string(ndo, &ap->rreq_da),
 +          ipaddr_string(ndo, ap->rreq_da),
            EXTRACT_BE_U_4(ap->rreq_ds),
 -          ipaddr_string(ndo, &ap->rreq_oa),
 +          ipaddr_string(ndo, ap->rreq_oa),
            EXTRACT_BE_U_4(ap->rreq_os));
        i = length - sizeof(*ap);
        if (i >= sizeof(struct aodv_ext))
@@@ -251,9 -251,9 +251,9 @@@ aodv_rrep(netdissect_options *ndo, cons
            EXTRACT_U_1(ap->rrep_type) & RREP_ACK ? "[A] " : " ",
            EXTRACT_U_1(ap->rrep_ps) & RREP_PREFIX_MASK,
            EXTRACT_U_1(ap->rrep_hops),
 -          ipaddr_string(ndo, &ap->rrep_da),
 +          ipaddr_string(ndo, ap->rrep_da),
            EXTRACT_BE_U_4(ap->rrep_ds),
 -          ipaddr_string(ndo, &ap->rrep_oa),
 +          ipaddr_string(ndo, ap->rrep_oa),
            EXTRACT_BE_U_4(ap->rrep_life));
        i = length - sizeof(*ap);
        if (i >= sizeof(struct aodv_ext))
@@@ -283,7 -283,7 +283,7 @@@ aodv_rerr(netdissect_options *ndo, cons
                ND_TCHECK_SIZE(dp);
                if (i < sizeof(*dp))
                        goto trunc;
 -              ND_PRINT(" {%s}(%u)", ipaddr_string(ndo, &dp->u_da),
 +              ND_PRINT(" {%s}(%u)", ipaddr_string(ndo, dp->u_da),
                    EXTRACT_BE_U_4(dp->u_ds));
                dp++;
                i -= sizeof(*dp);
@@@ -373,7 -373,7 +373,7 @@@ aodv_v6_rerr(netdissect_options *ndo, c
                if (i < sizeof(*dp6))
                        goto trunc;
                ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, dp6->u_da),
-                   EXTRACT_BE_U_4(dp6->u_ds));
+                        EXTRACT_BE_U_4(dp6->u_ds));
                dp6++;
                i -= sizeof(*dp6);
        }
@@@ -462,7 -462,7 +462,7 @@@ aodv_v6_draft_01_rerr(netdissect_option
                if (i < sizeof(*dp6))
                        goto trunc;
                ND_PRINT(" {%s}(%u)", ip6addr_string(ndo, dp6->u_da),
-                   EXTRACT_BE_U_4(dp6->u_ds));
+                        EXTRACT_BE_U_4(dp6->u_ds));
                dp6++;
                i -= sizeof(*dp6);
        }

diff --combined print-icmp6.c
index 5b6dc05daa2d4ddb14809aab3f7e28ad212d8c3f,47d5c06e96ead2f56b820b9d46e260f797ec3541..ac52af233313d58dc363daf2d3fc4b6a93c75bc9
--- 1/print-icmp6.c
--- 2/print-icmp6.c
+++ b/print-icmp6.c
@@@ -1074,19 -1074,19 +1074,19 @@@ icmp6_print(netdissect_options *ndo
  
        switch (icmp6_type) {
        case ICMP6_DST_UNREACH:
 -              ND_TCHECK_16(&oip->ip6_dst);
 +              ND_TCHECK_16(oip->ip6_dst);
                  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:
 -                        ND_PRINT(" %s",ip6addr_string(ndo, &oip->ip6_dst));
 +                        ND_PRINT(" %s",ip6addr_string(ndo, oip->ip6_dst));
                          break;
                case ICMP6_DST_UNREACH_BEYONDSCOPE:
                        ND_PRINT(" %s, source address %s",
 -                             ip6addr_string(ndo, &oip->ip6_dst),
 -                                  ip6addr_string(ndo, &oip->ip6_src));
 +                             ip6addr_string(ndo, oip->ip6_dst),
 +                                  ip6addr_string(ndo, oip->ip6_src));
                        break;
                case ICMP6_DST_UNREACH_NOPORT:
                        if ((ouh = get_upperlayer(ndo, (const u_char *)oip, &prot))
@@@ -1097,17 -1097,17 +1097,17 @@@
                        switch (prot) {
                        case IPPROTO_TCP:
                                ND_PRINT(", %s tcp port %s",
 -                                      ip6addr_string(ndo, &oip->ip6_dst),
 +                                      ip6addr_string(ndo, oip->ip6_dst),
                                            tcpport_string(ndo, dport));
                                break;
                        case IPPROTO_UDP:
                                ND_PRINT(", %s udp port %s",
 -                                      ip6addr_string(ndo, &oip->ip6_dst),
 +                                      ip6addr_string(ndo, oip->ip6_dst),
                                            udpport_string(ndo, dport));
                                break;
                        default:
                                ND_PRINT(", %s protocol %u port %u unreachable",
 -                                      ip6addr_string(ndo, &oip->ip6_dst),
 +                                      ip6addr_string(ndo, oip->ip6_dst),
                                            prot, dport);
                                break;
                        }
@@@ -1125,11 -1125,11 +1125,11 @@@
                ND_PRINT(", mtu %u", EXTRACT_BE_U_4(dp->icmp6_mtu));
                break;
        case ICMP6_TIME_EXCEEDED:
 -              ND_TCHECK_16(&oip->ip6_dst);
 +              ND_TCHECK_16(oip->ip6_dst);
                switch (icmp6_code) {
                case ICMP6_TIME_EXCEED_TRANSIT:
                        ND_PRINT(" for %s",
 -                                  ip6addr_string(ndo, &oip->ip6_dst));
 +                                  ip6addr_string(ndo, oip->ip6_dst));
                        break;
                case ICMP6_TIME_EXCEED_REASSEMBLY:
                        ND_PRINT(" (reassembly)");
@@@ -1140,7 -1140,7 +1140,7 @@@
                }
                break;
        case ICMP6_PARAM_PROB:
 -              ND_TCHECK_16(&oip->ip6_dst);
 +              ND_TCHECK_16(oip->ip6_dst);
                switch (icmp6_code) {
                case ICMP6_PARAMPROB_HEADER:
                          ND_PRINT(", erroneous - octet %u", EXTRACT_BE_U_4(dp->icmp6_pptr));
@@@ -1284,7 -1284,7 +1284,7 @@@
                        in6 = (const nd_ipv6 *)(dp + 1);
                        for (; (const u_char *)in6 < cp; in6++) {
                                ND_TCHECK_SIZE(in6);
 -                              ND_PRINT(", %s", ip6addr_string(ndo, in6));
 +                              ND_PRINT(", %s", ip6addr_string(ndo, (const u_char *)in6));
                        }
                }
                break;
@@@ -1524,7 -1524,7 +1524,7 @@@ icmp6_opt_print(netdissect_options *ndo
                        default:
                                goto trunc;
                        }
 -                      ND_PRINT(" %s/%u", ip6addr_string(ndo, &in6),
 +                      ND_PRINT(" %s/%u", ip6addr_string(ndo, (const u_char *)&in6),
                                    EXTRACT_U_1(opri->nd_opt_rti_prefixlen));
                        ND_PRINT(", pref=%s", get_rtpref(EXTRACT_U_1(opri->nd_opt_rti_flags)));
                        ND_PRINT(", lifetime=%s",
@@@ -1808,7 -1808,6 +1808,7 @@@ icmp6_nodeinfo_print(netdissect_option
                        break;
                }
  
 +              cp = (const u_char *)(ni6 + 1);
                switch (EXTRACT_U_1(ni6->ni_code)) {
                case ICMP6_NI_SUBJ_IPV6:
                        if (!ND_TTEST_LEN(dp, sizeof(*ni6) + sizeof(nd_ipv6)))
@@@ -1819,10 -1818,11 +1819,10 @@@
                                break;
                        }
                        ND_PRINT(", subject=%s",
 -                                  ip6addr_string(ndo, ni6 + 1));
 +                                  ip6addr_string(ndo, cp));
                        break;
                case ICMP6_NI_SUBJ_FQDN:
                        ND_PRINT(", subject=DNS name");
 -                      cp = (const u_char *)(ni6 + 1);
                        if (EXTRACT_U_1(cp) == ep - cp - 1) {
                                /* icmp-name-lookup-03, pascal string */
                                if (ndo->ndo_vflag)
@@@ -1846,7 -1846,7 +1846,7 @@@
                                break;
                        }
                        ND_PRINT(", subject=%s",
 -                                  ipaddr_string(ndo, ni6 + 1));
 +                                  ipaddr_string(ndo, cp));
                        break;
                default:
                        ND_PRINT(", unknown subject");
@@@ -2055,7 -2055,7 +2055,7 @@@ icmp6_rrenum_print(netdissect_options *
                        ND_PRINT(",min=%u", EXTRACT_U_1(match->rpm_minlen));
                        ND_PRINT(",max=%u", EXTRACT_U_1(match->rpm_maxlen));
                }
-               if (addrtostr6(&match->rpm_prefix, hbuf, sizeof(hbuf)))
+               if (addrtostr6(match->rpm_prefix, hbuf, sizeof(hbuf)))
                        ND_PRINT(",%s/%u", hbuf, EXTRACT_U_1(match->rpm_matchlen));
                else
                        ND_PRINT(",?/%u", EXTRACT_U_1(match->rpm_matchlen));
@@@ -2098,7 -2098,7 +2098,7 @@@
                                        ND_PRINT("pltime=%u,",
                                                    EXTRACT_BE_U_4(use->rpu_pltime));
                        }
-                       if (addrtostr6(&use->rpu_prefix, hbuf, sizeof(hbuf)))
+                       if (addrtostr6(use->rpu_prefix, hbuf, sizeof(hbuf)))
                                ND_PRINT("%s/%u/%u", hbuf, EXTRACT_U_1(use->rpu_uselen),
                                            EXTRACT_U_1(use->rpu_keeplen));
                        else