- updated the list of the supported RFCs

- NTP option number has been already assigned by IANA
- added other official option numbers for future implementors

4 files changed, 55 insertions, 19 deletions

diff --git a/README b/README
index 53e7884..a0d4fcf 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 $KAME: README,v 1.3 2005/01/12 06:06:10 suz Exp $
 
-kame-dhcp6
+WIDE-DHCPv6
 
-	kame-dhcp6 is an open-source implementation of Dynamic Host
+	WIDE-DHCPv6 is an open-source implementation of Dynamic Host
 	Configuration Protocol for IPv6 (DHCPv6) developed by the KAME
 	project.
 
@@ -15,6 +15,10 @@ kame-dhcp6
 	           Protocol (DHCP)
 	- RFC3646: DNS Configuration options for Dynamic Host
 	           Configuration Protocol for IPv6 (DHCPv6)
+	- RFC4075: Simple Network Time Protocol (SNTP) Configuration
+	           Option for DHCPv6
+	- RFC4242: Information Refresh Time Option for Dynamic Host
+	           Configuration Protocol for IPv6 (DHCPv6)
 
 	All the components of the main protocol are provided, i.e.,
 	DHCPv6 clients, servers, and relay agents.
diff --git a/configure b/configure
index 081b3c0..5b4e7bf 100755
--- a/configure
+++ b/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP YACC LEX LEXLIB LEX_OUTPUT_ROOT EGREP LIBOBJS localdbdir DHCPOPT_DNS DH6OPT_DNSNAME DH6OPT_IA_PD DH6OPT_IA_PD_PREFIX DH6OPT_REFRESHTIME dhcpopt_ntp LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP YACC LEX LEXLIB LEX_OUTPUT_ROOT EGREP LIBOBJS localdbdir DHCPOPT_DNS DH6OPT_DNSNAME DH6OPT_IA_PD DH6OPT_IA_PD_PREFIX DH6OPT_REFRESHTIME DH6OPT_NTP LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -5408,13 +5408,14 @@ if test "${with_opt_ntp+set}" = set; then
 else
   dhcpopt_ntp=0
 fi;
-if test $dhcpopt_ntp = 0 ; then
-	dhcpopt_ntp=-1
-	echo "$as_me:$LINENO: result: unspecified" >&5
-echo "${ECHO_T}unspecified" >&6
-else
+if test $dhcpopt_ntp != 0 ; then
 	echo "$as_me:$LINENO: result: using $dhcpopt_ntp" >&5
 echo "${ECHO_T}using $dhcpopt_ntp" >&6
+	DH6OPT_NTP="-DDH6OPT_NTP=$dhcpopt_ntp"
+
+else
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
 
@@ -6229,7 +6230,7 @@ s,@DH6OPT_DNSNAME@,$DH6OPT_DNSNAME,;t t
 s,@DH6OPT_IA_PD@,$DH6OPT_IA_PD,;t t
 s,@DH6OPT_IA_PD_PREFIX@,$DH6OPT_IA_PD_PREFIX,;t t
 s,@DH6OPT_REFRESHTIME@,$DH6OPT_REFRESHTIME,;t t
-s,@dhcpopt_ntp@,$dhcpopt_ntp,;t t
+s,@DH6OPT_NTP@,$DH6OPT_NTP,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
diff --git a/configure.in b/configure.in
index 5e8775b..edf4f0e 100644
--- a/configure.in
+++ b/configure.in
@@ -207,18 +207,20 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-dnl DHCP option type values not officially defined
 AC_MSG_CHECKING(for DHCP NTP option)
 AC_ARG_WITH(opt-ntp,
 [  --with-opt-ntp=VALUE    specify DHCP option value for NTP],
     dhcpopt_ntp="$withval", dhcpopt_ntp=0)
-if test $dhcpopt_ntp = 0 ; then
-	dhcpopt_ntp=-1
-	AC_MSG_RESULT(unspecified)
-else
+if test $dhcpopt_ntp != 0 ; then
 	AC_MSG_RESULT(using $dhcpopt_ntp)
+	DH6OPT_NTP="-DDH6OPT_NTP=$dhcpopt_ntp"
+	AC_SUBST(DH6OPT_NTP)
+else
+	AC_MSG_RESULT(no)
 fi
-AC_SUBST(dhcpopt_ntp)
+
+dnl DHCP option type values not officially defined
+dnl (no such option now)
 
 AC_CHECK_HEADERS(stdarg.h)
 
diff --git a/dhcp6.h b/dhcp6.h
index 1c4a492..b868bab 100644
--- a/dhcp6.h
+++ b/dhcp6.h
@@ -286,16 +286,45 @@ struct dhcp6_relay {
 #ifndef DH6OPT_IA_PD_PREFIX
 #define DH6OPT_IA_PD_PREFIX 26
 #endif
+#ifndef DH6OPT_NIS_SERVERS
+#define DH6OPT_NIS_SERVERS 27
+#endif
+#ifndef DH6OPT_NISP_SERVERS
+#define DH6OPT_NISP_SERVERS 28
+#endif
+#ifndef DH6OPT_NIS_DOMAIN_NAME
+#define DH6OPT_NIS_DOMAIN_NAME 29
+#endif
+#ifndef DH6OPT_NISP_DOMAIN_NAME
+#define DH6OPT_NISP_DOMAIN_NAME 30
+#endif
+#ifndef DH6OPT_NTP
+#define DH6OPT_NTP 31
+#endif
 #ifndef DH6OPT_REFRESHTIME
 #define DH6OPT_REFRESHTIME 32
  #define DH6OPT_REFRESHTIME_UNDEF -1
 #endif
+#ifndef DH6OPT_BCMCS_SERVER_D
+#define DH6OPT_BCMCS_SERVER_D 33
+#endif
+#ifndef DH6OPT_BCMCS_SERVER_A
+#define DH6OPT_BCMCS_SERVER_A 34
+#endif
+#ifndef DH6OPT_GEOCONF_CIVIC
+#define DH6OPT_GEOCONF_CIVIC 36
+#endif
+#ifndef DH6OPT_REMOTE_ID
+#define DH6OPT_REMOTE_ID 37
+#endif
+#ifndef DH6OPT_SUBSCRIBER_ID
+#define DH6OPT_SUBSCRIBER_ID 38
+#endif
+#ifndef DH6OPT_CLIENT_FQDN
+#define DH6OPT_CLIENT_FQDN 39
+#endif
 
 /* The followings are KAME specific. */
-#if CONF_DH6OPT_NTP > 0
-#define USE_DH6OPT_NTP
-#endif
-#define DH6OPT_NTP CONF_DH6OPT_NTP
 
 struct dhcp6opt {
 	u_int16_t dh6opt_type;