Permalink
Browse files

use 2292bis def for router alert opt

  • Loading branch information...
1 parent a671d0c commit 1aff7ad5aa163945b5d6c65c37aed76c1051a79a itojun committed Sep 9, 2003
@@ -1,4 +1,4 @@
-/* $KAME: mld6.c,v 1.15 2003/04/02 11:29:54 suz Exp $ */
+/* $KAME: mld6.c,v 1.16 2003/09/09 00:42:46 itojun Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -281,7 +281,7 @@ make_msg(int index, struct in6_addr *addr, u_int type)
#else /* old advanced API */
if (inet6_option_init((void *)cmsgp, &cmsgp, IPV6_HOPOPTS))
errx(1, "inet6_option_init failed\n");
- raopt[0] = IP6OPT_RTALERT;
+ raopt[0] = IP6OPT_ROUTER_ALERT;
raopt[1] = IP6OPT_RTALERT_LEN - 2;
memcpy(&raopt[2], (caddr_t)&rtalert_code, sizeof(u_short));
if (inet6_option_append(cmsgp, raopt, 4, 0))
@@ -147,7 +147,7 @@ ip6_opt_print(const u_char *bp, int len)
}
optlen = bp[i + 1] + 2;
break;
- case IP6OPT_RTALERT:
+ case IP6OPT_ROUTER_ALERT:
if (len - i < IP6OPT_RTALERT_LEN) {
printf("(rtalert: trunc)");
goto trunc;
View
@@ -1,4 +1,4 @@
-/* $KAME: ip6.h,v 1.49 2003/08/14 15:29:36 t-momose Exp $ */
+/* $KAME: ip6.h,v 1.50 2003/09/09 00:43:14 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -142,8 +142,10 @@ struct ip6_dest {
#define IP6OPT_JUMBO 0xC2 /* 11 0 00010 = 194 */
#define IP6OPT_NSAP_ADDR 0xC3 /* 11 0 00011 */
#define IP6OPT_TUNNEL_LIMIT 0x04 /* 00 0 00100 */
+#ifndef _KERNEL
#define IP6OPT_RTALERT 0x05 /* 00 0 00101 (KAME definition) */
-#define IP6OPT_ROUTER_ALERT 0x05 /* (2292bis def, recommended) */
+#endif
+#define IP6OPT_ROUTER_ALERT 0x05 /* 00 0 00101 (2292bis, recommended) */
#define IP6OPT_RTALERT_LEN 4
#define IP6OPT_RTALERT_MLD 0 /* Datagram contains an MLD message */
@@ -1,4 +1,4 @@
-/* $KAME: ip6_input.c,v 1.326 2003/09/06 02:36:48 itojun Exp $ */
+/* $KAME: ip6_input.c,v 1.327 2003/09/09 00:42:54 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -1457,7 +1457,7 @@ ip6_process_hopopts(m, opthead, hbhlen, rtalertp, plenp)
}
optlen = *(opt + 1) + 2;
break;
- case IP6OPT_RTALERT:
+ case IP6OPT_ROUTER_ALERT:
/* XXX may need check for alignment */
if (hbhlen < IP6OPT_RTALERT_LEN) {
ip6stat.ip6s_toosmall++;
View
@@ -1,4 +1,4 @@
-/* $KAME: mld6.c,v 1.85 2003/08/15 06:33:36 suz Exp $ */
+/* $KAME: mld6.c,v 1.86 2003/09/09 00:42:54 itojun Exp $ */
/*
* Copyright (c) 2002 INRIA. All rights reserved.
@@ -271,7 +271,7 @@ mld6_init()
/* XXX: grotty hard coding... */
hbh_buf[2] = IP6OPT_PADN; /* 2 byte padding */
hbh_buf[3] = 0;
- hbh_buf[4] = IP6OPT_RTALERT;
+ hbh_buf[4] = IP6OPT_ROUTER_ALERT;
hbh_buf[5] = IP6OPT_RTALERT_LEN - 2;
bcopy((caddr_t)&rtalert_code, &hbh_buf[6], sizeof(u_int16_t));

0 comments on commit 1aff7ad

Please sign in to comment.