Commit 2efa7494 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰

[github54] Merge branch 'minor-changes' of https://github.com/andreipavelQ/kea into github54

# Conflicts:
#	src/bin/admin/admin-utils.sh
#	src/lib/cc/data.h
#	src/lib/config/module_spec.cc
#	src/lib/config/module_spec.h
#	src/lib/cryptolink/tests/run_unittests.cc
#	src/lib/util/threads/tests/condvar_unittest.cc
parent 527f970a
......@@ -198,7 +198,7 @@ the message.
% DHCP4_DHCP4O6_RECEIVING receiving DHCPv4o6 packet from DHCPv6 server
This debug message is printed when the server is receiving a DHCPv4o6
from the DHCPv4 server over inter-process communication socket.
from the DHCPv6 server over inter-process communication socket.
% DHCP4_DHCP4O6_RESPONSE_DATA %1: responding with packet %2 (type %3), packet details: %4
A debug message including the detailed data about the packet being
......
......@@ -763,7 +763,7 @@ processing will continue, but the response will only contain generic
configuration and no addresses or prefixes. The argument includes
the client and the transaction identification information.
% DHCP6_UNKNOWN_MSG_RECEIVED received unknown message (type %d) on interface %2
% DHCP6_UNKNOWN_MSG_RECEIVED received unknown message (type %1) on interface %2
This debug message is printed when server receives a message of unknown type.
That could either mean missing functionality or invalid or broken relay or client.
The list of formally defined message types is available here:
......
......@@ -985,8 +985,7 @@ CqlLease6Exchange::createBindForInsert(const Lease6Ptr &lease, AnyArray &data) {
// For convenience for external tools, this is converted to lease
// expiry time (expire). The relationship is given by:
// expire = cltt_ + valid_lft_
CqlExchange::convertToDatabaseTime(lease_->cltt_, lease_->valid_lft_,
expire_);
CqlExchange::convertToDatabaseTime(lease_->cltt_, lease_->valid_lft_, expire_);
// subnet_id: int
subnet_id_ = static_cast<cass_int32_t>(lease_->subnet_id_);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment