summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/netinet/icmp6.h4
-rw-r--r--sys/netinet/ip6.h6
-rw-r--r--sys/netinet6/in6.h6
-rw-r--r--sys/netinet6/ip6_input.c2
-rw-r--r--sys/netinet6/ip6_mroute.h2
-rw-r--r--sys/netinet6/ip6_output.c22
6 files changed, 21 insertions, 21 deletions
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 346aef7..7fabdd3 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -111,9 +111,9 @@ struct icmp6_hdr {
#endif
#define ND_ROUTER_SOLICIT 133 /* router solicitation */
-#define ND_ROUTER_ADVERT 134 /* router advertisment */
+#define ND_ROUTER_ADVERT 134 /* router advertisement */
#define ND_NEIGHBOR_SOLICIT 135 /* neighbor solicitation */
-#define ND_NEIGHBOR_ADVERT 136 /* neighbor advertisment */
+#define ND_NEIGHBOR_ADVERT 136 /* neighbor advertisement */
#define ND_REDIRECT 137 /* redirect */
#define ICMP6_ROUTER_RENUMBERING 138 /* router renumbering */
diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 8b660f0..23a2be1 100644
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -142,7 +142,7 @@ struct ip6_dest {
#ifndef _KERNEL
#define IP6OPT_RTALERT 0x05 /* 00 0 00101 (KAME definition) */
#endif
-#define IP6OPT_ROUTER_ALERT 0x05 /* 00 0 00101 (2292bis, recommended) */
+#define IP6OPT_ROUTER_ALERT 0x05 /* 00 0 00101 (RFC3542, recommended) */
#define IP6OPT_RTALERT_LEN 4
#define IP6OPT_RTALERT_MLD 0 /* Datagram contains an MLD message */
@@ -202,10 +202,10 @@ struct ip6_frag {
/*
* Internet implementation parameters.
*/
-#define IPV6_MAXHLIM 255 /* maximun hoplimit */
+#define IPV6_MAXHLIM 255 /* maximum hoplimit */
#define IPV6_DEFHLIM 64 /* default hlim */
#define IPV6_FRAGTTL 120 /* ttl for fragment packets, in slowtimo tick */
-#define IPV6_HLIMDEC 1 /* subtracted when forwaeding */
+#define IPV6_HLIMDEC 1 /* subtracted when forwarding */
#define IPV6_MMTU 1280 /* minimal MTU and reassembly. 1024 + 256 */
#define IPV6_MAXPACKET 65535 /* ip6 max packet size without Jumbo payload*/
diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h
index 62196c6..d0ebdae 100644
--- a/sys/netinet6/in6.h
+++ b/sys/netinet6/in6.h
@@ -450,7 +450,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 */
@@ -472,7 +472,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 */
@@ -481,7 +481,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
#define IPV6_RECVTCLASS 57 /* bool; recv traffic class values */
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index c20dcb5..d23a447 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1213,7 +1213,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),
diff --git a/sys/netinet6/ip6_mroute.h b/sys/netinet6/ip6_mroute.h
index 17f4a5d..26ac008 100644
--- a/sys/netinet6/ip6_mroute.h
+++ b/sys/netinet6/ip6_mroute.h
@@ -166,7 +166,7 @@ struct omrt6msg {
* like igmpmsg{} used for IPv4 implementation). This is because this
* structure will be passed via an IPv6 raw socket, on which an application
* will only receive the payload i.e. the data after the IPv6 header and all
- * the extension headers. (see Section 3 of draft-ietf-ipngwg-2292bis-01)
+ * the extension headers. (see Section 3 of RFC3542)
*/
struct mrt6msg {
#define MRT6MSG_NOCACHE 1
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 1d8459b..110d203 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1701,7 +1701,7 @@ do { \
/*
* We ignore this option for TCP
* sockets.
- * (rfc2292bis leaves this case
+ * (RFC3542 leaves this case
* unspecified.)
*/
if (uproto != IPPROTO_TCP)
@@ -1810,7 +1810,7 @@ do { \
case IPV6_RTHDRDSTOPTS:
case IPV6_NEXTHOP:
{
- /* new advanced API (2292bis) */
+ /* new advanced API (RFC3542) */
u_char *optbuf;
int optlen;
struct ip6_pktopts **optp;
@@ -2269,9 +2269,9 @@ ip6_raw_ctloutput(so, sopt)
* 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) {
case SOPT_SET:
@@ -3060,8 +3060,8 @@ ip6_setpktoptions(control, opt, stickyopt, priv, needcopy, 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
@@ -3081,8 +3081,8 @@ ip6_setpktoption(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) {
@@ -3108,7 +3108,7 @@ ip6_setpktoption(optname, buf, len, opt, priv, sticky, cmsg, uproto)
case IPV6_USE_MIN_MTU:
case IPV6_DONTFRAG:
case IPV6_TCLASS:
- case IPV6_PREFER_TEMPADDR: /* XXX: not an rfc2292bis option */
+ case IPV6_PREFER_TEMPADDR: /* XXX: not an RFC3542 option */
return (ENOPROTOOPT);
}
}
@@ -3339,7 +3339,7 @@ ip6_setpktoption(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)
@@ -3428,7 +3428,7 @@ ip6_setpktoption(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
OpenPOWER on IntegriCloud