sync with 2292bis-02/ND_RA_FLAG_HOME_AGENT

diff --git a/icmp6.h b/icmp6.h
index f75075c9fdd4b437f2f71014e6288ee753b99275..8fa41bce8eb393da9049d94347dcdc8347288b5a 100644 (file)
--- a/icmp6.h
+++ b/icmp6.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/icmp6.h,v 1.9 2001-06-01 03:32:27 itojun Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/icmp6.h,v 1.10 2001-06-01 22:59:45 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 $  */
 
@@ -198,6 +198,7 @@ struct nd_router_advert {   /* router advertisement */
 #define nd_ra_flags_reserved   nd_ra_hdr.icmp6_data8[1]
 #define ND_RA_FLAG_MANAGED     0x80
 #define ND_RA_FLAG_OTHER       0x40
+#define ND_RA_FLAG_HOME_AGENT  0x20
 #define nd_ra_router_lifetime  nd_ra_hdr.icmp6_data16[1]
 
 struct nd_neighbor_solicit {   /* neighbor solicitation */

diff --git a/print-icmp6.c b/print-icmp6.c
index 1b47c89c6f9663c0351f53fe5ccac8f2a74e6666..0c1535a48016b734bbe7e16800fbd04336184bc3 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.52 2001-06-01 04:08:57 itojun Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.53 2001-06-01 22:59:45 itojun Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -280,10 +280,7 @@ icmp6_print(const u_char *bp, 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 & ~ND_RA_FLAG_RTPREF_MASK)