mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-22 01:49:48 +00:00
Code Issues Releases Wiki Activity

[#3254] show premium source in extended version

Browse Source
This commit is contained in:
Andrei Pavel 2024-03-22 14:25:14 +02:00
parent 11d636c074
commit a764025dfd
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
6 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -147,6 +147,9 @@ AC_SUBST(PREMIUM_DIR)
AC_SUBST(DISTCHECK_PREMIUM_CONFIGURE_FLAG) AC_SUBST(DISTCHECK_PREMIUM_CONFIGURE_FLAG)
AX_PREMIUM AX_PREMIUM
# Export PREMIUM to kea_version.h.
AC_SUBST(PREMIUM)
# Include contrib configuration # Include contrib configuration
# (currently only a provision copied from premium support) # (currently only a provision copied from premium support)
CONTRIB_DIR= CONTRIB_DIR=

1
kea_version.h.in
View File

@ -1,2 +1,3 @@
#define EXTENDED_VERSION "@KEA_SRCID@" #define EXTENDED_VERSION "@KEA_SRCID@"
#define PREMIUM_EXTENDED_VERSION "@PREMIUM@"
#define PACKAGE_VERSION_TYPE "@PACKAGE_VERSION_TYPE@" #define PACKAGE_VERSION_TYPE "@PACKAGE_VERSION_TYPE@"

13
src/bin/dhcp4/dhcp4_srv.cc
View File

@ -4833,17 +4833,18 @@ Dhcpv4Srv::getVersion(bool extended) {
tmp << VERSION; tmp << VERSION;
if (extended) { if (extended) {
tmp << endl << EXTENDED_VERSION << endl; tmp << endl << EXTENDED_VERSION << endl;
tmp << "premium: " << PREMIUM_EXTENDED_VERSION << endl;
tmp << "linked with:" << endl; tmp << "linked with:" << endl;
tmp << Logger::getVersion() << endl; tmp << "- " << Logger::getVersion() << endl;
tmp << CryptoLink::getVersion() << endl; tmp << "- " << CryptoLink::getVersion() << endl;
tmp << "database:" << endl; tmp << "backends:" << endl;
#ifdef HAVE_MYSQL #ifdef HAVE_MYSQL
tmp << MySqlLeaseMgr::getDBVersion() << endl; tmp << "- " << MySqlLeaseMgr::getDBVersion() << endl;
#endif #endif
#ifdef HAVE_PGSQL #ifdef HAVE_PGSQL
tmp << PgSqlLeaseMgr::getDBVersion() << endl; tmp << "- " << PgSqlLeaseMgr::getDBVersion() << endl;
#endif #endif
tmp << Memfile_LeaseMgr::getDBVersion(Memfile_LeaseMgr::V4); tmp << "- " << Memfile_LeaseMgr::getDBVersion(Memfile_LeaseMgr::V4);
// @todo: more details about database runtime // @todo: more details about database runtime
} }

13
src/bin/dhcp6/dhcp6_srv.cc
View File

@ -4654,17 +4654,18 @@ Dhcpv6Srv::getVersion(bool extended) {
tmp << VERSION; tmp << VERSION;
if (extended) { if (extended) {
tmp << endl << EXTENDED_VERSION << endl; tmp << endl << EXTENDED_VERSION << endl;
tmp << "premium: " << PREMIUM_EXTENDED_VERSION << endl;
tmp << "linked with:" << endl; tmp << "linked with:" << endl;
tmp << Logger::getVersion() << endl; tmp << "- " << Logger::getVersion() << endl;
tmp << CryptoLink::getVersion() << endl; tmp << "- " << CryptoLink::getVersion() << endl;
tmp << "database:" << endl; tmp << "backends:" << endl;
#ifdef HAVE_MYSQL #ifdef HAVE_MYSQL
tmp << MySqlLeaseMgr::getDBVersion() << endl; tmp << "- " << MySqlLeaseMgr::getDBVersion() << endl;
#endif #endif
#ifdef HAVE_PGSQL #ifdef HAVE_PGSQL
tmp << PgSqlLeaseMgr::getDBVersion() << endl; tmp << "- " << PgSqlLeaseMgr::getDBVersion() << endl;
#endif #endif
tmp << Memfile_LeaseMgr::getDBVersion(Memfile_LeaseMgr::V6); tmp << "- " << Memfile_LeaseMgr::getDBVersion(Memfile_LeaseMgr::V6);
// @todo: more details about database runtime // @todo: more details about database runtime
} }

8
src/bin/lfc/lfc_controller.cc
View File

@ -328,12 +328,12 @@ LFCController::getVersion(const bool extended) const{
} else if (protocol_version_ == 6) { } else if (protocol_version_ == 6) {
db_version = Memfile_LeaseMgr::getDBVersion(Memfile_LeaseMgr::V6); db_version = Memfile_LeaseMgr::getDBVersion(Memfile_LeaseMgr::V6);
} }
version_stream << std::endl << EXTENDED_VERSION;
if (!db_version.empty()) { if (!db_version.empty()) {
db_version = "database: " + db_version; db_version = "backend: " + db_version;
version_stream << std::endl << db_version;
} }
version_stream << std::endl
<< EXTENDED_VERSION << std::endl
<< db_version;
} }
return (version_stream.str()); return (version_stream.str());

3
src/lib/process/d_controller.cc
View File

@ -864,8 +864,9 @@ DControllerBase::getVersion(bool extended) {
tmp << VERSION; tmp << VERSION;
if (extended) { if (extended) {
tmp << std::endl << EXTENDED_VERSION << std::endl; tmp << std::endl << EXTENDED_VERSION << std::endl;
tmp << "premium: " << PREMIUM_EXTENDED_VERSION << std::endl;
tmp << "linked with:" << std::endl; tmp << "linked with:" << std::endl;
tmp << isc::log::Logger::getVersion() << std::endl; tmp << "- " << isc::log::Logger::getVersion() << std::endl;
tmp << getVersionAddendum(); tmp << getVersionAddendum();
} }