mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 13:07:50 +00:00
Code Issues Releases Wiki Activity

[4326] untabified

Browse Source
This commit is contained in:
Francis Dupont 2016-03-22 17:31:30 +01:00
parent 3114642b99
commit 9f47b6511d
13 changed files with 46 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/admin/kea-admin.xml
View File

@ -1,6 +1,6 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]> [<!ENTITY mdash "&#8212;">]>
<!-- <!--
- Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC") - Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
- -

2
src/bin/keactrl/keactrl.xml
View File

@ -1,6 +1,6 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]> [<!ENTITY mdash "&#8212;">]>
<!-- <!--
- Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC") - Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
- -

2
src/bin/keactrl/tests/keactrl_tests.sh.in
View File

@ -958,7 +958,7 @@ status_no_config_test() {
assert_string_contains "DHCP DDNS: inactive" "${output}" \ assert_string_contains "DHCP DDNS: inactive" "${output}" \
"Expected keactrl status command return %s" "Expected keactrl status command return %s"
assert_string_contains "Configuration file for Kea does not exist" \ assert_string_contains "Configuration file for Kea does not exist" \
"${output}" "Expected keactrl status command return %s" "${output}" "Expected keactrl status command return %s"
test_finish 0 test_finish 0
} }

2
src/bin/perfdhcp/perfdhcp.xml
View File

@ -1,6 +1,6 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]> [<!ENTITY mdash "&#8212;">]>
<!-- <!--
- Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC") - Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
- -

5
src/bin/sockcreator/kea-sockcreator.xml
View File

@ -1,6 +1,6 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
[<!ENTITY mdash "&#8212;">]> [<!ENTITY mdash "&#8212;">]>
<!-- <!--
- Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC") - Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC")
- -
@ -81,6 +81,3 @@
- mode: sgml - mode: sgml
- End: - End:
--> -->

10
src/lib/asiolink/tests/tcp_socket_unittest.cc
View File

