Support for Home Agent Information in ICMPv6, from Kazushi Sugyo

<[email protected]>.

diff --git a/CREDITS b/CREDITS
index 91a25c55ed078918900a56bc2e62dfea9abed830..0da778644b51a79f7e9ba72e7855c958e6e544af 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -36,13 +36,14 @@ Additional people who have contributed patches:
        Jakob Schlyter                  <[email protected]>
        Jan Oravec                      <[email protected]>
        Jason R. Thorpe                 <[email protected]>
-       JINMEI Tatuya                   <[email protected]>
        Jefferson Ogata                 <[email protected]>
        Jeffrey Hutzelman               <[email protected]>
        Jim Hutchins                    <[email protected]>
+       JINMEI Tatuya                   <[email protected]>
        Juergen Schoenwaelder           <[email protected]>
        Julian Cowley                   <[email protected]>
        Kaarthik Sivakumar              <[email protected]>
+       Kazushi Sugyo                   <[email protected]>
        Kelly Carmichael                <[email protected]>
        Ken Hornstein                   <[email protected]>
        Kevin Steves                    <[email protected]>

diff --git a/print-icmp6.c b/print-icmp6.c
index 525037bfd9f858927b665d40f16ee960f399de07..d9a37beea10730f230b50015464b2b1230173435 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.56 2001-06-27 02:48:43 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.57 2001-12-09 05:22:27 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -447,6 +447,7 @@ icmp6_opt_print(const u_char *bp, int resid)
        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;
@@ -545,6 +546,14 @@ icmp6_opt_print(const u_char *bp, int resid)
                        /*(*/
                        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);