BIND 10 trac2597, updated. fa342a994de5dbefe32996be7eebe58f6304cff7 [2597] Changes after review.

[BIND 10 source code commits]

The branch, trac2597 has been updated
       via  fa342a994de5dbefe32996be7eebe58f6304cff7 (commit)
      from  32a5e02895ad3faf098172a08c11ce4df535521e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fa342a994de5dbefe32996be7eebe58f6304cff7
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Thu Jan 17 12:50:14 2013 +0100

    [2597] Changes after review.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                  |    9 +++++----
 src/bin/dhcp4/dhcp4_srv.cc |    2 +-
 src/bin/dhcp4/dhcp4_srv.h  |    4 ++--
 src/lib/dhcpsrv/cfgmgr.cc  |    4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index c9efcb4..a7a22ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,9 @@
 5XX.	[func]		tomek
-	b10-dhcp4: Server identifier is now generated automatically and
-	stored to a file. It is also read during server start.
-	b10-dhcp6: Server identifier is now stores to a file and read
-	during server start.
+	b10-dhcp4: The DHCPv4 server now generates a server identifier
+	the first time it is run. The identifier is preserved in a file
+	across server restarts.
+	b10-dhcp6: The server identifier is now preserved in a file across
+	server restarts.
 	(Trac #2597, git TBD)
 
 545.	[func]		jinmei
diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 80d448c..20d8597 100644
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -218,7 +218,7 @@ bool Dhcpv4Srv::loadServerID(const std::string& file_name) {
     try {
         IOAddress addr(hex_string);
 
-        if (addr.getFamily() != AF_INET) {
+        if (!addr.isV4()) {
             return (false);
         }
 
diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index be77de4..8d26e05 100644
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -30,8 +30,8 @@ namespace dhcp {
 
 /// @brief file name of a server-id file
 ///
-/// Server must store its duid in persistent storage that must not change
-/// between restarts. This is name of the file that is created in dataDir
+/// Server must store its server identifier in persistent storage that must not
+/// change between restarts. This is name of the file that is created in dataDir
 /// (see isc::dhcp::CfgMgr::getDataDir()). It is a text file that uses
 /// regular IPv4 address, e.g. 192.0.2.1. Server will create it during
 /// first run and then use it afterwards.
diff --git a/src/lib/dhcpsrv/cfgmgr.cc b/src/lib/dhcpsrv/cfgmgr.cc
index 076f98b..4744889 100644
--- a/src/lib/dhcpsrv/cfgmgr.cc
+++ b/src/lib/dhcpsrv/cfgmgr.cc
@@ -249,7 +249,9 @@ std::string CfgMgr::getDataDir() {
 
 CfgMgr::CfgMgr()
     :datadir_(DHCP_DATA_DIR) {
-    // DHCP_DATA_DIR is set with -DDHCP_DATA_DIR in Makefile.am
+    // DHCP_DATA_DIR must be set set with -DDHCP_DATA_DIR="..." in Makefile.am
+    // Note: the definition of DHCP_DATA_DIR needs to include quotation marks
+    // See AM_CPPFLAGS definition in Makefile.am
 }
 
 CfgMgr::~CfgMgr() {