@ -455,13 +455,13 @@ TEST(TCPSocket, sequenceTest) {
} }
} }
// Has the client run? // Has the client run?
if (!client_complete) { if (!client_complete) {
if (client_cb.called() != client_cb.queued()) { if (client_cb.called() != client_cb.queued()) {
// No. Run the service another time. // No. Run the service another time.
continue; continue;
} }
// Client callback must have run. Check that it ran OK. // Client callback must have run. Check that it ran OK.
EXPECT_EQ(TCPCallback::READ, client_cb.called()); EXPECT_EQ(TCPCallback::READ, client_cb.called());

22
src/lib/config/tests/testdata/data41_2.data vendored
View File

@ -1,16 +1,16 @@
{ {
"zones": [ "zones": [
{ {
"example.org": { "example.org": {
"queries.tcp": 100, "queries.tcp": 100,
"queries.udp": 200 "queries.udp": 200
} }
}, },
{ {
"example.net": { "example.net": {
"queries.tcp": 300, "queries.tcp": 300,
"queries.udp": 400 "queries.udp": 400
} }
} }
] ]
} }

20
src/lib/dhcpsrv/mysql_host_data_source.cc
View File

@ -503,18 +503,18 @@ public:
} }
private: private:
uint32_t host_id_; /// Host unique identifier uint32_t host_id_; /// Host unique identifier
std::vector<uint8_t> dhcp_identifier_; /// HW address (0) / DUID (1) std::vector<uint8_t> dhcp_identifier_; /// HW address (0) / DUID (1)
uint8_t dhcp_identifier_buffer_[DUID::MAX_DUID_LEN]; uint8_t dhcp_identifier_buffer_[DUID::MAX_DUID_LEN];
/// Buffer for dhcp identifier /// Buffer for dhcp identifier
unsigned long dhcp_identifier_length_; /// Length of dhcp identifier unsigned long dhcp_identifier_length_; /// Length of dhcp identifier
uint8_t dhcp_identifier_type_; /// Type of dhcp_identifier uint8_t dhcp_identifier_type_; /// Type of dhcp_identifier
uint32_t dhcp4_subnet_id_; /// Subnet DHCPv4 identifier uint32_t dhcp4_subnet_id_; /// Subnet DHCPv4 identifier
uint32_t dhcp6_subnet_id_; /// Subnet DHCPv6 identifier uint32_t dhcp6_subnet_id_; /// Subnet DHCPv6 identifier
uint32_t ipv4_address_; /// Reserved IPv4 address. uint32_t ipv4_address_; /// Reserved IPv4 address.
IPv6ResrvCollection ipv6_reservations_; /// IPv6 reservations collection IPv6ResrvCollection ipv6_reservations_; /// IPv6 reservations collection
char hostname_[HOSTNAME_MAX_LEN]; /// Name reserved for the host char hostname_[HOSTNAME_MAX_LEN]; /// Name reserved for the host
unsigned long hostname_length_; /// hostname length unsigned long hostname_length_; /// hostname length
char dhcp4_client_classes_[CLIENT_CLASSES_MAX_LEN]; char dhcp4_client_classes_[CLIENT_CLASSES_MAX_LEN];
/// DHCPv4 client classes /// DHCPv4 client classes
unsigned long dhcp4_client_classes_length_; /// dhcp4_client_classes length unsigned long dhcp4_client_classes_length_; /// dhcp4_client_classes length
@ -522,7 +522,7 @@ private:
/// DHCPv6 client classes /// DHCPv6 client classes
unsigned long dhcp6_client_classes_length_; /// dhcp6_client_classes length unsigned long dhcp6_client_classes_length_; /// dhcp6_client_classes length
HWAddrPtr hw_address_; /// Pointer to hardware address HWAddrPtr hw_address_; /// Pointer to hardware address
DuidPtr duid_; /// Pointer to DUID DuidPtr duid_; /// Pointer to DUID
// NULL flags for subnets id, ipv4 address, hostname and client classes // NULL flags for subnets id, ipv4 address, hostname and client classes
my_bool dhcp4_subnet_id_null_; my_bool dhcp4_subnet_id_null_;
@ -533,9 +533,9 @@ private:
my_bool dhcp6_client_classes_null_; my_bool dhcp6_client_classes_null_;
MYSQL_BIND bind_[HOST_COLUMNS]; MYSQL_BIND bind_[HOST_COLUMNS];
std::string columns_[HOST_COLUMNS]; /// Column names std::string columns_[HOST_COLUMNS]; /// Column names
my_bool error_[HOST_COLUMNS]; /// Error array my_bool error_[HOST_COLUMNS]; /// Error array
HostPtr host_; // Pointer to Host object HostPtr host_; // Pointer to Host object
}; };
// MySqlHostDataSource Constructor and Destructor // MySqlHostDataSource Constructor and Destructor

12
src/lib/dhcpsrv/mysql_host_data_source.h
View File

