changed the word '2292bis' to 'RFC3542' when appropriate.

kame/kame/libinet6/ip6opt.c

@@ -1,4 +1,4 @@
-/*	$KAME: ip6opt.c,v 1.17 2005/01/13 04:01:10 itojun Exp $	*/
+/*	$KAME: ip6opt.c,v 1.18 2005/06/15 07:11:35 keiichi Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -390,8 +390,8 @@ inet6_insert_padopt(u_char *p, int len)
 }
 
 /*
- * The following functions are defined in a successor of RFC2292, aka
- * rfc2292bis.
+ * The following functions are defined in RFC3542, which is a successor
+ * of RFC2292.
  */
 
 int

kame/sys/netinet/icmp6.h

@@ -1,4 +1,4 @@
-/*	$KAME: icmp6.h,v 1.97 2005/04/01 07:31:01 suz Exp $	*/
+/*	$KAME: icmp6.h,v 1.98 2005/06/15 07:11:36 keiichi Exp $	*/
 
 /*
  * Copyright (c) 2002 INRIA. All rights reserved.
@@ -487,8 +487,8 @@ struct nd_opt_hdr {		/* Neighbor discovery option header */
 #define ND_OPT_PREFIX_INFORMATION	3
 #define ND_OPT_REDIRECTED_HEADER	4
 #define ND_OPT_MTU			5
-#define ND_OPT_ADV_INTERVAL		7	/* 2292bis-02 */
-#define ND_OPT_HA_INFORMATION		8	/* 2292bis-02 */
+#define ND_OPT_ADV_INTERVAL		7	/* RFC3775 */
+#define ND_OPT_HA_INFORMATION		8	/* RFC3775 */
 #define ND_OPT_SOURCE_ADDRLIST		9	/* will be renamed */
 #define ND_OPT_TARGET_ADDRLIST		10	/* will be renamed */
 
