Commit fa342a99 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

[2597] Changes after review.

parent 32a5e028
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
......
......@@ -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);
}
......
......@@ -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.
......
......@@ -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() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment