]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-icmp6.c
Get rid of unneeded includes of <netinet/in_systm.h> and <netinet/ip.h>.
[tcpdump] / print-icmp6.c
index 485d0bbeaf82fb73b82f8de590d170aedc063d3e..71323c7dcd895098be86fd971e2c98edaa29cc78 100644 (file)
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.21 2000-08-30 14:28:44 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.60 2002-05-30 22:01:34 itojun Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -37,98 +37,97 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
 
 #include <arpa/inet.h>
 
 #include <stdio.h>
+#include <string.h>
+#include <netdb.h>
 
-#include <netinet/ip6.h>
-#include <netinet/icmp6.h>
+#include "ip6.h"
+#include "icmp6.h"
 
 #include "interface.h"
 #include "addrtoname.h"
 
+#include "udp.h"
+#include "ah.h"
+
+static const char *get_rtpref(u_int);
+static const char *get_lifetime(u_int32_t);
+static void print_lladdr(const u_char *, size_t);
 void icmp6_opt_print(const u_char *, int);
 void mld6_print(const u_char *);
-#ifdef HAVE_STRUCT_ICMP6_NODEINFO
+static struct udphdr *get_upperlayer(u_char *, int *);
 static void dnsname_print(const u_char *, const u_char *);
 void icmp6_nodeinfo_print(int, const u_char *, const u_char *);
-#endif
+void icmp6_rrenum_print(int, const u_char *, const u_char *);
 
 #ifndef abs
 #define abs(a) ((0 < (a)) ? (a) : -(a))
 #endif
 
-#ifndef HAVE_STRUCT_ICMP6_NODEINFO
-struct icmp6_nodeinfo {
-       struct icmp6_hdr icmp6_ni_hdr;
-       u_int8_t icmp6_ni_nonce[8];
-       /* could be followed by reply data */
-};
-
-#define ni_type                icmp6_ni_hdr.icmp6_type
-#define ni_code                icmp6_ni_hdr.icmp6_code
-#define ni_cksum       icmp6_ni_hdr.icmp6_cksum
-#define ni_qtype       icmp6_ni_hdr.icmp6_data16[0]
-#define ni_flags       icmp6_ni_hdr.icmp6_data16[1]
-#endif
+static const char *
+get_rtpref(u_int v)
+{
+       static const char *rtpref_str[] = {
+               "medium",               /* 00 */
+               "high",                 /* 01 */
+               "rsv",                  /* 10 */
+               "low"                   /* 11 */
+       };
 
-/* cope with past KAME typo - shipped with freebsd4[01] and openbsd27 */
-#if defined(ICMP6_NI_SUCESS) && !defined(ICMP6_NI_SUCCESS)
-#define ICMP6_NI_SUCCESS       ICMP6_NI_SUCESS
-#endif
-#ifndef ICMP6_NI_SUCCESS
-#define ICMP6_NI_SUCCESS       0       /* node information successful reply */
-#define ICMP6_NI_REFUSED       1       /* node information request is refused */
-#define ICMP6_NI_UNKNOWN       2       /* unknown Qtype */
-#endif
+       return rtpref_str[((v & ND_RA_FLAG_RTPREF_MASK) >> 3) & 0xff];
+}
 
-#ifdef NI_QTYPE_NOOP
-#define NI_QTYPE_NOOP          0 /* NOOP  */
-#define NI_QTYPE_SUPTYPES      1 /* Supported Qtypes */
-#define NI_QTYPE_FQDN          2 /* FQDN */
-#define NI_QTYPE_NODEADDR      3 /* Node Addresses. XXX: spec says 2, but it may be a typo... */
-#endif
+static const char *
+get_lifetime(u_int32_t v)
+{
+       static char buf[20];
 
-#ifndef ICMP6_NI_SUBJ_IPV6
-#define ICMP6_NI_SUBJ_IPV6     0       /* Query Subject is an IPv6 address */
-#define ICMP6_NI_SUBJ_FQDN     1       /* Query Subject is a Domain name */
-#define ICMP6_NI_SUBJ_IPV4     2       /* Query Subject is an IPv4 address */
-#endif
+       if (v == (u_int32_t)~0UL)
+               return "infinity";
+       else {
+               snprintf(buf, sizeof(buf), "%u", v);
+               return buf;
+       }
+}
+
+static void
+print_lladdr(const u_int8_t *p, size_t l)
+{
+       const u_int8_t *ep, *q;
+
+       q = p;
+       ep = p + l;
+       while (l > 0 && q < ep) {
+               if (q > p)
+                       printf(":");
+               printf("%02x", *q++);
+               l--;
+       }
+}
 
 void
-icmp6_print(register const u_char *bp, register const u_char *bp2)
+icmp6_print(const u_char *bp, const u_char *bp2)
 {
        const struct icmp6_hdr *dp;
-       register const struct ip6_hdr *ip;
-       register const char *str;
-       register const struct ip6_hdr *oip;
-       register const struct udphdr *ouh;
-       register int hlen, dport;
-       register const u_char *ep;
+       const struct ip6_hdr *ip;
+       const char *str;
+       const struct ip6_hdr *oip;
+       const struct udphdr *ouh;
+       int dport;
+       const u_char *ep;
        char buf[256];
-       int icmp6len;
-
-#if 0
-#define TCHECK(var) if ((u_char *)&(var) > ep - sizeof(var)) goto trunc
-#endif
+       int icmp6len, prot;
 
        dp = (struct icmp6_hdr *)bp;
        ip = (struct ip6_hdr *)bp2;
        oip = (struct ip6_hdr *)(dp + 1);
        str = buf;
-       /* 'ep' points to the end of avaible data. */
+       /* 'ep' points to the end of available data. */
        ep = snapend;
        if (ip->ip6_plen)
                icmp6len = (ntohs(ip->ip6_plen) + sizeof(struct ip6_hdr) -
@@ -136,12 +135,6 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
        else                    /* XXX: jumbo payload case... */
                icmp6len = snapend - bp;
 
-#if 0
-       (void)printf("%s > %s: ",
-               ip6addr_string(&ip->ip6_src),
-               ip6addr_string(&ip->ip6_dst));
-#endif
-
        TCHECK(dp->icmp6_code);
        switch (dp->icmp6_type) {
        case ICMP6_DST_UNREACH:
@@ -155,11 +148,7 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
                        printf("icmp6: %s unreachable prohibited",
                               ip6addr_string(&oip->ip6_dst));
                        break;
-#ifdef ICMP6_DST_UNREACH_BEYONDSCOPE
                case ICMP6_DST_UNREACH_BEYONDSCOPE:
-#else
-               case ICMP6_DST_UNREACH_NOTNEIGHBOR:
-#endif
                        printf("icmp6: %s beyond scope of source address %s",
                               ip6addr_string(&oip->ip6_dst),
                               ip6addr_string(&oip->ip6_src));
@@ -169,11 +158,12 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
                               ip6addr_string(&oip->ip6_dst));
                        break;
                case ICMP6_DST_UNREACH_NOPORT:
-                       TCHECK(oip->ip6_nxt);
-                       hlen = sizeof(struct ip6_hdr);
-                       ouh = (struct udphdr *)(((u_char *)oip) + hlen);
+                       if ((ouh = get_upperlayer((u_char *)oip, &prot))
+                           == NULL)
+                               goto trunc;
+
                        dport = ntohs(ouh->uh_dport);
-                       switch (oip->ip6_nxt) {
+                       switch (prot) {
                        case IPPROTO_TCP:
                                printf("icmp6: %s tcp port %s unreachable",
                                        ip6addr_string(&oip->ip6_dst),
@@ -200,7 +190,7 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
                break;
        case ICMP6_PACKET_TOO_BIG:
                TCHECK(dp->icmp6_mtu);
-               printf("icmp6: too big %u\n", (u_int32_t)ntohl(dp->icmp6_mtu));
+               printf("icmp6: too big %u", (u_int32_t)ntohl(dp->icmp6_mtu));
                break;
        case ICMP6_TIME_EXCEEDED:
                TCHECK(oip->ip6_dst);
@@ -222,15 +212,15 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
                TCHECK(oip->ip6_dst);
                switch (dp->icmp6_code) {
                case ICMP6_PARAMPROB_HEADER:
-                       printf("icmp6: parameter problem errorneous - octet %u\n",
+                       printf("icmp6: parameter problem errorneous - octet %u",
                                (u_int32_t)ntohl(dp->icmp6_pptr));
                        break;
                case ICMP6_PARAMPROB_NEXTHEADER:
-                       printf("icmp6: parameter problem next header - octet %u\n",
+                       printf("icmp6: parameter problem next header - octet %u",
                                (u_int32_t)ntohl(dp->icmp6_pptr));
                        break;
                case ICMP6_PARAMPROB_OPTION:
-                       printf("icmp6: parameter problem option - octet %u\n",
+                       printf("icmp6: parameter problem option - octet %u",
                                (u_int32_t)ntohl(dp->icmp6_pptr));
                        break;
                default:
@@ -245,7 +235,6 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
        case ICMP6_ECHO_REPLY:
                printf("icmp6: echo reply");
                break;
-#if defined(HAVE_STRUCT_MLD6_HDR) || defined(HAVE_STRUCT_ICMP6_MLD)
        case ICMP6_MEMBERSHIP_QUERY:
                printf("icmp6: multicast listener query ");
                mld6_print((const u_char *)dp);
@@ -258,7 +247,6 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
                printf("icmp6: multicast listener done ");
                mld6_print((const u_char *)dp);
                break;
-#endif
        case ND_ROUTER_SOLICIT:
                printf("icmp6: router solicitation ");
                if (vflag) {
@@ -279,13 +267,16 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
                                printf("M");
                        if (p->nd_ra_flags_reserved & ND_RA_FLAG_OTHER)
                                printf("O");
-#ifndef ND_RA_FLAG_HA
-#define ND_RA_FLAG_HA  0x20
-#endif
-                       if (p->nd_ra_flags_reserved & ND_RA_FLAG_HA)
+                       if (p->nd_ra_flags_reserved & ND_RA_FLAG_HOME_AGENT)
                                printf("H");
-                       if (p->nd_ra_flags_reserved != 0)
+
+                       if ((p->nd_ra_flags_reserved & ~ND_RA_FLAG_RTPREF_MASK)
+                           != 0)
                                printf(" ");
+
+                       printf("pref=%s, ",
+                           get_rtpref(p->nd_ra_flags_reserved));
+
                        printf("router_ltime=%d, ", ntohs(p->nd_ra_router_lifetime));
                        printf("reachable_time=%u, ",
                                (u_int32_t)ntohl(p->nd_ra_reachable));
@@ -358,42 +349,35 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
                break;
 #undef REDIRECTLEN
 #undef RDR
-#ifndef ICMP6_ROUTER_RENUMBERING
-#define ICMP6_ROUTER_RENUMBERING       138     /* router renumbering */
-#endif
        case ICMP6_ROUTER_RENUMBERING:
-               switch (dp->icmp6_code) {
-#ifndef ICMP6_ROUTER_RENUMBERING_COMMAND
-#define ICMP6_ROUTER_RENUMBERING_COMMAND  0    /* rr command */
-#endif
-               case ICMP6_ROUTER_RENUMBERING_COMMAND:
-                       printf("icmp6: router renum command");
-                       break;
-#ifndef ICMP6_ROUTER_RENUMBERING_RESULT
-#define ICMP6_ROUTER_RENUMBERING_RESULT   1    /* rr result */
-#endif
-               case ICMP6_ROUTER_RENUMBERING_RESULT:
-                       printf("icmp6: router renum result");
-                       break;
-               default:
-                       printf("icmp6: router renum code-#%d", dp->icmp6_code);
-                       break;
-               }
+               icmp6_rrenum_print(icmp6len, bp, ep);
                break;
-#ifdef HAVE_STRUCT_ICMP6_NODEINFO
-#ifndef ICMP6_NI_QUERY
-#define ICMP6_NI_QUERY 139
-#endif
        case ICMP6_NI_QUERY:
-               icmp6_nodeinfo_print(icmp6len, bp, ep);
-               break;
-#ifndef ICMP6_NI_REPLY
-#define ICMP6_NI_REPLY 140
-#endif
        case ICMP6_NI_REPLY:
                icmp6_nodeinfo_print(icmp6len, bp, ep);
                break;
-#endif
+       case ICMP6_HADISCOV_REQUEST:
+       case ICMP6_HADISCOV_REPLY:
+       {
+               struct in6_addr *in6;
+               u_int32_t *res;
+               u_char *cp;
+               printf("icmp6: ha discovery %s: ",
+                      dp->icmp6_type == ICMP6_HADISCOV_REQUEST ?
+                      "request" : "reply");
+               TCHECK(dp->icmp6_data16[0]);
+               printf("id=%d", ntohs(dp->icmp6_data16[0]));
+               cp = (u_char *)dp + icmp6len;
+               res = (u_int32_t *)(dp + 1);
+               in6 = (struct in6_addr *)(res + 2);
+               for (; (u_char *)in6 < cp; in6++) {
+                       TCHECK(*in6);
+                       printf(", %s", ip6addr_string(in6));
+               }
+               break;
+       }
+       case ICMP6_MOBILEPREFIX_SOLICIT:
+       case ICMP6_MOBILEPREFIX_ADVERT:
        default:
                printf("icmp6: type-#%d", dp->icmp6_type);
                break;
@@ -401,155 +385,249 @@ icmp6_print(register const u_char *bp, register const u_char *bp2)
        return;
 trunc:
        fputs("[|icmp6]", stdout);
-#if 0
-#undef TCHECK
-#endif
+}
+
+static struct udphdr *
+get_upperlayer(u_char *bp, int *prot)
+{
+       const u_char *ep;
+       struct ip6_hdr *ip6 = (struct ip6_hdr *)bp;
+       struct udphdr *uh;
+       struct ip6_hbh *hbh;
+       struct ip6_frag *fragh;
+       struct ah *ah;
+       int nh, hlen;
+
+       /* 'ep' points to the end of available data. */
+       ep = snapend;
+
+       if (TTEST(ip6->ip6_nxt) == 0)
+               return NULL;
+
+       nh = ip6->ip6_nxt;
+       hlen = sizeof(struct ip6_hdr);
+
+       while (bp < snapend) {
+               bp += hlen;
+
+               switch(nh) {
+               case IPPROTO_UDP:
+               case IPPROTO_TCP:
+                       uh = (struct udphdr *)bp;
+                       if (TTEST(uh->uh_dport)) {
+                               *prot = nh;
+                               return(uh);
+                       }
+                       else
+                               return(NULL);
+                       /* NOTREACHED */
+
+               case IPPROTO_HOPOPTS:
+               case IPPROTO_DSTOPTS:
+               case IPPROTO_ROUTING:
+                       hbh = (struct ip6_hbh *)bp;
+                       if (TTEST(hbh->ip6h_len) == 0)
+                               return(NULL);
+                       nh = hbh->ip6h_nxt;
+                       hlen = (hbh->ip6h_len + 1) << 3;
+                       break;
+
+               case IPPROTO_FRAGMENT: /* this should be odd, but try anyway */
+                       fragh = (struct ip6_frag *)bp;
+                       if (TTEST(fragh->ip6f_offlg) == 0)
+                               return(NULL);
+                       /* fragments with non-zero offset are meaningless */
+                       if ((fragh->ip6f_offlg & IP6F_OFF_MASK) != 0)
+                               return(NULL);
+                       nh = fragh->ip6f_nxt;
+                       hlen = sizeof(struct ip6_frag);
+                       break;
+
+               case IPPROTO_AH:
+                       ah = (struct ah *)bp;
+                       if (TTEST(ah->ah_len) == 0)
+                               return(NULL);
+                       nh = ah->ah_nxt;
+                       hlen = (ah->ah_len + 2) << 2;
+                       break;
+
+               default:        /* unknown or undecodable header */
+                       *prot = nh; /* meaningless, but set here anyway */
+                       return(NULL);
+               }
+       }
+
+       return(NULL);           /* should be notreached, though */
 }
 
 void
-icmp6_opt_print(register const u_char *bp, int resid)
+icmp6_opt_print(const u_char *bp, int resid)
 {
-       register const struct nd_opt_hdr *op;
-       register const struct nd_opt_hdr *opl;  /* why there's no struct? */
-       register const struct nd_opt_prefix_info *opp;
-       register const struct icmp6_opts_redirect *opr;
-       register const struct nd_opt_mtu *opm;
-       register const u_char *ep;
-       int     opts_len;
-#if 0
-       register const struct ip6_hdr *ip;
-       register const char *str;
-       register const struct ip6_hdr *oip;
-       register const struct udphdr *ouh;
-       register int hlen, dport;
-       char buf[256];
-#endif
+       const struct nd_opt_hdr *op;
+       const struct nd_opt_hdr *opl;   /* why there's no struct? */
+       const struct nd_opt_prefix_info *opp;
+       const struct icmp6_opts_redirect *opr;
+       const struct nd_opt_mtu *opm;
+       const struct nd_opt_advinterval *opa;
+       const struct nd_opt_homeagent_info *oph;
+       const struct nd_opt_route_info *opri;
+       const u_char *cp, *ep;
+       struct in6_addr in6, *in6p;
+       size_t l;
 
 #define ECHECK(var) if ((u_char *)&(var) > ep - sizeof(var)) return
 
-       op = (struct nd_opt_hdr *)bp;
-#if 0
-       ip = (struct ip6_hdr *)bp2;
-       oip = &dp->icmp6_ip6;
-       str = buf;
-#endif
-       /* 'ep' points to the end of avaible data. */
+       cp = bp;
+       /* 'ep' points to the end of available data. */
        ep = snapend;
 
-       ECHECK(op->nd_opt_len);
-       if (resid <= 0)
-               return;
-       switch (op->nd_opt_type) {
-       case ND_OPT_SOURCE_LINKADDR:
-               opl = (struct nd_opt_hdr *)op;
-#if 1
-               if ((u_char *)opl + (opl->nd_opt_len << 3) > ep)
+       while (cp < ep) {
+               op = (struct nd_opt_hdr *)cp;
+
+               ECHECK(op->nd_opt_len);
+               if (resid <= 0)
+                       return;
+               if (op->nd_opt_len == 0)
                        goto trunc;
-#else
-               TCHECK((u_char *)opl + (opl->nd_opt_len << 3) - 1);
-#endif
-               printf("(src lladdr: %s",       /*)*/
-                       etheraddr_string((u_char *)(opl + 1)));
-               if (opl->nd_opt_len != 1)
-                       printf("!");
-               /*(*/
-               printf(")");
-               icmp6_opt_print((const u_char *)op + (op->nd_opt_len << 3),
-                               resid - (op->nd_opt_len << 3));
-               break;
-       case ND_OPT_TARGET_LINKADDR:
-               opl = (struct nd_opt_hdr *)op;
-#if 1
-               if ((u_char *)opl + (opl->nd_opt_len << 3) > ep)
+               if (cp + (op->nd_opt_len << 3) > ep)
                        goto trunc;
-#else
-               TCHECK((u_char *)opl + (opl->nd_opt_len << 3) - 1);
-#endif
-               printf("(tgt lladdr: %s",       /*)*/
-                       etheraddr_string((u_char *)(opl + 1)));
-               if (opl->nd_opt_len != 1)
-                       printf("!");
-               /*(*/
-               printf(")");
-               icmp6_opt_print((const u_char *)op + (op->nd_opt_len << 3),
-                               resid - (op->nd_opt_len << 3));
-               break;
-       case ND_OPT_PREFIX_INFORMATION:
-               opp = (struct nd_opt_prefix_info *)op;
-               TCHECK(opp->nd_opt_pi_prefix);
-               printf("(prefix info: ");       /*)*/
-               if (opp->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK)
-                      printf("L");
-               if (opp->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO)
-                      printf("A");
-               if (opp->nd_opt_pi_flags_reserved)
-                       printf(" ");
-               printf("valid_ltime=");
-               if ((u_int32_t)ntohl(opp->nd_opt_pi_valid_time) == ~0U)
-                       printf("infinity");
-               else {
-                       printf("%u", (u_int32_t)ntohl(opp->nd_opt_pi_valid_time));
-               }
-               printf(", ");
-               printf("preffered_ltime=");
-               if ((u_int32_t)ntohl(opp->nd_opt_pi_preferred_time) == ~0U)
-                       printf("infinity");
-               else {
-                       printf("%u", (u_int32_t)ntohl(opp->nd_opt_pi_preferred_time));
+
+               switch (op->nd_opt_type) {
+               case ND_OPT_SOURCE_LINKADDR:
+                       opl = (struct nd_opt_hdr *)op;
+                       printf("(src lladdr: ");
+                       l = (op->nd_opt_len << 3) - 2;
+                       print_lladdr(cp + 2, l);
+                       /*(*/
+                       printf(")");
+                       break;
+               case ND_OPT_TARGET_LINKADDR:
+                       opl = (struct nd_opt_hdr *)op;
+                       printf("(tgt lladdr: ");
+                       l = (op->nd_opt_len << 3) - 2;
+                       print_lladdr(cp + 2, l);
+                       /*(*/
+                       printf(")");
+                       break;
+               case ND_OPT_PREFIX_INFORMATION:
+                       opp = (struct nd_opt_prefix_info *)op;
+                       TCHECK(opp->nd_opt_pi_prefix);
+                       printf("(prefix info: ");       /*)*/
+                       if (op->nd_opt_len != 4) {
+                               printf("badlen");
+                               /*(*/
+                               printf(")");
+                               break;
+                       }
+                       if (opp->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ONLINK)
+                               printf("L");
+                       if (opp->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_AUTO)
+                               printf("A");
+                       if (opp->nd_opt_pi_flags_reserved & ND_OPT_PI_FLAG_ROUTER)
+                               printf("R");
+                       if (opp->nd_opt_pi_flags_reserved)
+                               printf(" ");
+                       printf("valid_ltime=%s,",
+                           get_lifetime((u_int32_t)ntohl(opp->nd_opt_pi_valid_time)));
+                       printf("preferred_ltime=%s,",
+                           get_lifetime((u_int32_t)ntohl(opp->nd_opt_pi_preferred_time)));
+                       printf("prefix=%s/%d",
+                           ip6addr_string(&opp->nd_opt_pi_prefix),
+                           opp->nd_opt_pi_prefix_len);
+                       if (opp->nd_opt_pi_len != 4)
+                               printf("!");
+                       /*(*/
+                       printf(")");
+                       break;
+               case ND_OPT_REDIRECTED_HEADER:
+                       opr = (struct icmp6_opts_redirect *)op;
+                       printf("(redirect)");
+                       /* xxx */
+                       break;
+               case ND_OPT_MTU:
+                       opm = (struct nd_opt_mtu *)op;
+                       TCHECK(opm->nd_opt_mtu_mtu);
+                       printf("(mtu:");        /*)*/
+                       if (op->nd_opt_len != 1) {
+                               printf("badlen");
+                               /*(*/
+                               printf(")");
+                               break;
+                       }
+                       printf(" mtu=%u", (u_int32_t)ntohl(opm->nd_opt_mtu_mtu));
+                       if (opm->nd_opt_mtu_len != 1)
+                               printf("!");
+                       printf(")");
+                       break;
+               case ND_OPT_ADVINTERVAL:
+                       opa = (struct nd_opt_advinterval *)op;
+                       TCHECK(opa->nd_opt_adv_interval);
+                       printf("(advint:");     /*)*/
+                       printf(" advint=%u",
+                           (u_int32_t)ntohl(opa->nd_opt_adv_interval));
+                       /*(*/
+                       printf(")");
+                       break;                
+               case ND_OPT_HOMEAGENT_INFO:
+                       oph = (struct nd_opt_homeagent_info *)op;
+                       TCHECK(oph->nd_opt_hai_lifetime);
+                       printf("(ha info:");    /*)*/
+                       printf(" pref=%d", ntohs(oph->nd_opt_hai_preference));
+                       printf(", lifetime=%u", ntohs(oph->nd_opt_hai_lifetime));
+                       printf(")");
+                       break;                
+               case ND_OPT_ROUTE_INFO:
+                       opri = (struct nd_opt_route_info *)op;
+                       TCHECK(opri->nd_opt_rti_lifetime);
+                       memset(&in6, 0, sizeof(in6));
+                       in6p = (struct in6_addr *)(opri + 1);
+                       switch (op->nd_opt_len) {
+                       case 1:
+                               break;
+                       case 2:
+                               TCHECK2(*in6p, 8);
+                               memcpy(&in6, opri + 1, 8);
+                               break;
+                       case 3:
+                               TCHECK(*in6p);
+                               memcpy(&in6, opri + 1, sizeof(in6));
+                               break;
+                       default:
+                               goto trunc;
+                       }
+                       printf("(rtinfo:");     /*)*/
+                       printf(" %s/%u", ip6addr_string(&in6),
+                           opri->nd_opt_rti_prefixlen);
+                       printf(", pref=%s", get_rtpref(opri->nd_opt_rti_flags));
+                       printf(", lifetime=%s",
+                           get_lifetime((u_int32_t)ntohl(opri->nd_opt_rti_lifetime)));
+                       /*(*/
+                       printf(")");
+                       break;
+               default:
+                       printf("(unknown opt_type=%d, opt_len=%d)",
+                              op->nd_opt_type, op->nd_opt_len);
+                       break;
                }
-               printf(", ");
-               printf("prefix=%s/%d", ip6addr_string(&opp->nd_opt_pi_prefix),
-                       opp->nd_opt_pi_prefix_len);
-               if (opp->nd_opt_pi_len != 4)
-                       printf("!");
-               /*(*/
-               printf(")");
-               icmp6_opt_print((const u_char *)op + (op->nd_opt_len << 3),
-                               resid - (op->nd_opt_len << 3));
-               break;
-       case ND_OPT_REDIRECTED_HEADER:
-               opr = (struct icmp6_opts_redirect *)op;
-               printf("(redirect)");
-               /* xxx */
-               icmp6_opt_print((const u_char *)op + (op->nd_opt_len << 3),
-                               resid - (op->nd_opt_len << 3));
-               break;
-       case ND_OPT_MTU:
-               opm = (struct nd_opt_mtu *)op;
-               TCHECK(opm->nd_opt_mtu_mtu);
-               printf("(mtu: ");       /*)*/
-               printf("mtu=%u", (u_int32_t)ntohl(opm->nd_opt_mtu_mtu));
-               if (opm->nd_opt_mtu_len != 1)
-                       printf("!");
-               printf(")");
-               icmp6_opt_print((const u_char *)op + (op->nd_opt_len << 3),
-                               resid - (op->nd_opt_len << 3));
-               break;
-       default:
-               opts_len = op->nd_opt_len;
-               printf("(unknwon opt_type=%d, opt_len=%d)",
-                      op->nd_opt_type, opts_len);
-               if (opts_len == 0)
-                       opts_len = 1; /* XXX */
-               icmp6_opt_print((const u_char *)op + (opts_len << 3),
-                               resid - (opts_len << 3));
-               break;
+
+               cp += op->nd_opt_len << 3;
+               resid -= op->nd_opt_len << 3;
        }
        return;
+
  trunc:
        fputs("[ndp opt]", stdout);
        return;
 #undef ECHECK
 }
 
-#if defined(HAVE_STRUCT_MLD6_HDR)
 void
-mld6_print(register const u_char *bp)
+mld6_print(const u_char *bp)
 {
-       register struct mld6_hdr *mp = (struct mld6_hdr *)bp;
-       register const u_char *ep;
+       struct mld6_hdr *mp = (struct mld6_hdr *)bp;
+       const u_char *ep;
 
-       /* 'ep' points to the end of avaible data. */
+       /* 'ep' points to the end of available data. */
        ep = snapend;
 
        if ((u_char *)mp + sizeof(*mp) > ep)
@@ -559,27 +637,6 @@ mld6_print(register const u_char *bp)
        printf("addr: %s", ip6addr_string(&mp->mld6_addr));
 }
 
-#elif defined(HAVE_STRUCT_ICMP6_MLD)
-
-void
-mld6_print(register const u_char *bp)
-{
-       register struct icmp6_mld *mp = (struct icmp6_mld *)bp;
-       register const u_char *ep;
-
-       /* 'ep' points to the end of avaible data. */
-       ep = snapend;
-
-       if ((u_char *)mp + sizeof(*mp) > ep)
-               return;
-
-       printf("max resp delay: %d ", ntohs(mp->icmp6m_hdr.icmp6_maxdelay));
-       printf("addr: %s", ip6addr_string(&mp->icmp6m_group));
-}
-
-#endif
-
-#ifdef HAVE_STRUCT_ICMP6_NODEINFO
 static void
 dnsname_print(const u_char *cp, const u_char *ep)
 {
@@ -831,7 +888,7 @@ icmp6_nodeinfo_print(int icmp6len, const u_char *bp, const u_char *ep)
                                        break;
                                printf(" %s", getname6(bp + i));
                                i += sizeof(struct in6_addr);
-                               printf("(%d)", ntohl(*(int32_t *)(bp + i)));
+                               printf("(%d)", (int32_t)ntohl(*(int32_t *)(bp + i)));
                                i += sizeof(int32_t);
                        }
                        i = ni6->ni_flags;
@@ -862,6 +919,143 @@ icmp6_nodeinfo_print(int icmp6len, const u_char *bp, const u_char *ep)
 trunc:
        fputs("[|icmp6]", stdout);
 }
-#endif
+
+void
+icmp6_rrenum_print(int icmp6len, const u_char *bp, const u_char *ep)
+{
+       struct icmp6_router_renum *rr6;
+       struct icmp6_hdr *dp;
+       size_t siz;
+       const char *cp;
+       struct rr_pco_match *match;
+       struct rr_pco_use *use;
+       char hbuf[NI_MAXHOST];
+       int n;
+
+       dp = (struct icmp6_hdr *)bp;
+       rr6 = (struct icmp6_router_renum *)bp;
+       siz = ep - bp;
+       cp = (const char *)(rr6 + 1);
+
+       TCHECK(rr6->rr_reserved);
+       switch (rr6->rr_code) {
+       case ICMP6_ROUTER_RENUMBERING_COMMAND:
+               printf("router renum: command");
+               break;
+       case ICMP6_ROUTER_RENUMBERING_RESULT:
+               printf("router renum: result");
+               break;
+       case ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET:
+               printf("router renum: sequence number reset");
+               break;
+       default:
+               printf("router renum: code-#%d", rr6->rr_code);
+               break;
+       }
+
+       printf(", seq=%u", (u_int32_t)ntohl(rr6->rr_seqnum));
+
+       if (vflag) {
+#define F(x, y)        ((rr6->rr_flags) & (x) ? (y) : "")
+               printf("[");    /*]*/
+               if (rr6->rr_flags) {
+                       printf("%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_PREVDONE, "P"));
+               }
+               printf("seg=%u,", rr6->rr_segnum);
+               printf("maxdelay=%u", rr6->rr_maxdelay);
+               if (rr6->rr_reserved)
+                       printf("rsvd=0x%x", (u_int16_t)ntohs(rr6->rr_reserved));
+               /*[*/
+               printf("]");
+#undef F
+       }
+
+       if (rr6->rr_code == ICMP6_ROUTER_RENUMBERING_COMMAND) {
+               match = (struct rr_pco_match *)cp;
+               cp = (const char *)(match + 1);
+
+               TCHECK(match->rpm_prefix);
+
+               if (vflag > 1)
+                       printf("\n\t");
+               else
+                       printf(" ");
+               printf("match(");       /*)*/
+               switch (match->rpm_code) {
+               case RPM_PCO_ADD:       printf("add"); break;
+               case RPM_PCO_CHANGE:    printf("change"); break;
+               case RPM_PCO_SETGLOBAL: printf("setglobal"); break;
+               default:                printf("#%u", match->rpm_code); break;
+               }
+
+               if (vflag) {
+                       printf(",ord=%u", match->rpm_ordinal);
+                       printf(",min=%u", match->rpm_minlen);
+                       printf(",max=%u", match->rpm_maxlen);
+               }
+               if (inet_ntop(AF_INET6, &match->rpm_prefix, hbuf, sizeof(hbuf)))
+                       printf(",%s/%u", hbuf, match->rpm_matchlen);
+               else
+                       printf(",?/%u", match->rpm_matchlen);
+               /*(*/
+               printf(")");
+
+               n = match->rpm_len - 3;
+               if (n % 4)
+                       goto trunc;
+               n /= 4;
+               while (n-- > 0) {
+                       use = (struct rr_pco_use *)cp;
+                       cp = (const char *)(use + 1);
+
+                       TCHECK(use->rpu_prefix);
+
+                       if (vflag > 1)
+                               printf("\n\t");
+                       else
+                               printf(" ");
+                       printf("use("); /*)*/
+                       if (use->rpu_flags) {
+#define F(x, y)        ((use->rpu_flags) & (x) ? (y) : "")
+                               printf("%s%s,",
+                                   F(ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME, "V"),
+                                   F(ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME, "P"));
+#undef F
+                       }
+                       if (vflag) {
+                               printf("mask=0x%x,", use->rpu_ramask);
+                               printf("raflags=0x%x,", use->rpu_raflags);
+                               if (~use->rpu_vltime == 0)
+                                       printf("vltime=infty,");
+                               else
+                                       printf("vltime=%u,",
+                                           (u_int32_t)ntohl(use->rpu_vltime));
+                               if (~use->rpu_pltime == 0)
+                                       printf("pltime=infty,");
+                               else
+                                       printf("pltime=%u,",
+                                           (u_int32_t)ntohl(use->rpu_pltime));
+                       }
+                       if (inet_ntop(AF_INET6, &use->rpu_prefix, hbuf,
+                           sizeof(hbuf)))
+                               printf("%s/%u/%u", hbuf, use->rpu_uselen,
+                                   use->rpu_keeplen);
+                       else
+                               printf("?/%u/%u", use->rpu_uselen,
+                                   use->rpu_keeplen);
+                       /*(*/
+                       printf(")");
+               }
+       }
+
+       return;
+
+trunc:
+       fputs("[|icmp6]", stdout);
+}
 
 #endif /* INET6 */