@@ -507,7 +507,7 @@ struct nd_opt_prefix_info {	/* prefix information */
 
 #define ND_OPT_PI_FLAG_ONLINK		0x80
 #define ND_OPT_PI_FLAG_AUTO		0x40
-#define ND_OPT_PI_FLAG_ROUTER		0x20	/* 2292bis-02 */
+#define ND_OPT_PI_FLAG_ROUTER		0x20	/* RFC3775 */
 
 struct nd_opt_rd_hdr {		/* redirected header */
 	u_int8_t	nd_opt_rh_type;

kame/sys/netinet6/dest6.c

@@ -1,4 +1,4 @@
-/*	$KAME: dest6.c,v 1.70 2005/06/09 02:16:10 keiichi Exp $	*/
+/*	$KAME: dest6.c,v 1.71 2005/06/15 07:11:36 keiichi Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -223,7 +223,7 @@ dest6_swap_hao(ip6, ip6a, haopt)
 		return (EINVAL);
 
 	/* XXX should we do this at all?  do it now or later? */
-	/* XXX interaction with 2292bis IPV6_RECVDSTOPT */
+	/* XXX interaction with RFC3542 IPV6_RECVDSTOPT */
 	/* XXX interaction with ipsec - should be okay */
 	/* XXX icmp6 responses is modified - which is bad */
 	bcopy(&ip6->ip6_src, &ip6a->ip6a_coa, sizeof(ip6a->ip6a_coa));

kame/sys/netinet6/in6.h

@@ -1,4 +1,4 @@
-/*	$KAME: in6.h,v 1.159 2005/03/19 07:28:59 suz Exp $	*/
+/*	$KAME: in6.h,v 1.160 2005/06/15 07:11:36 keiichi Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -458,7 +458,7 @@ struct route_in6 {
 #define IPV6_FW_GET		34 /* get entire firewall rule chain */
 #endif
 
-/* new socket options introduced in RFC2292bis */
+/* new socket options introduced in RFC3542 */
 #define IPV6_RTHDRDSTOPTS	35 /* ip6_dest; send dst option before rthdr */
 
 #define IPV6_RECVPKTINFO	36 /* bool; recv if, dst addr */
@@ -480,7 +480,7 @@ struct route_in6 {
 				      (cmsg only/not in of RFC3542) */
 #endif
 
-/* more new socket options introduced in RFC2292bis */
+/* more new socket options introduced in RFC3542 */
 #define IPV6_PKTINFO		46 /* in6_pktinfo; send if, src addr */
 #define IPV6_HOPLIMIT		47 /* int; send hop limit */
 #define IPV6_NEXTHOP		48 /* sockaddr; next hop addr */
@@ -489,7 +489,7 @@ struct route_in6 {
 #define IPV6_RTHDR		51 /* ip6_rthdr; send routing header */
 #if 0
 #define IPV6_PKTOPTIONS		52 /* buf/cmsghdr; set/get IPv6 options */
-				   /* obsoleted by 2292bis */
+				   /* obsoleted by RFC3542 */
 #endif
 
 #ifdef __OpenBSD__

kame/sys/netinet6/ip6_input.c

@@ -1,4 +1,4 @@
-/*	$KAME: ip6_input.c,v 1.360 2005/05/02 10:03:17 suz Exp $	*/
+/*	$KAME: ip6_input.c,v 1.361 2005/06/15 07:11:36 keiichi Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -1497,7 +1497,7 @@ ip6_savecontrol(in6p, m, mp)
 			 * jumbo payload option is included, the option which
 			 * is to be removed before returning according to
 			 * RFC2292.
-			 * Note: this constraint is removed in 2292bis.
+			 * Note: this constraint is removed in RFC3542.
 			 */
 			*mp = sbcreatecontrol((caddr_t)hbh, hbhlen,
 			    IS2292(IPV6_2292HOPOPTS, IPV6_HOPOPTS),

kame/sys/netinet6/ip6_output.c

@@ -1,4 +1,4 @@
-/*	$KAME: ip6_output.c,v 1.468 2005/04/14 06:22:41 suz Exp $	*/
+/*	$KAME: ip6_output.c,v 1.469 2005/06/15 07:11:36 keiichi Exp $	*/
 
 /*
  * Copyright (c) 2002 INRIA. All rights reserved.
@@ -2216,7 +2216,7 @@ do { \
 					/*
 					 * We ignore this option for TCP
 					 * sockets.
-					 * (rfc2292bis leaves this case
+					 * (RFC3542 leaves this case
 					 * unspecified.)
 					 */
 					if (uproto != IPPROTO_TCP)
@@ -2374,7 +2374,7 @@ do { \
 			case IPV6_RTHDRDSTOPTS:
 			case IPV6_NEXTHOP:
 			{
-				/* new advanced API (2292bis) */
+				/* new advanced API (RFC3542) */
 				u_char *optbuf;
 #ifdef __FreeBSD__
 				u_char optbuf_storage[MCLBYTES];
@@ -3093,9 +3093,9 @@ ip6_raw_ctloutput(op, so, level, optname, mp)
 		 * For ICMPv6 sockets, no modification allowed for checksum
 		 * offset, permit "no change" values to help existing apps.
 		 *
-		 * XXX 2292bis says: "An attempt to set IPV6_CHECKSUM
+		 * RFC3542 says: "An attempt to set IPV6_CHECKSUM
 		 * for an ICMPv6 socket will fail."
-		 * The current behavior does not meet 2292bis.
+		 * The current behavior does not meet RFC3542.
 		 */
 		switch (op) {
 #ifdef __FreeBSD__
@@ -4397,8 +4397,8 @@ ip6_setpktopts(control, opt, stickyopt, priv, uproto)
  * item.  "len" can be 0 only when it's a sticky option.
  * We have 4 cases of combination of "sticky" and "cmsg":
  * "sticky=0, cmsg=0": impossible
- * "sticky=0, cmsg=1": RFC2292 or rfc2292bis ancillary data
- * "sticky=1, cmsg=0": rfc2292bis socket option
+ * "sticky=0, cmsg=1": RFC2292 or RFC3542 ancillary data
+ * "sticky=1, cmsg=0": RFC3542 socket option
  * "sticky=1, cmsg=1": RFC2292 socket option
  */
 static int
@@ -4418,8 +4418,8 @@ ip6_setpktopt(optname, buf, len, opt, priv, sticky, cmsg, uproto)
 
 	/*
 	 * IPV6_2292xxx is for backward compatibility to RFC2292, and should
-	 * not be specified in the context of rfc2292bis.  Conversely,
-	 * rfc2292bis types should not be specified in the context of RFC2292.
+	 * not be specified in the context of RFC3542.  Conversely,
+	 * RFC3542 types should not be specified in the context of RFC2292.
 	 */
 	if (!cmsg) {
 		switch (optname) {
@@ -4446,7 +4446,7 @@ ip6_setpktopt(optname, buf, len, opt, priv, sticky, cmsg, uproto)
 		case IPV6_DONTFRAG:
 		case IPV6_OTCLASS:
 		case IPV6_TCLASS:
-		case IPV6_PREFER_TEMPADDR: /* XXX: not an rfc2292bis option */
+		case IPV6_PREFER_TEMPADDR: /* XXX: not an RFC3542 option */
 			return (ENOPROTOOPT);
 		}
 	}
@@ -4682,7 +4682,7 @@ ip6_setpktopt(optname, buf, len, opt, priv, sticky, cmsg, uproto)
 			 * part of the destination options header must appear
 			 * before the routing header in the ancillary data,
 			 * too.
-			 * RFC2292bis solved the ambiguity by introducing
+			 * RFC3542 solved the ambiguity by introducing
 			 * separate ancillary data or option types.
 			 */
 			if (opt->ip6po_rthdr == NULL)
@@ -4800,7 +4800,7 @@ ip6_setpktopt(optname, buf, len, opt, priv, sticky, cmsg, uproto)
 		if (uproto == IPPROTO_TCP || *(int *)buf == 0) {
 			/*
 			 * we ignore this option for TCP sockets.
-			 * (rfc2292bis leaves this case unspecified.)
+			 * (RFC3542 leaves this case unspecified.)
 			 */
 			opt->ip6po_flags &= ~IP6PO_DONTFRAG;
 		} else