mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 07:25:18 +00:00
Code Issues Releases Wiki Activity

[1784] some initialization issues and cppcheck fixes

Browse Source 
see http://bind10.isc.org/ticket/1784#comment:5
This commit is contained in:
Jelte Jansen
2012-03-19 15:27:01 +01:00
parent 20e1bd7772
commit 438bcd6747
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/asiodns/tests/dns_service_unittest.cc
View File

@@ -177,6 +177,8 @@ protected:
asio_service(io_service.get_io_service()) asio_service(io_service.get_io_service())
{ {
current_service = &io_service; current_service = &io_service;
// Content shouldn't matter for the tests, but initialize anyway
memset(data, 1, sizeof(data));
} }
~UDPDNSServiceTest() { ~UDPDNSServiceTest() {
@@ -226,7 +228,7 @@ protected:
private: private:
asio::ip::udp::socket client_socket; asio::ip::udp::socket client_socket;
const asio::ip::udp::endpoint server_ep; const asio::ip::udp::endpoint server_ep;
char data[4]; // the content doesn't matter for the test char data[4];
// To access them in signal handle function, the following // To access them in signal handle function, the following
// variables have to be static. // variables have to be static.
@@ -236,6 +238,11 @@ private:
asio::io_service& asio_service; asio::io_service& asio_service;
}; };
// Need to define the non-const static members outside of the class
// declaration
IOService* UDPDNSServiceTest::current_service;
bool UDPDNSServiceTest::io_service_is_time_out;
// A helper socket FD creator for given address and port. It's generally // A helper socket FD creator for given address and port. It's generally
// expected to succeed; on failure it simply throws an exception to make // expected to succeed; on failure it simply throws an exception to make
// the test fail. // the test fail.
@@ -250,14 +257,14 @@ getSocketFD(int family, const char* const address, const char* const port) {
int s = -1; int s = -1;
int error = getaddrinfo(address, port, &hints, &res); int error = getaddrinfo(address, port, &hints, &res);
if (error == 0) { if (error == 0) {
s = socket(res->ai_family, res->ai_socktype, res->ai_protocol); if (res != NULL) {
if (s >= 0) { s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
error = bind(s, res->ai_addr, res->ai_addrlen); if (s >= 0) {
error = bind(s, res->ai_addr, res->ai_addrlen);
}
freeaddrinfo(res);
} }
} }
if (res != NULL) {
freeaddrinfo(res);
}
if (error != 0) { if (error != 0) {
if (s >= 0) { if (s >= 0) {
close(s); close(s);

1
src/lib/resolve/Makefile.am
View File

@@ -34,6 +34,7 @@ nodist_libresolve_la_SOURCES = resolve_messages.h resolve_messages.cc
libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la
libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
libresolve_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la libresolve_la_LIBADD += $(top_builddir)/src/lib/log/liblog.la
libresolve_la_LIBADD += $(top_builddir)/src/lib/asiodns/libasiodns.la
# The message file should be in the distribution. # The message file should be in the distribution.
EXTRA_DIST = resolve_messages.mes EXTRA_DIST = resolve_messages.mes