svn commit: r231818 - stable/8/sys/netinet

[Hiroki Sato]

Author: hrs
Date: Thu Feb 16 06:11:00 2012
New Revision: 231818
URL: http://svn.freebsd.org/changeset/base/231818

Log:
  MFC r222732:
  
  Add ND_OPT_{RDNSS,DNSSL} for Router Advertisement option in RFC 6016.
  
  Approved by:	re (implicit)

Modified:
  stable/8/sys/netinet/icmp6.h
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/netinet/icmp6.h
==============================================================================
--- stable/8/sys/netinet/icmp6.h	Thu Feb 16 05:17:06 2012	(r231817)
+++ stable/8/sys/netinet/icmp6.h	Thu Feb 16 06:11:00 2012	(r231818)
@@ -297,8 +297,9 @@ struct nd_opt_hdr {		/* Neighbor discove
 #define ND_OPT_PREFIX_INFORMATION	3
 #define ND_OPT_REDIRECTED_HEADER	4
 #define ND_OPT_MTU			5
-
-#define ND_OPT_ROUTE_INFO		200	/* draft-ietf-ipngwg-router-preference, not officially assigned yet */
+#define ND_OPT_ROUTE_INFO		24	/* RFC 4191 */
+#define ND_OPT_RDNSS			25	/* RFC 6016 */
+#define ND_OPT_DNSSL			31	/* RFC 6016 */
 
 struct nd_opt_prefix_info {	/* prefix information */
 	u_int8_t	nd_opt_pi_type;
@@ -338,6 +339,22 @@ struct nd_opt_route_info {	/* route info
 	/* prefix follows */
 } __packed;
 
+struct nd_opt_rdnss {		/* RDNSS option (RFC 6106) */
+	u_int8_t	nd_opt_rdnss_type;
+	u_int8_t	nd_opt_rdnss_len;
+	u_int16_t	nd_opt_rdnss_reserved;
+	u_int32_t	nd_opt_rdnss_lifetime;
+	/* followed by list of recursive DNS servers */
+} __packed;
+
+struct nd_opt_dnssl {		/* DNSSL option (RFC 6106) */
+	u_int8_t	nd_opt_dnssl_type;
+	u_int8_t	nd_opt_dnssl_len;
+	u_int16_t	nd_opt_dnssl_reserved;
+	u_int32_t	nd_opt_dnssl_lifetime;
+	/* followed by list of DNS search domains */
+} __packed;
+
 /*
  * icmp6 namelookup
  */