Skip to content
GitLab
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
d2551c3b
Commit
d2551c3b
authored
Nov 16, 2012
by
Stephen Morris
Browse files
[2475] Split dhcp files into dhcp and dhcpsrv directories
parent
718e97a5
Changes
48
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
d2551c3b
...
...
@@ -1264,6 +1264,8 @@ AC_CONFIG_FILES([Makefile
src/lib/dns/benchmarks/Makefile
src/lib/dhcp/Makefile
src/lib/dhcp/tests/Makefile
src/lib/dhcpsrv/Makefile
src/lib/dhcpsrv/tests/Makefile
src/lib/exceptions/Makefile
src/lib/exceptions/tests/Makefile
src/lib/datasrc/Makefile
...
...
src/bin/dhcp6/Makefile.am
View file @
d2551c3b
...
...
@@ -64,7 +64,7 @@ b10_dhcp6_LDADD += $(top_builddir)/src/lib/util/libb10-util.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libb10-asiolink.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/log/libb10-log.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libb10-dhcp++.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libb10-dhcpsrv.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/dhcp
srv
/libb10-dhcpsrv.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/config/libb10-cfgclient.la
b10_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/cc/libb10-cc.la
...
...
src/bin/dhcp6/config_parser.cc
View file @
d2551c3b
...
...
@@ -12,27 +12,30 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include
<stdint.h>
#include
<iostream>
#include
<vector>
#include
<map>
#include
<boost/foreach.hpp>
#include
<boost/shared_ptr.hpp>
#include
<boost/scoped_ptr.hpp>
#include
<boost/lexical_cast.hpp>
#include
<boost/algorithm/string.hpp>
#include
<util/encode/hex.h>
#include
<asiolink/io_address.h>
#include
<cc/data.h>
#include
<config/ccsession.h>
#include
<log/logger_support.h>
#include
<dhcp/libdhcp++.h>
#include
<dhcp/triplet.h>
#include
<dhcp/pool.h>
#include
<dhcp/subnet.h>
#include
<dhcp/cfgmgr.h>
#include
<dhcp6/config_parser.h>
#include
<dhcp6/dhcp6_log.h>
#include
<dhcpsrv/cfgmgr.h>
#include
<dhcpsrv/pool.h>
#include
<dhcpsrv/subnet.h>
#include
<dhcpsrv/triplet.h>
#include
<log/logger_support.h>
#include
<util/encode/hex.h>
#include
<boost/algorithm/string.hpp>
#include
<boost/foreach.hpp>
#include
<boost/lexical_cast.hpp>
#include
<boost/scoped_ptr.hpp>
#include
<boost/shared_ptr.hpp>
#include
<iostream>
#include
<map>
#include
<vector>
#include
<stdint.h>
using
namespace
std
;
using
namespace
isc
::
data
;
...
...
src/bin/dhcp6/dhcp6_srv.cc
View file @
d2551c3b
...
...
@@ -14,33 +14,32 @@
#include
<config.h>
#include
<stdlib.h>
#include
<time.h>
#include
<asiolink/io_address.h>
#include
<dhcp6/dhcp6_log.h>
#include
<dhcp6/dhcp6_srv.h>
#include
<dhcp/dhcp6.h>
#include
<dhcp/duid.h>
#include
<dhcp/iface_mgr.h>
#include
<dhcp/libdhcp++.h>
#include
<dhcp/option6_addrlst.h>
#include
<dhcp/option6_iaaddr.h>
#include
<dhcp/option6_ia.h>
#include
<dhcp/option6_iaaddr.h>
#include
<dhcp/option6_iaaddr.h>
#include
<dhcp/option6_int_array.h>
#include
<dhcp/pkt6.h>
#include
<dhcp/subnet.h>
#include
<dhcp/cfgmgr.h>
#include
<dhcp6/dhcp6_log.h>
#include
<dhcp6/dhcp6_srv.h>
#include
<dhcpsrv/cfgmgr.h>
#include
<dhcpsrv/lease_mgr.h>
#include
<dhcpsrv/lease_mgr_factory.h>
#include
<dhcpsrv/subnet.h>
#include
<exceptions/exceptions.h>
#include
<util/io_utilities.h>
#include
<util/range_utilities.h>
#include
<dhcp/duid.h>
#include
<dhcp/lease_mgr.h>
#include
<dhcp/lease_mgr_factory.h>
#include
<dhcp/cfgmgr.h>
#include
<dhcp/option6_iaaddr.h>
#include
<boost/foreach.hpp>
#include
<stdlib.h>
#include
<time.h>
using
namespace
isc
;
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
dhcp
;
...
...
src/bin/dhcp6/dhcp6_srv.h
View file @
d2551c3b
...
...
@@ -17,15 +17,16 @@
#include
<iostream>
#include
<boost/noncopyable.hpp>
#include
<dhcp/alloc_engine.h>
#include
<dhcp/dhcp6.h>
#include
<dhcp/duid.h>
#include
<dhcp/option.h>
#include
<dhcp/option6_ia.h>
#include
<dhcp/option_definition.h>
#include
<dhcp/pkt6.h>
#include
<dhcp/subnet.h>
#include
<dhcpsrv/alloc_engine.h>
#include
<dhcpsrv/subnet.h>
#include
<boost/noncopyable.hpp>
namespace
isc
{
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
d2551c3b
...
...
@@ -65,7 +65,7 @@ dhcp6_unittests_LDADD = $(GTEST_LDADD)
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libb10-asiolink.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/util/libb10-util.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libb10-dhcp++.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libb10-dhcpsrv.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp
srv
/libb10-dhcpsrv.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/log/libb10-log.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libb10-exceptions.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/config/libb10-cfgclient.la
...
...
src/bin/dhcp6/tests/config_parser_unittest.cc
View file @
d2551c3b
...
...
@@ -13,23 +13,24 @@
// PERFORMANCE OF THIS SOFTWARE.
#include
<config.h>
#include
<iostream>
#include
<fstream>
#include
<sstream>
#include
<config/ccsession.h>
#include
<dhcp/libdhcp++.h>
#include
<dhcp/option6_ia.h>
#include
<dhcp6/config_parser.h>
#include
<dhcp6/dhcp6_srv.h>
#include
<dhcpsrv/cfgmgr.h>
#include
<dhcpsrv/subnet.h>
#include
<boost/foreach.hpp>
#include
<fstream>
#include
<iostream>
#include
<sstream>
#include
<arpa/inet.h>
#include
<gtest/gtest.h>
#include
<dhcp6/dhcp6_srv.h>
#include
<dhcp6/config_parser.h>
#include
<config/ccsession.h>
#include
<dhcp/libdhcp++.h>
#include
<dhcp/subnet.h>
#include
<dhcp/cfgmgr.h>
#include
<dhcp/option6_ia.h>
using
namespace
std
;
using
namespace
isc
;
using
namespace
isc
::
dhcp
;
...
...
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
View file @
d2551c3b
...
...
@@ -13,16 +13,18 @@
// PERFORMANCE OF THIS SOFTWARE.
#include
<config.h>
#include
<dhcp/dhcp6.h>
#include
<dhcp6/ctrl_dhcp6_srv.h>
#include
<config/ccsession.h>
#include
<gtest/gtest.h>
#include
<iostream>
#include
<fstream>
#include
<sstream>
#include
<arpa/inet.h>
#include
<gtest/gtest.h>
#include
<dhcp/dhcp6.h>
#include
<dhcp6/ctrl_dhcp6_srv.h>
#include
<config/ccsession.h>
using
namespace
std
;
using
namespace
isc
;
...
...
src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
View file @
d2551c3b
...
...
@@ -14,20 +14,11 @@
#include
<config.h>
#include
<fstream>
#include
<iostream>
#include
<sstream>
#include
<gtest/gtest.h>
#include
<asiolink/io_address.h>
#include
<boost/scoped_ptr.hpp>
#include
<config/ccsession.h>
#include
<dhcp/cfgmgr.h>
#include
<dhcp/dhcp6.h>
#include
<dhcp/duid.h>
#include
<dhcp/lease_mgr.h>
#include
<dhcp/lease_mgr_factory.h>
#include
<dhcp/option.h>
#include
<dhcp/option6_addrlst.h>
#include
<dhcp/option6_ia.h>
...
...
@@ -35,9 +26,18 @@
#include
<dhcp/option6_int_array.h>
#include
<dhcp6/config_parser.h>
#include
<dhcp6/dhcp6_srv.h>
#include
<dhcpsrv/cfgmgr.h>
#include
<dhcpsrv/lease_mgr.h>
#include
<dhcpsrv/lease_mgr_factory.h>
#include
<util/buffer.h>
#include
<util/range_utilities.h>
#include
<gtest/gtest.h>
#include
<fstream>
#include
<iostream>
#include
<sstream>
using
namespace
isc
;
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
config
;
...
...
src/bin/dhcp6/tests/dhcp6_unittests.cc
View file @
d2551c3b
...
...
@@ -12,10 +12,10 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include
<stdio.h>
#include
<gtest/gtest.h>
#include
<log/logger_support.h>
#include
<gtest/gtest.h>
int
main
(
int
argc
,
char
*
argv
[])
{
...
...
src/lib/Makefile.am
View file @
d2551c3b
SUBDIRS
=
exceptions util log cryptolink dns cc config acl xfr bench
\
asiolink asiodns nsas cache resolve testutils datasrc
\
server_common python dhcp statistics
server_common python dhcp
dhcpsrv
statistics
src/lib/dhcp/Makefile.am
View file @
d2551c3b
...
...
@@ -2,10 +2,6 @@ SUBDIRS = . tests
AM_CPPFLAGS
=
-I
$(top_builddir)
/src/lib
-I
$(top_srcdir)
/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
if
HAVE_MYSQL
AM_CPPFLAGS
+=
$(MYSQL_CPPFLAGS)
endif
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
# Some versions of GCC warn about some versions of Boost regarding
...
...
@@ -16,13 +12,14 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
CLEANFILES
=
*
.gcno
*
.gcda
lib_LTLIBRARIES
=
libb10-dhcp++.la
libb10-dhcpsrv.la
lib_LTLIBRARIES
=
libb10-dhcp++.la
libb10_dhcp___la_SOURCES
=
libb10_dhcp___la_SOURCES
+=
libdhcp++.cc libdhcp++
.h
libb10_dhcp___la_SOURCES
+=
duid.cc duid
.h
libb10_dhcp___la_SOURCES
+=
iface_mgr.cc iface_mgr.h
libb10_dhcp___la_SOURCES
+=
iface_mgr_bsd.cc
libb10_dhcp___la_SOURCES
+=
iface_mgr_linux.cc
libb10_dhcp___la_SOURCES
+=
iface_mgr_sun.cc
libb10_dhcp___la_SOURCES
+=
libdhcp++.cc libdhcp++.h
libb10_dhcp___la_SOURCES
+=
option.cc option.h
libb10_dhcp___la_SOURCES
+=
option_data_types.h
libb10_dhcp___la_SOURCES
+=
option_definition.cc option_definition.h
...
...
@@ -42,38 +39,10 @@ libb10_dhcp___la_LIBADD = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
libb10_dhcp___la_LIBADD
+=
$(top_builddir)
/src/lib/util/libb10-util.la
libb10_dhcp___la_LDFLAGS
=
-no-undefined
-version-info
2:0:0
libb10_dhcpsrv_la_SOURCES
=
libb10_dhcpsrv_la_SOURCES
+=
addr_utilities.cc addr_utilities.h
libb10_dhcpsrv_la_SOURCES
+=
alloc_engine.cc alloc_engine.h
libb10_dhcpsrv_la_SOURCES
+=
cfgmgr.cc cfgmgr.h
libb10_dhcpsrv_la_SOURCES
+=
duid.cc duid.h
libb10_dhcpsrv_la_SOURCES
+=
lease_mgr.cc lease_mgr.h
libb10_dhcpsrv_la_SOURCES
+=
lease_mgr_factory.cc lease_mgr_factory.h
libb10_dhcpsrv_la_SOURCES
+=
memfile_lease_mgr.cc memfile_lease_mgr.h
if
HAVE_MYSQL
libb10_dhcpsrv_la_SOURCES
+=
mysql_lease_mgr.cc mysql_lease_mgr.h
endif
libb10_dhcpsrv_la_SOURCES
+=
pool.cc pool.h
libb10_dhcpsrv_la_SOURCES
+=
subnet.cc subnet.h
libb10_dhcpsrv_la_SOURCES
+=
triplet.h
libb10_dhcpsrv_la_CXXFLAGS
=
$(AM_CXXFLAGS)
libb10_dhcpsrv_la_CPPFLAGS
=
$(AM_CPPFLAGS)
$(LOG4CPLUS_INCLUDES)
libb10_dhcpsrv_la_LIBADD
=
$(top_builddir)
/src/lib/asiolink/libb10-asiolink.la
libb10_dhcpsrv_la_LIBADD
+=
$(top_builddir)
/src/lib/util/libb10-util.la
libb10_dhcpsrv_la_LDFLAGS
=
-no-undefined
-version-info
2:0:0
if
HAVE_MYSQL
libb10_dhcpsrv_la_LDFLAGS
+=
$(MYSQL_LIBS)
endif
EXTRA_DIST
=
README database_backends.dox
EXTRA_DIST
=
README
if
USE_CLANGPP
# Disable unused parameter warning caused by some of the
# Boost headers when compiling with clang.
libb10_dhcp___la_CXXFLAGS
+=
-Wno-unused-parameter
endif
# Distribute MySQL schema creation script
EXTRA_DIST
+=
dhcpdb_create.mysql
dist_pkgdata_DATA
=
dhcpdb_create.mysql
src/lib/dhcp/tests/Makefile.am
View file @
d2551c3b
...
...
@@ -24,7 +24,8 @@ TESTS_ENVIRONMENT = \
TESTS
=
if
HAVE_GTEST
TESTS
+=
libdhcp++_unittests libdhcpsrv_unittests
TESTS
+=
libdhcp++_unittests
libdhcp___unittests_SOURCES
=
run_unittests.cc
libdhcp___unittests_SOURCES
+=
iface_mgr_unittest.cc
libdhcp___unittests_SOURCES
+=
libdhcp++_unittest.cc
...
...
@@ -38,48 +39,18 @@ libdhcp___unittests_SOURCES += option_definition_unittest.cc
libdhcp___unittests_SOURCES
+=
option_unittest.cc
libdhcp___unittests_SOURCES
+=
pkt4_unittest.cc
libdhcp___unittests_SOURCES
+=
pkt6_unittest.cc
libdhcp___unittests_SOURCES
+=
schema_copy.h
libdhcp___unittests_SOURCES
+=
duid_unittest.cc
libdhcp___unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
$(LOG4CPLUS_INCLUDES)
libdhcp___unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
libdhcp___unittests_CXXFLAGS
=
$(AM_CXXFLAGS)
libdhcpsrv_unittests_SOURCES
=
run_unittests.cc
libdhcpsrv_unittests_SOURCES
+=
addr_utilities_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
alloc_engine_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
cfgmgr_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
duid_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
lease_mgr_factory_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
lease_mgr_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
memfile_lease_mgr_unittest.cc
if
HAVE_MYSQL
libdhcpsrv_unittests_SOURCES
+=
mysql_lease_mgr_unittest.cc
endif
libdhcpsrv_unittests_SOURCES
+=
pool_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
subnet_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
triplet_unittest.cc
libdhcpsrv_unittests_CPPFLAGS
=
$(AM_CPPFLAGS)
$(GTEST_INCLUDES)
$(LOG4CPLUS_INCLUDES)
libdhcpsrv_unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
libdhcpsrv_unittests_CXXFLAGS
=
$(AM_CXXFLAGS)
libdhcpsrv_unittests_LDADD
=
$(GTEST_LDADD)
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libb10-exceptions.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libb10-asiolink.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libb10-dhcpsrv.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libb10-dhcp++.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/log/libb10-log.la
if
HAVE_MYSQL
libdhcpsrv_unittests_CPPFLAGS
+=
$(MYSQL_CPPFLAGS)
libdhcpsrv_unittests_LDFLAGS
+=
$(MYSQL_LIBS)
endif
libdhcp___unittests_LDFLAGS
=
$(AM_LDFLAGS)
$(GTEST_LDFLAGS)
libdhcp___unittests_CXXFLAGS
=
$(AM_CXXFLAGS)
if
USE_CLANGPP
# This is to workaround unused variables tcout and tcerr in
# log4cplus's streams.h and unused parameters from some of the
# Boost headers.
libdhcp___unittests_CXXFLAGS
+=
-Wno-unused-variable
-Wno-unused-parameter
libdhcpsrv_unittests_CXXFLAGS
+=
-Wno-unused-variable
-Wno-unused-parameter
endif
libdhcp___unittests_LDADD
=
$(top_builddir)
/src/lib/dhcp/libb10-dhcp++.la
...
...
src/lib/dhcpsrv/Makefile.am
0 → 100644
View file @
d2551c3b
SUBDIRS
=
.
tests
AM_CPPFLAGS
=
-I
$(top_builddir)
/src/lib
-I
$(top_srcdir)
/src/lib
AM_CPPFLAGS
+=
$(BOOST_INCLUDES)
if
HAVE_MYSQL
AM_CPPFLAGS
+=
$(MYSQL_CPPFLAGS)
endif
AM_CXXFLAGS
=
$(B10_CXXFLAGS)
# Some versions of GCC warn about some versions of Boost regarding
# missing initializer for members in its posix_time.
# https://svn.boost.org/trac/boost/ticket/3477
# But older GCC compilers don't have the flag.
AM_CXXFLAGS
+=
$(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
CLEANFILES
=
*
.gcno
*
.gcda
lib_LTLIBRARIES
=
libb10-dhcpsrv.la
libb10_dhcpsrv_la_SOURCES
=
libb10_dhcpsrv_la_SOURCES
+=
addr_utilities.cc addr_utilities.h
libb10_dhcpsrv_la_SOURCES
+=
alloc_engine.cc alloc_engine.h
libb10_dhcpsrv_la_SOURCES
+=
cfgmgr.cc cfgmgr.h
libb10_dhcpsrv_la_SOURCES
+=
lease_mgr.cc lease_mgr.h
libb10_dhcpsrv_la_SOURCES
+=
lease_mgr_factory.cc lease_mgr_factory.h
libb10_dhcpsrv_la_SOURCES
+=
memfile_lease_mgr.cc memfile_lease_mgr.h
if
HAVE_MYSQL
libb10_dhcpsrv_la_SOURCES
+=
mysql_lease_mgr.cc mysql_lease_mgr.h
endif
libb10_dhcpsrv_la_SOURCES
+=
pool.cc pool.h
libb10_dhcpsrv_la_SOURCES
+=
subnet.cc subnet.h
libb10_dhcpsrv_la_SOURCES
+=
triplet.h
libb10_dhcpsrv_la_CXXFLAGS
=
$(AM_CXXFLAGS)
libb10_dhcpsrv_la_CPPFLAGS
=
$(AM_CPPFLAGS)
$(LOG4CPLUS_INCLUDES)
libb10_dhcpsrv_la_LIBADD
=
$(top_builddir)
/src/lib/asiolink/libb10-asiolink.la
libb10_dhcpsrv_la_LIBADD
+=
$(top_builddir)
/src/lib/dhcp/libb10-dhcp++.la
libb10_dhcpsrv_la_LIBADD
+=
$(top_builddir)
/src/lib/util/libb10-util.la
libb10_dhcpsrv_la_LDFLAGS
=
-no-undefined
-version-info
2:0:0
if
HAVE_MYSQL
libb10_dhcpsrv_la_LDFLAGS
+=
$(MYSQL_LIBS)
endif
if
USE_CLANGPP
# Disable unused parameter warning caused by some of the
# Boost headers when compiling with clang.
libb10_dhcpsrv_la_CXXFLAGS
+=
-Wno-unused-parameter
endif
# Distribute MySQL schema creation script and backend documentation
EXTRA_DIST
=
dhcpdb_create.mysql database_backends.dox
dist_pkgdata_DATA
=
dhcpdb_create.mysql
src/lib/dhcp/addr_utilities.cc
→
src/lib/dhcp
srv
/addr_utilities.cc
View file @
d2551c3b
...
...
@@ -12,9 +12,10 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include
<
string
.h>
#include
<
dhcpsrv/addr_utilities
.h>
#include
<exceptions/exceptions.h>
#include
<dhcp/addr_utilities.h>
#include
<string.h>
using
namespace
isc
;
using
namespace
isc
::
asiolink
;
...
...
src/lib/dhcp/addr_utilities.h
→
src/lib/dhcp
srv
/addr_utilities.h
View file @
d2551c3b
File moved
src/lib/dhcp/alloc_engine.cc
→
src/lib/dhcp
srv
/alloc_engine.cc
View file @
d2551c3b
...
...
@@ -12,11 +12,11 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include
<alloc_engine.h>
#include
<lease_mgr_factory.h>
#include
<string.h>
#include
<dhcpsrv/alloc_engine.h>
#include
<dhcpsrv/lease_mgr_factory.h>
#include
<cstring>
#include
<string.h>
using
namespace
isc
::
asiolink
;
...
...
src/lib/dhcp/alloc_engine.h
→
src/lib/dhcp
srv
/alloc_engine.h
View file @
d2551c3b
...
...
@@ -15,12 +15,13 @@
#ifndef ALLOC_ENGINE_H
#define ALLOC_ENGINE_H
#include
<asiolink/io_address.h>
#include
<dhcp/duid.h>
#include
<dhcpsrv/subnet.h>
#include
<dhcpsrv/lease_mgr.h>
#include
<boost/shared_ptr.hpp>
#include
<boost/noncopyable.hpp>
#include
<dhcp/duid.h>
#include
<dhcp/subnet.h>
#include
<asiolink/io_address.h>
#include
<dhcp/lease_mgr.h>
namespace
isc
{
namespace
dhcp
{
...
...
src/lib/dhcp/cfgmgr.cc
→
src/lib/dhcp
srv
/cfgmgr.cc
View file @
d2551c3b
...
...
@@ -13,7 +13,7 @@
// PERFORMANCE OF THIS SOFTWARE.
#include
<asiolink/io_address.h>
#include
<dhcp/cfgmgr.h>
#include
<dhcp
srv
/cfgmgr.h>
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
util
;
...
...
src/lib/dhcp/cfgmgr.h
→
src/lib/dhcp
srv
/cfgmgr.h
View file @
d2551c3b
...
...
@@ -15,16 +15,18 @@
#ifndef CFGMGR_H
#define CFGMGR_H
#include
<string>
#include
<map>
#include
<vector>
#include
<boost/shared_ptr.hpp>
#include
<boost/noncopyable.hpp>
#include
<asiolink/io_address.h>
#include
<util/buffer.h>
#include
<dhcp/option.h>
#include
<dhcp/pool.h>
#include
<dhcp/subnet.h>
#include
<dhcpsrv/pool.h>
#include
<dhcpsrv/subnet.h>
#include
<util/buffer.h>
#include
<boost/shared_ptr.hpp>
#include
<boost/noncopyable.hpp>
#include
<map>
#include
<string>
#include
<vector>
namespace
isc
{
namespace
dhcp
{
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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