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
ISC Open Source Projects
Kea
Commits
5e0bc0d7
Commit
5e0bc0d7
authored
Jul 25, 2017
by
Marcin Siodelski
Committed by
Tomek Mrugalski
Aug 15, 2017
Browse files
[5315] Moved DHCPv4 and DHCPv6 simple parsers to libdhcpsrv.
parent
0a61518a
Changes
13
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/Makefile.am
View file @
5e0bc0d7
...
...
@@ -66,7 +66,6 @@ libdhcp4_la_SOURCES += dhcp4to6_ipc.cc dhcp4to6_ipc.h
libdhcp4_la_SOURCES
+=
dhcp4_lexer.ll location.hh position.hh stack.hh
libdhcp4_la_SOURCES
+=
dhcp4_parser.cc dhcp4_parser.h
libdhcp4_la_SOURCES
+=
parser_context.cc parser_context.h parser_context_decl.h
libdhcp4_la_SOURCES
+=
simple_parser4.cc simple_parser4.h
nodist_libdhcp4_la_SOURCES
=
dhcp4_messages.h dhcp4_messages.cc
EXTRA_DIST
+=
dhcp4_messages.mes
...
...
src/bin/dhcp4/json_config_parser.cc
View file @
5e0bc0d7
...
...
@@ -8,7 +8,6 @@
#include
<cc/command_interpreter.h>
#include
<dhcp4/dhcp4_log.h>
#include
<dhcp4/simple_parser4.h>
#include
<dhcp/libdhcp++.h>
#include
<dhcp/option_definition.h>
#include
<dhcpsrv/cfg_option.h>
...
...
@@ -22,6 +21,7 @@
#include
<dhcpsrv/parsers/host_reservations_list_parser.h>
#include
<dhcpsrv/parsers/ifaces_config_parser.h>
#include
<dhcpsrv/parsers/option_data_parser.h>
#include
<dhcpsrv/parsers/simple_parser4.h>
#include
<dhcpsrv/timer_mgr.h>
#include
<hooks/hooks_parser.h>
#include
<config/command_mgr.h>
...
...
src/bin/dhcp4/tests/get_config_unittest.cc
View file @
5e0bc0d7
...
...
@@ -12,11 +12,11 @@
#include
<cc/cfg_to_element.h>
#include
<dhcp/tests/iface_mgr_test_config.h>
#include
<dhcpsrv/cfgmgr.h>
#include
<dhcpsrv/parsers/simple_parser4.h>
#include
<dhcp4/tests/dhcp4_test_utils.h>
#include
<dhcp4/tests/get_config_unittest.h>
#include
<dhcp4/dhcp4_srv.h>
#include
<dhcp4/json_config_parser.h>
#include
<dhcp4/simple_parser4.h>
#include
<boost/algorithm/string.hpp>
#include
<gtest/gtest.h>
...
...
src/bin/dhcp4/tests/simple_parser4_unittest.cc
View file @
5e0bc0d7
...
...
@@ -6,7 +6,7 @@
#include
<config.h>
#include
<gtest/gtest.h>
#include
<dhcp
4
/simple_parser4.h>
#include
<dhcp
srv/parsers
/simple_parser4.h>
#include
<dhcp4/tests/dhcp4_test_utils.h>
#include
<cc/data.h>
...
...
src/bin/dhcp6/Makefile.am
View file @
5e0bc0d7
...
...
@@ -67,8 +67,6 @@ libdhcp6_la_SOURCES += dhcp6to4_ipc.cc dhcp6to4_ipc.h
libdhcp6_la_SOURCES
+=
dhcp6_lexer.ll location.hh position.hh stack.hh
libdhcp6_la_SOURCES
+=
dhcp6_parser.cc dhcp6_parser.h
libdhcp6_la_SOURCES
+=
parser_context.cc parser_context.h parser_context_decl.h
libdhcp6_la_SOURCES
+=
simple_parser6.cc simple_parser6.h
nodist_libdhcp6_la_SOURCES
=
dhcp6_messages.h dhcp6_messages.cc
EXTRA_DIST
+=
dhcp6_messages.mes
...
...
src/bin/dhcp6/json_config_parser.cc
View file @
5e0bc0d7
...
...
@@ -13,7 +13,6 @@
#include
<dhcp/libdhcp++.h>
#include
<dhcp6/json_config_parser.h>
#include
<dhcp6/dhcp6_log.h>
#include
<dhcp6/simple_parser6.h>
#include
<dhcp/iface_mgr.h>
#include
<dhcpsrv/cfg_option.h>
#include
<dhcpsrv/cfgmgr.h>
...
...
@@ -31,6 +30,7 @@
#include
<dhcpsrv/parsers/host_reservations_list_parser.h>
#include
<dhcpsrv/parsers/ifaces_config_parser.h>
#include
<dhcpsrv/parsers/option_data_parser.h>
#include
<dhcpsrv/parsers/simple_parser6.h>
#include
<hooks/hooks_parser.h>
#include
<log/logger_support.h>
#include
<util/encode/hex.h>
...
...
src/bin/dhcp6/tests/get_config_unittest.cc
View file @
5e0bc0d7
...
...
@@ -11,12 +11,12 @@
#include
<cc/simple_parser.h>
#include
<cc/cfg_to_element.h>
#include
<dhcp/tests/iface_mgr_test_config.h>
#include
<dhcpsrv/parsers/simple_parser6.h>
#include
<dhcpsrv/cfgmgr.h>
#include
<dhcp6/tests/dhcp6_test_utils.h>
#include
<dhcp6/tests/get_config_unittest.h>
#include
<dhcp6/dhcp6_srv.h>
#include
<dhcp6/json_config_parser.h>
#include
<dhcp6/simple_parser6.h>
#include
<boost/algorithm/string.hpp>
#include
<gtest/gtest.h>
...
...
src/bin/dhcp6/tests/simple_parser6_unittest.cc
View file @
5e0bc0d7
...
...
@@ -6,7 +6,7 @@
#include
<config.h>
#include
<gtest/gtest.h>
#include
<dhcp
6
/simple_parser6.h>
#include
<dhcp
srv/parsers
/simple_parser6.h>
#include
<dhcp6/tests/dhcp6_test_utils.h>
#include
<cc/data.h>
...
...
src/lib/dhcpsrv/Makefile.am
View file @
5e0bc0d7
...
...
@@ -44,6 +44,10 @@ EXTRA_DIST += parsers/host_reservations_list_parser.h
EXTRA_DIST
+=
parsers/ifaces_config_parser.cc
EXTRA_DIST
+=
parsers/ifaces_config_parser.h
EXTRA_DIST
+=
parsers/option_data_parser.h
EXTRA_DIST
+=
parsers/simple_parser4.cc
EXTRA_DIST
+=
parsers/simple_parser4.h
EXTRA_DIST
+=
parsers/simple_parser6.cc
EXTRA_DIST
+=
parsers/simple_parser6.h
# Devel guide diagrams
EXTRA_DIST
+=
images/pgsql_host_data_source.svg
...
...
@@ -174,6 +178,10 @@ libkea_dhcpsrv_la_SOURCES += parsers/ifaces_config_parser.cc
libkea_dhcpsrv_la_SOURCES
+=
parsers/ifaces_config_parser.h
libkea_dhcpsrv_la_SOURCES
+=
parsers/option_data_parser.cc
libkea_dhcpsrv_la_SOURCES
+=
parsers/option_data_parser.h
libkea_dhcpsrv_la_SOURCES
+=
parsers/simple_parser4.cc
libkea_dhcpsrv_la_SOURCES
+=
parsers/simple_parser4.h
libkea_dhcpsrv_la_SOURCES
+=
parsers/simple_parser6.cc
libkea_dhcpsrv_la_SOURCES
+=
parsers/simple_parser6.h
nodist_libkea_dhcpsrv_la_SOURCES
=
alloc_engine__messages.h
nodist_libkea_dhcpsrv_la_SOURCES
+=
alloc_engine_messages.cc
...
...
src/
bin
/dhcp
4
/simple_parser4.cc
→
src/
lib
/dhcp
srv/parsers
/simple_parser4.cc
View file @
5e0bc0d7
...
...
@@ -4,7 +4,7 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include
<dhcp
4
/simple_parser4.h>
#include
<dhcp
srv/parsers
/simple_parser4.h>
#include
<cc/data.h>
#include
<boost/foreach.hpp>
...
...
src/
bin
/dhcp
4
/simple_parser4.h
→
src/
lib
/dhcp
srv/parsers
/simple_parser4.h
View file @
5e0bc0d7
File moved
src/
bin
/dhcp
6
/simple_parser6.cc
→
src/
lib
/dhcp
srv/parsers
/simple_parser6.cc
View file @
5e0bc0d7
...
...
@@ -4,8 +4,8 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include
<dhcp6/simple_parser6.h>
#include
<cc/data.h>
#include
<dhcpsrv/parsers/simple_parser6.h>
#include
<boost/foreach.hpp>
using
namespace
isc
::
data
;
...
...
src/
bin
/dhcp
6
/simple_parser6.h
→
src/
lib
/dhcp
srv/parsers
/simple_parser6.h
View file @
5e0bc0d7
File moved
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