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
13159948
Commit
13159948
authored
Aug 31, 2018
by
Tomek Mrugalski
🛰
Browse files
[
#25
,
!14
] UserContext is now in isc::data, deps updated
parent
1c29e58e
Changes
45
Hide whitespace changes
Inline
Side-by-side
src/bin/agent/Makefile.am
View file @
13159948
...
...
@@ -68,7 +68,6 @@ kea_ctrl_agent_SOURCES = main.cc
kea_ctrl_agent_LDADD
=
libagent.la
kea_ctrl_agent_LDADD
+=
$(top_builddir)
/src/lib/cfgrpt/libcfgrpt.la
kea_ctrl_agent_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
kea_ctrl_agent_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
kea_ctrl_agent_LDADD
+=
$(top_builddir)
/src/lib/eval/libkea-eval.la
kea_ctrl_agent_LDADD
+=
$(top_builddir)
/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
kea_ctrl_agent_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
...
...
src/bin/agent/tests/Makefile.am
View file @
13159948
...
...
@@ -61,7 +61,6 @@ ca_unittests_LDADD = $(top_builddir)/src/bin/agent/libagent.la
ca_unittests_LDADD
+=
$(top_builddir)
/src/lib/process/testutils/libprocesstest.la
ca_unittests_LDADD
+=
$(top_builddir)
/src/lib/cfgrpt/libcfgrpt.la
ca_unittests_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
ca_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
ca_unittests_LDADD
+=
$(top_builddir)
/src/lib/eval/libkea-eval.la
ca_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
ca_unittests_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
...
...
src/bin/d2/Makefile.am
View file @
13159948
...
...
@@ -89,7 +89,6 @@ kea_dhcp_ddns_SOURCES = main.cc
kea_dhcp_ddns_LDADD
=
libd2.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/cfgrpt/libcfgrpt.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/eval/libkea-eval.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/asiodns/libkea-asiodns.la
...
...
src/bin/d2/d2_config.h
View file @
13159948
...
...
@@ -257,7 +257,7 @@ typedef boost::shared_ptr<D2Params> D2ParamsPtr;
/// instance of the actual key (@ref isc::dns::TSIGKey) that can be used
/// by the IO layer for signing and verifying messages.
///
class
TSIGKeyInfo
:
public
isc
::
d
hcp
::
UserContext
,
public
isc
::
data
::
CfgToElement
{
class
TSIGKeyInfo
:
public
isc
::
d
ata
::
UserContext
,
public
isc
::
data
::
CfgToElement
{
public:
/// @brief Defines string values for the supported TSIG algorithms
//@{
...
...
@@ -412,7 +412,7 @@ typedef boost::shared_ptr<TSIGKeyInfoMap> TSIGKeyInfoMapPtr;
/// belongs to a list of servers supporting DNS for a given domain. It will
/// be used to establish communications with the server to carry out DNS
/// updates.
class
DnsServerInfo
:
public
isc
::
d
hcp
::
UserContext
,
public
isc
::
data
::
CfgToElement
{
class
DnsServerInfo
:
public
isc
::
d
ata
::
UserContext
,
public
isc
::
data
::
CfgToElement
{
public:
/// @brief defines DNS standard port value
static
const
uint32_t
STANDARD_DNS_PORT
=
53
;
...
...
@@ -522,7 +522,7 @@ typedef boost::shared_ptr<DnsServerInfoStorage> DnsServerInfoStoragePtr;
/// @todo Currently the name entry for a domain is just an std::string. It
/// may be worthwhile to change this to a dns::Name for purposes of better
/// validation and matching capabilities.
class
DdnsDomain
:
public
isc
::
d
hcp
::
UserContext
,
public
isc
::
data
::
CfgToElement
{
class
DdnsDomain
:
public
isc
::
d
ata
::
UserContext
,
public
isc
::
data
::
CfgToElement
{
public:
/// @brief Constructor
///
...
...
src/bin/d2/tests/Makefile.am
View file @
13159948
...
...
@@ -76,7 +76,6 @@ d2_unittests_LDADD = $(top_builddir)/src/bin/d2/libd2.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/process/testutils/libprocesstest.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/cfgrpt/libcfgrpt.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/testutils/libdhcpsrvtest.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
d2_unittests_LDADD
+=
$(top_builddir)
/src/lib/testutils/libkea-testutils.la
...
...
src/bin/dhcp4/Makefile.am
View file @
13159948
...
...
@@ -94,6 +94,7 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libkea-asiolink.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/cc/libkea-cc.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/dns/libkea-dns++.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/log/libkea-log.la
...
...
src/bin/dhcp4/ctrl_dhcp4_srv.cc
View file @
13159948
...
...
@@ -276,7 +276,8 @@ ControlledDhcpv4Srv::commandConfigWriteHandler(const string&,
// Ok, it's time to write the file.
size_t
size
=
0
;
try
{
size
=
writeConfigFile
(
filename
);
ConstElementPtr
cfg
=
CfgMgr
::
instance
().
getCurrentCfg
()
->
toElement
();
size
=
writeConfigFile
(
filename
,
cfg
);
}
catch
(
const
isc
::
Exception
&
ex
)
{
return
(
createAnswer
(
CONTROL_RESULT_ERROR
,
string
(
"Error during write-config:"
)
+
ex
.
what
()));
...
...
src/bin/dhcp4/dhcp4_srv.h
View file @
13159948
...
...
@@ -22,7 +22,7 @@
#include <dhcpsrv/network_state.h>
#include <dhcpsrv/subnet.h>
#include <hooks/callout_handle.h>
#include <
dhcpsrv
/daemon.h>
#include <
process
/daemon.h>
#include <boost/noncopyable.hpp>
...
...
@@ -191,7 +191,7 @@ typedef boost::shared_ptr<Dhcpv4Exchange> Dhcpv4ExchangePtr;
/// This class does not support any controlling mechanisms directly.
/// See the derived \ref ControlledDhcpv4Srv class for support for
/// command and configuration updates over msgq.
class
Dhcpv4Srv
:
public
Daemon
{
class
Dhcpv4Srv
:
public
process
::
Daemon
{
private:
/// @brief Pointer to IO service used by the server.
...
...
src/bin/dhcp4/main.cc
View file @
13159948
...
...
@@ -22,6 +22,7 @@
using
namespace
isc
::
data
;
using
namespace
isc
::
dhcp
;
using
namespace
isc
::
process
;
using
namespace
std
;
/// This file contains entry point (main() function) for standard DHCPv4 server
...
...
@@ -228,7 +229,7 @@ main(int argc, char* argv[]) {
LOG_INFO
(
dhcp4_logger
,
DHCP4_SHUTDOWN
);
}
catch
(
const
isc
::
dhcp
::
DaemonPIDExists
&
ex
)
{
}
catch
(
const
isc
::
process
::
DaemonPIDExists
&
ex
)
{
// First, we print the error on stderr (that should always work)
cerr
<<
DHCP4_NAME
<<
" already running? "
<<
ex
.
what
()
<<
endl
;
...
...
src/bin/dhcp4/tests/Makefile.am
View file @
13159948
...
...
@@ -149,6 +149,7 @@ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libkea-asiolink.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/cc/libkea-cc.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/dns/libkea-dns++.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
dhcp4_unittests_LDADD
+=
$(top_builddir)
/src/lib/database/libkea-database.la
...
...
src/bin/dhcp6/Makefile.am
View file @
13159948
...
...
@@ -95,6 +95,7 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/database/libkea-database.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/asiolink/libkea-asiolink.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/cc/libkea-cc.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/dns/libkea-dns++.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/log/libkea-log.la
...
...
src/bin/dhcp6/ctrl_dhcp6_srv.cc
View file @
13159948
...
...
@@ -278,7 +278,8 @@ ControlledDhcpv6Srv::commandConfigWriteHandler(const string&, ConstElementPtr ar
// Ok, it's time to write the file.
size_t
size
=
0
;
try
{
size
=
writeConfigFile
(
filename
);
ConstElementPtr
cfg
=
CfgMgr
::
instance
().
getCurrentCfg
()
->
toElement
();
size
=
writeConfigFile
(
filename
,
cfg
);
}
catch
(
const
isc
::
Exception
&
ex
)
{
return
(
createAnswer
(
CONTROL_RESULT_ERROR
,
string
(
"Error during write-config:"
)
+
ex
.
what
()));
...
...
src/bin/dhcp6/dhcp6_srv.h
View file @
13159948
...
...
@@ -23,7 +23,7 @@
#include <dhcpsrv/network_state.h>
#include <dhcpsrv/subnet.h>
#include <hooks/callout_handle.h>
#include <
dhcpsrv
/daemon.h>
#include <
process
/daemon.h>
#include <functional>
#include <iostream>
...
...
@@ -56,7 +56,7 @@ public:
/// that is going to be used as server-identifier, receives incoming
/// packets, processes them, manages leases assignment and generates
/// appropriate responses.
class
Dhcpv6Srv
:
public
Daemon
{
class
Dhcpv6Srv
:
public
process
::
Daemon
{
private:
/// @brief Pointer to IO service used by the server.
...
...
src/bin/dhcp6/main.cc
View file @
13159948
...
...
@@ -15,6 +15,7 @@
#include <log/logger_manager.h>
#include <exceptions/exceptions.h>
#include <cfgrpt/config_report.h>
#include <process/daemon.h>
#include <boost/lexical_cast.hpp>
...
...
@@ -22,6 +23,7 @@
using
namespace
isc
::
data
;
using
namespace
isc
::
dhcp
;
using
namespace
isc
::
process
;
using
namespace
std
;
/// This file contains entry point (main() function) for standard DHCPv6 server
...
...
@@ -136,7 +138,7 @@ main(int argc, char* argv[]) {
// This is just a test, so we don't care about lockfile.
setenv
(
"KEA_LOCKFILE_DIR"
,
"none"
,
0
);
CfgMgr
::
instance
().
setDefaultLoggerName
(
DHCP6_ROOT_LOGGER_NAME
);
Daemon
::
loggerInit
(
DHCP6_ROOT_LOGGER_NAME
,
verbose_mode
);
isc
::
process
::
Daemon
::
loggerInit
(
DHCP6_ROOT_LOGGER_NAME
,
verbose_mode
);
// Check the syntax first.
Parser6Context
parser
;
...
...
@@ -236,7 +238,7 @@ main(int argc, char* argv[]) {
LOG_INFO
(
dhcp6_logger
,
DHCP6_SHUTDOWN
);
}
catch
(
const
isc
::
dhcp
::
DaemonPIDExists
&
ex
)
{
}
catch
(
const
isc
::
process
::
DaemonPIDExists
&
ex
)
{
// First, we print the error on stderr (that should always work)
cerr
<<
DHCP6_NAME
<<
" already running? "
<<
ex
.
what
()
<<
endl
;
...
...
src/bin/dhcp6/tests/Makefile.am
View file @
13159948
...
...
@@ -129,6 +129,7 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/config/libkea-cfgclient.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libkea-dhcp++.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
dhcp6_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/tests/libdhcptest.la
if
HAVE_MYSQL
...
...
src/bin/lfc/Makefile.am
View file @
13159948
...
...
@@ -56,6 +56,7 @@ kea_lfc_LDADD = liblfc.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/cfgrpt/libcfgrpt.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/eval/libkea-eval.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
kea_lfc_LDADD
+=
$(top_builddir)
/src/lib/config/libkea-cfgclient.la
...
...
src/bin/lfc/tests/Makefile.am
View file @
13159948
...
...
@@ -57,6 +57,7 @@ lfc_unittests_LDADD += $(top_builddir)/src/lib/cfgrpt/libcfgrpt.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/eval/libkea-eval.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/config/libkea-cfgclient.la
lfc_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp/libkea-dhcp++.la
...
...
src/hooks/dhcp/high_availability/Makefile.am
View file @
13159948
...
...
@@ -53,6 +53,7 @@ libdhcp_ha_la_LDFLAGS += -avoid-version -export-dynamic -module
libdhcp_ha_la_LIBADD
=
libha.la
libdhcp_ha_la_LIBADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
libdhcp_ha_la_LIBADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
libdhcp_ha_la_LIBADD
+=
$(top_builddir)
/src/lib/eval/libkea-eval.la
libdhcp_ha_la_LIBADD
+=
$(top_builddir)
/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
libdhcp_ha_la_LIBADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
...
...
src/hooks/dhcp/high_availability/tests/Makefile.am
View file @
13159948
...
...
@@ -41,6 +41,7 @@ ha_unittests_CXXFLAGS = $(AM_CXXFLAGS)
ha_unittests_LDADD
=
$(top_builddir)
/src/hooks/dhcp/high_availability/libha.la
ha_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
ha_unittests_LDADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
ha_unittests_LDADD
+=
$(top_builddir)
/src/lib/eval/libkea-eval.la
ha_unittests_LDADD
+=
$(top_builddir)
/src/lib/dhcp_ddns/libkea-dhcp_ddns.la
ha_unittests_LDADD
+=
$(top_builddir)
/src/lib/stats/libkea-stats.la
...
...
src/hooks/dhcp/lease_cmds/Makefile.am
View file @
13159948
...
...
@@ -45,6 +45,7 @@ libdhcp_lease_cmds_la_LDFLAGS = $(AM_LDFLAGS)
libdhcp_lease_cmds_la_LDFLAGS
+=
-avoid-version
-export-dynamic
-module
libdhcp_lease_cmds_la_LIBADD
=
liblease_cmds.la
libdhcp_lease_cmds_la_LIBADD
+=
$(top_builddir)
/src/lib/dhcpsrv/libkea-dhcpsrv.la
libdhcp_lease_cmds_la_LIBADD
+=
$(top_builddir)
/src/lib/process/libkea-process.la
libdhcp_lease_cmds_la_LIBADD
+=
$(top_builddir)
/src/lib/config/libkea-cfgclient.la
libdhcp_lease_cmds_la_LIBADD
+=
$(top_builddir)
/src/lib/cc/libkea-cc.la
libdhcp_lease_cmds_la_LIBADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
...
...
Prev
1
2
3
Next
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