meet 2292bis-02 for RA option decls

diff --git a/icmp6.h b/icmp6.h
index cb77918f7e8ae6cd047827be1cdf8d8f72d65ad5..752f97c770ad88ab32c4b25944a31fe1ace386fa 100644 (file)
--- a/icmp6.h
+++ b/icmp6.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/icmp6.h,v 1.6 2001-01-28 09:02:14 itojun Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/icmp6.h,v 1.7 2001-01-28 09:09:36 itojun Exp $ (LBL) */
 /*     $NetBSD: icmp6.h,v 1.13 2000/08/03 16:30:37 itojun Exp $        */
 /*     $KAME: icmp6.h,v 1.22 2000/08/03 15:25:16 jinmei Exp $  */
 
@@ -250,6 +250,7 @@ struct nd_opt_hdr {         /* Neighbor discovery option header */
 #define ND_OPT_REDIRECTED_HEADER       4
 #define ND_OPT_MTU                     5
 #define ND_OPT_ADVINTERVAL             7
+#define ND_OPT_HOMEAGENT_INFO          8
 
 struct nd_opt_prefix_info {    /* prefix information */
        u_int8_t        nd_opt_pi_type;
@@ -281,11 +282,19 @@ struct nd_opt_mtu {               /* MTU option */
        u_int32_t       nd_opt_mtu_mtu;
 };
 
-struct nd_opt_advint {         /* Advertisement interval option */
-       u_int8_t        nd_opt_advint_type;
-       u_int8_t        nd_opt_advint_len;
-       u_int16_t       nd_opt_advint_reserved;
-       u_int32_t       nd_opt_advint_advint;
+struct nd_opt_advinterval {    /* Advertisement interval option */
+       u_int8_t        nd_opt_adv_type;
+       u_int8_t        nd_opt_adv_len;
+       u_int16_t       nd_opt_adv_reserved;
+       u_int32_t       nd_opt_adv_interval;
+};
+
+struct nd_opt_homeagent_info { /* Home Agent info */
+       uint8_t         nd_opt_hai_type;
+       uint8_t         nd_opt_hai_len;
+       uint16_t        nd_opt_hai_reserved;
+       int16_t         nd_opt_hai_preference;
+       uint16_t        nd_opt_hai_lifetime;
 };
 
 /*

diff --git a/print-icmp6.c b/print-icmp6.c
index 23047b243eca11701c31f0740e22a50fc7d36855..4952fd7114ac30d2de333fe73a9e79a3ace74be2 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.44 2001-01-28 09:02:14 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.45 2001-01-28 09:09:36 itojun Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -411,7 +411,7 @@ icmp6_opt_print(register const u_char *bp, int resid)
        register const struct nd_opt_prefix_info *opp;
        register const struct icmp6_opts_redirect *opr;
        register const struct nd_opt_mtu *opm;
-       register const struct nd_opt_advint *opa;
+       register const struct nd_opt_advinterval *opa;
        register const u_char *ep;
        int     opts_len;
 #if 0
@@ -526,11 +526,11 @@ icmp6_opt_print(register const u_char *bp, int resid)
                                resid - (op->nd_opt_len << 3));
                break;
         case ND_OPT_ADVINTERVAL:
-               opa = (struct nd_opt_advint *)op;
-               TCHECK(opa->nd_opt_advint_advint);
+               opa = (struct nd_opt_advinterval *)op;
+               TCHECK(opa->nd_opt_adv_interval);
                printf("(advint: ");    /*)*/
                printf("advint=%u",
-                   (u_int32_t)ntohl(opa->nd_opt_advint_advint));
+                   (u_int32_t)ntohl(opa->nd_opt_adv_interval));
                /*(*/
                printf(")");
                icmp6_opt_print((const u_char *)op + (op->nd_opt_len << 3),