@ -221,13 +221,13 @@ public:
/// ///
/// The contents of the enum are indexes into the list of SQL statements /// The contents of the enum are indexes into the list of SQL statements
enum StatementIndex { enum StatementIndex {
INSERT_HOST, // Insert new host to collection INSERT_HOST, // Insert new host to collection
GET_HOST_HWADDR_DUID, // Gets hosts by DUID and/or HW address GET_HOST_HWADDR_DUID, // Gets hosts by DUID and/or HW address
GET_HOST_ADDR, // Gets hosts by IPv4 address GET_HOST_ADDR, // Gets hosts by IPv4 address
GET_HOST_SUBID4_DHCPID, // Gets host by IPv4 SubnetID, HW address/DUID GET_HOST_SUBID4_DHCPID, // Gets host by IPv4 SubnetID, HW address/DUID
GET_HOST_SUBID6_DHCPID, // Gets host by IPv6 SubnetID, HW address/DUID GET_HOST_SUBID6_DHCPID, // Gets host by IPv6 SubnetID, HW address/DUID
GET_HOST_SUBID_ADDR, // Gets host by IPv4 SubnetID and IPv4 address GET_HOST_SUBID_ADDR, // Gets host by IPv4 SubnetID and IPv4 address
GET_HOST_PREFIX, // Gets host by IPv6 prefix GET_HOST_PREFIX, // Gets host by IPv6 prefix
GET_VERSION, // Obtain version number GET_VERSION, // Obtain version number
NUM_STATEMENTS // Number of statements NUM_STATEMENTS // Number of statements
}; };
@ -236,7 +236,7 @@ private:
/// @brief Add Host Code /// @brief Add Host Code
/// ///
/// This method performs adding a host operation. /// This method performs adding a host operation.
/// It binds the contents of the host object to /// It binds the contents of the host object to
/// the prepared statement and adds it to the database. /// the prepared statement and adds it to the database.
/// ///
/// @param stindex Index of statemnent being executed /// @param stindex Index of statemnent being executed

2
src/lib/dns/opcode.cc
View File

@ -43,7 +43,7 @@ Opcode::Opcode(const uint8_t code) : code_(static_cast<CodeValue>(code)) {
if (code > MAX_OPCODE) { if (code > MAX_OPCODE) {
isc_throw(OutOfRange, isc_throw(OutOfRange,
"DNS Opcode is too large to construct: " "DNS Opcode is too large to construct: "
<< static_cast<unsigned>(code)); << static_cast<unsigned>(code));
} }
} }

12
src/lib/eval/token.cc
View File

@ -224,9 +224,9 @@ TokenNot::evaluate(const Pkt& /*pkt*/, ValueStack& values) {
bool val = toBool(op); bool val = toBool(op);
if (!val) { if (!val) {
values.push("true"); values.push("true");
} else { } else {
values.push("false"); values.push("false");
} }
} }
@ -246,9 +246,9 @@ TokenAnd::evaluate(const Pkt& /*pkt*/, ValueStack& values) {
bool val2 = toBool(op2); bool val2 = toBool(op2);
if (val1 && val2) { if (val1 && val2) {
values.push("true"); values.push("true");
} else { } else {
values.push("false"); values.push("false");
} }
} }
@ -268,8 +268,8 @@ TokenOr::evaluate(const Pkt& /*pkt*/, ValueStack& values) {
bool val2 = toBool(op2); bool val2 = toBool(op2);
if (val1 || val2) { if (val1 || val2) {
values.push("true"); values.push("true");
} else { } else {
values.push("false"); values.push("false");
} }
} }

2
src/lib/util/tests/boost_time_utils_unittest.cc
View File

@ -31,7 +31,7 @@ TEST(BoostTimeUtilsTest, epoch) {
// The 2015 Bastille day // The 2015 Bastille day
TEST(BoostTimeUtilsTest, bastilleDay) { TEST(BoostTimeUtilsTest, bastilleDay) {
time_duration tdbast = time_duration tdbast =
hours(12) + minutes(13) + seconds(14) + milliseconds(500); hours(12) + minutes(13) + seconds(14) + milliseconds(500);
ptime pbast(date(2015, Jul, 14), tdbast); ptime pbast(date(2015, Jul, 14), tdbast);
string sbast = ptimeToText(pbast); string sbast = ptimeToText(pbast);
EXPECT_EQ("2015-07-14 12:13:14.500", sbast.substr(0, 23)); EXPECT_EQ("2015-07-14 12:13:14.500", sbast.substr(0, 23));

2
src/lib/util/threads/thread.cc
View File

@ -67,7 +67,7 @@ public:
waiting_(2), waiting_(2),
main_(main), main_(main),
exception_(false), exception_(false),
tid_(0) tid_(0)
{} {}
// Another of the waiting events is done. If there are no more, delete // Another of the waiting events is done. If there are no more, delete
// impl. // impl.