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
f0c87775
Commit
f0c87775
authored
Mar 03, 2017
by
Francis Dupont
Browse files
[1205a] Moved cfg_to_element.h to src/lib/cc
parent
98cc3607
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/lib/cc/Makefile.am
View file @
f0c87775
...
...
@@ -6,7 +6,7 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS)
lib_LTLIBRARIES
=
libkea-cc.la
libkea_cc_la_SOURCES
=
data.cc data.h
libkea_cc_la_SOURCES
+=
dhcp_config_error.h
libkea_cc_la_SOURCES
+=
cfg_to_element.h
dhcp_config_error.h
libkea_cc_la_SOURCES
+=
command_interpreter.cc command_interpreter.h
libkea_cc_la_SOURCES
+=
simple_parser.cc simple_parser.h
...
...
@@ -18,7 +18,7 @@ libkea_cc_la_LDFLAGS = -no-undefined -version-info 1:0:0
# Since data.h is now used in the hooks interface, it needs to be
# installed on target system.
libkea_cc_includedir
=
$(pkgincludedir)
/cc
libkea_cc_include_HEADERS
=
data.h dhcp_config_error.h
libkea_cc_include_HEADERS
=
cfg_to_element.h
data.h dhcp_config_error.h
EXTRA_DIST
=
cc.dox
...
...
src/lib/
dhcpsrv
/cfg_to_element.h
→
src/lib/
cc
/cfg_to_element.h
View file @
f0c87775
...
...
@@ -22,11 +22,10 @@ public:
isc
::
Exception
(
file
,
line
,
what
)
{
};
};
namespace
d
hcp
{
namespace
d
ata
{
/// @brief Abstract class for configuration Cfg_* classes
///
template
<
typename
...
Args
>
struct
CfgToElement
{
/// Destructor
virtual
~
CfgToElement
()
{
}
...
...
@@ -35,13 +34,12 @@ struct CfgToElement {
///
/// Returns an element which must parse into the same objet, i.e.
/// @code
/// for all valid config C parse(toElement(
parse(C
)) == parse(C)
/// for all valid config C parse(
parse(C)->
toElement()) == parse(C)
/// @endcode
///
/// @param extras extra arguments
/// @return a pointer to a configuration which can be parsed into
/// the initial configuration object
virtual
isc
::
data
::
ElementPtr
toElement
(
Args
...
extras
)
const
=
0
;
virtual
isc
::
data
::
ElementPtr
toElement
()
const
=
0
;
};
};
// namespace isc::dhcp
...
...
src/lib/dhcpsrv/Makefile.am
View file @
f0c87775
...
...
@@ -85,7 +85,6 @@ libkea_dhcpsrv_la_SOURCES += alloc_engine.cc alloc_engine.h
libkea_dhcpsrv_la_SOURCES
+=
alloc_engine_log.cc alloc_engine_log.h
libkea_dhcpsrv_la_SOURCES
+=
base_host_data_source.h
libkea_dhcpsrv_la_SOURCES
+=
callout_handle_store.h
libkea_dhcpsrv_la_SOURCES
+=
cfg_to_element.h
libkea_dhcpsrv_la_SOURCES
+=
cfg_4o6.h
libkea_dhcpsrv_la_SOURCES
+=
cfg_db_access.cc cfg_db_access.h
libkea_dhcpsrv_la_SOURCES
+=
cfg_duid.cc cfg_duid.h
...
...
@@ -223,7 +222,6 @@ EXTRA_DIST += logging.spec
# following headers are anticipated to be useful for the user libraries.
libkea_dhcpsrv_includedir
=
$(pkgincludedir)
/dhcpsrv
libkea_dhcpsrv_include_HEADERS
=
\
cfg_to_element.h
\
cfg_option.h
\
cfg_4o6.h
\
d2_client_cfg.h
\
...
...
src/lib/dhcpsrv/libdhcpsrv.dox
View file @
f0c87775
...
...
@@ -80,11 +80,11 @@ predecessor of the current configuration, the value of 2 identifies the
one that occurred before it etc.
All configuration classes are derived from the abstract base class
\ref isc::d
hcp
::Cfg
Base
and define the
unparse
virtual method
\ref isc::d
ata
::Cfg
ToElement
and define the
toElement
virtual method
which returns a \ref isc::data::ConstElementPtr which must be
parsed into the same object, i.e. fullfil this property:
@code
for all valid C: parse(
unparse(
parse(C))) == parse(C)
for all valid C: parse(parse(C)
->toElement(
)) == parse(C)
@endcode
...
...
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