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
Adam Osuchowski
Kea
Commits
2b7ac4c6
Commit
2b7ac4c6
authored
May 17, 2015
by
Francis Dupont
Browse files
[3513] extended version reporting
parent
dbb8141b
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/bin/d2/Makefile.am
View file @
2b7ac4c6
...
...
@@ -97,6 +97,7 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libkea-dhcpsrv.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/dns/libkea-dns++.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/util/libkea-util.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
kea_dhcp_ddns_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp_ddnsdir
=
$(pkgdatadir)
kea_dhcp_ddns_DATA
=
dhcp-ddns.spec
src/bin/d2/d_controller.cc
View file @
2b7ac4c6
...
...
@@ -19,6 +19,8 @@
#include <exceptions/exceptions.h>
#include <log/logger_support.h>
#include <dhcpsrv/cfgmgr.h>
#include <cryptolink/cryptolink.h>
#include <log/logger.h>
#include <sstream>
#include <unistd.h>
...
...
@@ -451,11 +453,20 @@ isc::dhcp::Daemon::getVersion(bool extended) {
tmp
<<
VERSION
;
if
(
extended
)
{
tmp
<<
std
::
endl
<<
EXTENDED_VERSION
;
// @todo print more details (is it Botan or OpenSSL build,
// with or without MySQL/Postgres? What compilation options were
// used? etc)
tmp
<<
std
::
endl
<<
EXTENDED_VERSION
<<
std
::
endl
;
tmp
<<
"linked with "
<<
isc
::
log
::
Logger
::
getVersion
()
<<
std
::
endl
;
tmp
<<
"and "
<<
isc
::
cryptolink
::
CryptoLink
::
getVersion
()
<<
std
::
endl
;
#ifdef HAVE_MYSQL
tmp
<<
"database: MySQL"
;
#else
#ifdef HAVE_PGSQL
tmp
<<
"database: PostgreSQL"
;
#else
tmp
<<
"no database"
;
#endif
#endif
// @todo: more details about database runtime
}
return
(
tmp
.
str
());
...
...
src/bin/dhcp4/Makefile.am
View file @
2b7ac4c6
...
...
@@ -82,6 +82,7 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/config/libkea-cfgclient.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/cc/libkea-cc.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
kea_dhcp4_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp4dir
=
$(pkgdatadir)
kea_dhcp4_DATA
=
dhcp4.spec
src/bin/dhcp4/dhcp4_srv.cc
View file @
2b7ac4c6
...
...
@@ -41,6 +41,8 @@
#include <hooks/hooks_log.h>
#include <hooks/hooks_manager.h>
#include <util/strutil.h>
#include <log/logger.h>
#include <cryptolink/cryptolink.h>
#include <asio.hpp>
#include <boost/bind.hpp>
...
...
@@ -51,6 +53,7 @@
using
namespace
isc
;
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
cryptolink
;
using
namespace
isc
::
dhcp
;
using
namespace
isc
::
dhcp_ddns
;
using
namespace
isc
::
hooks
;
...
...
@@ -2213,11 +2216,19 @@ Daemon::getVersion(bool extended) {
tmp
<<
VERSION
;
if
(
extended
)
{
tmp
<<
endl
<<
EXTENDED_VERSION
;
// @todo print more details (is it Botan or OpenSSL build,
// with or without MySQL/Postgres? What compilation options were
// used? etc)
tmp
<<
endl
<<
EXTENDED_VERSION
<<
endl
;
tmp
<<
"linked with "
<<
Logger
::
getVersion
()
<<
endl
;
tmp
<<
"and "
<<
CryptoLink
::
getVersion
()
<<
endl
;
#ifdef HAVE_MYSQL
tmp
<<
"database: MySQL"
;
#else
#ifdef HAVE_PGSQL
tmp
<<
"database: PostgreSQL"
;
#else
tmp
<<
"no database"
;
#endif
#endif
// @todo: more details about database runtime
}
return
(
tmp
.
str
());
...
...
src/bin/dhcp6/Makefile.am
View file @
2b7ac4c6
...
...
@@ -84,6 +84,7 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/log/libkea-log.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/util/libkea-util.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/hooks/libkea-hooks.la
kea_dhcp6_LDADD
+=
$(top_builddir)
/src/lib/cryptolink/libkea-cryptolink.la
kea_dhcp6dir
=
$(pkgdatadir)
kea_dhcp6_DATA
=
dhcp6.spec
src/bin/dhcp6/dhcp6_srv.cc
View file @
2b7ac4c6
...
...
@@ -46,6 +46,8 @@
#include <util/encode/hex.h>
#include <util/io_utilities.h>
#include <util/range_utilities.h>
#include <log/logger.h>
#include <cryptolink/cryptolink.h>
#include <asio.hpp>
...
...
@@ -62,9 +64,11 @@
using
namespace
isc
;
using
namespace
isc
::
asiolink
;
using
namespace
isc
::
dhcp_ddns
;
using
namespace
isc
::
cryptolink
;
using
namespace
isc
::
dhcp
;
using
namespace
isc
::
dhcp_ddns
;
using
namespace
isc
::
hooks
;
using
namespace
isc
::
log
;
using
namespace
isc
::
util
;
using
namespace
std
;
...
...
@@ -2760,10 +2764,19 @@ Daemon::getVersion(bool extended) {
tmp
<<
VERSION
;
if
(
extended
)
{
tmp
<<
endl
<<
EXTENDED_VERSION
;
// @todo print more details (is it Botan or OpenSSL build,
// with or without MySQL/Postgres? What compilation options were
// used? etc)
tmp
<<
endl
<<
EXTENDED_VERSION
<<
endl
;
tmp
<<
"linked with "
<<
Logger
::
getVersion
()
<<
endl
;
tmp
<<
"and "
<<
CryptoLink
::
getVersion
()
<<
endl
;
#ifdef HAVE_MYSQL
tmp
<<
"database: MySQL"
;
#else
#ifdef HAVE_PGSQL
tmp
<<
"database: PostgreSQL"
;
#else
tmp
<<
"no database"
;
#endif
#endif
// @todo: more details about database runtime
}
return
(
tmp
.
str
());
...
...
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