[2597] Changes after review.

diff --git a/ChangeLog b/ChangeLog
index c9efcb4034662a5c72889725b492604f125634d4..a7a22ea5225a9cd0a8fe126fb6a005d7f6f4d18f 100644 (file)
--- 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 80d448cfbfa3ad1c1296bb42b33a6f6681d6f6ea..20d8597c74bd5f2eb851bee564a6c3fd9d69d1f8 100644 (file)
--- 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 be77de48e33fb914a0e4a006333ac2039158fa47..8d26e0580edfbcc6a6645885bc7b83ae0fa0c4f6 100644 (file)
--- 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 076f98bb89a7e155a40e6c72501ee78ba4eafbe8..4744889f109ebe3a7be2368489389b022dd82676 100644 (file)
--- 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() {