Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
5267d959
Commit
5267d959
authored
Jan 10, 2013
by
Stephen Morris
Browse files
[2559] Move Database Access parser to dhcpsrv
parent
6a47ad41
Changes
8
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp6/Makefile.am
View file @
5267d959
...
...
@@ -46,7 +46,6 @@ pkglibexec_PROGRAMS = b10-dhcp6
b10_dhcp6_SOURCES
=
main.cc
b10_dhcp6_SOURCES
+=
ctrl_dhcp6_srv.cc ctrl_dhcp6_srv.h
b10_dhcp6_SOURCES
+=
dbaccess_parser.cc dbaccess_parser.h
b10_dhcp6_SOURCES
+=
config_parser.cc config_parser.h
b10_dhcp6_SOURCES
+=
dhcp6_log.cc dhcp6_log.h
b10_dhcp6_SOURCES
+=
dhcp6_srv.cc dhcp6_srv.h
...
...
src/bin/dhcp6/config_parser.cc
View file @
5267d959
...
...
@@ -17,9 +17,9 @@
#include <config/ccsession.h>
#include <dhcp/libdhcp++.h>
#include <dhcp6/config_parser.h>
#include <dhcp6/dbaccess_parser.h>
#include <dhcp6/dhcp6_log.h>
#include <dhcpsrv/cfgmgr.h>
#include <dhcpsrv/dbaccess_parser.h>
#include <dhcpsrv/dhcp_config_parser.h>
#include <dhcpsrv/pool.h>
#include <dhcpsrv/subnet.h>
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
5267d959
...
...
@@ -47,10 +47,8 @@ dhcp6_unittests_SOURCES = dhcp6_unittests.cc
dhcp6_unittests_SOURCES
+=
dhcp6_srv_unittest.cc
dhcp6_unittests_SOURCES
+=
ctrl_dhcp6_srv_unittest.cc
dhcp6_unittests_SOURCES
+=
config_parser_unittest.cc
dhcp6_unittests_SOURCES
+=
dbaccess_parser_unittest.cc
dhcp6_unittests_SOURCES
+=
../dhcp6_srv.h ../dhcp6_srv.cc
dhcp6_unittests_SOURCES
+=
../dhcp6_log.h ../dhcp6_log.cc
dhcp6_unittests_SOURCES
+=
../dbaccess_parser.h ../dbaccess_parser.cc
dhcp6_unittests_SOURCES
+=
../ctrl_dhcp6_srv.cc
dhcp6_unittests_SOURCES
+=
../config_parser.cc ../config_parser.h
nodist_dhcp6_unittests_SOURCES
=
../dhcp6_messages.h ../dhcp6_messages.cc
...
...
src/lib/dhcpsrv/Makefile.am
View file @
5267d959
...
...
@@ -33,6 +33,7 @@ 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
+=
dbaccess_parser.cc dbaccess_parser.h
libb10_dhcpsrv_la_SOURCES
+=
dhcpsrv_log.cc dhcpsrv_log.h
libb10_dhcpsrv_la_SOURCES
+=
cfgmgr.cc cfgmgr.h
libb10_dhcpsrv_la_SOURCES
+=
dhcp_config_parser.h
...
...
src/
bin
/dhcp
6
/dbaccess_parser.cc
→
src/
lib
/dhcp
srv
/dbaccess_parser.cc
View file @
5267d959
...
...
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#include <dhcp
6
/dbaccess_parser.h>
#include <dhcp
srv
/dbaccess_parser.h>
#include <boost/foreach.hpp>
...
...
@@ -34,7 +34,6 @@ typedef pair<string, string> StringPair;
// Parse the configuration and check that the various keywords are consistent.
void
DbAccessParser
::
build
(
isc
::
data
::
ConstElementPtr
config_value
)
{
const
ConfigPairMap
&
config_map
=
config_value
->
mapValue
();
// To cope with incremental updates, the strategy is:
// 1. Take a copy of the stored keyword/value pairs.
...
...
src/
bin
/dhcp
6
/dbaccess_parser.h
→
src/
lib
/dhcp
srv
/dbaccess_parser.h
View file @
5267d959
File moved
src/lib/dhcpsrv/tests/Makefile.am
View file @
5267d959
...
...
@@ -30,6 +30,7 @@ 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
+=
dbaccess_parser_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
hwaddr_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
lease_mgr_factory_unittest.cc
libdhcpsrv_unittests_SOURCES
+=
lease_mgr_unittest.cc
...
...
@@ -64,6 +65,8 @@ endif
libdhcpsrv_unittests_LDADD
=
$(top_builddir)
/src/lib/dhcpsrv/libb10-dhcpsrv.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libb10-dhcp++.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/config/libb10-cfgclient.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libb10-cc.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libb10-asiolink.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/exceptions/libb10-exceptions.la
libdhcpsrv_unittests_LDADD
+=
$(top_builddir)
/src/lib/log/libb10-log.la
...
...
src/
bin
/dhcp
6
/tests/dbaccess_parser_unittest.cc
→
src/
lib
/dhcp
srv
/tests/dbaccess_parser_unittest.cc
View file @
5267d959
...
...
@@ -14,7 +14,7 @@
#include <config.h>
#include <dhcp
6
/dbaccess_parser.h>
#include <dhcp
srv
/dbaccess_parser.h>
#include <dhcpsrv/lease_mgr_factory.h>
#include <config/ccsession.h>
#include <gtest/gtest.h>
...
...
Write
Preview
Markdown
is supported
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