Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
fa342a99
Commit
fa342a99
authored
Jan 17, 2013
by
Tomek Mrugalski
🛰
Browse files
[2597] Changes after review.
parent
32a5e028
Changes
4
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
fa342a99
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
...
...
src/bin/dhcp4/dhcp4_srv.cc
View file @
fa342a99
...
...
@@ -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
);
}
...
...
src/bin/dhcp4/dhcp4_srv.h
View file @
fa342a99
...
...
@@ -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.
...
...
src/lib/dhcpsrv/cfgmgr.cc
View file @
fa342a99
...
...
@@ -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
()
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment