BIND 10 trac826, updated. b3fff272b7cc27a9a95896a579a585265ebf18cb libasiolink
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu Jun 28 14:13:12 UTC 2012
The branch, trac826 has been updated
via b3fff272b7cc27a9a95896a579a585265ebf18cb (commit)
from b75b54a7626b03755b4680cbd24e5e9a7ef08d95 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b3fff272b7cc27a9a95896a579a585265ebf18cb
Author: Francis Dupont <fdupont at isc.org>
Date: Thu Jun 28 16:13:02 2012 +0200
libasiolink
-----------------------------------------------------------------------
Summary of changes:
src/lib/asiolink/Makefile.am | 12 +++-
src/lib/asiolink/dummy_io_cb.h | 7 ++-
src/lib/asiolink/io_address.cc | 30 ++++++----
src/lib/asiolink/io_address.h | 22 +++++--
src/lib/asiolink/io_asio_socket.h | 22 ++-----
src/lib/asiolink/io_endpoint.cc | 28 ++++++---
src/lib/asiolink/io_endpoint.h | 32 +++++++++--
src/lib/asiolink/io_message.h | 2 -
src/lib/asiolink/io_service.cc | 6 +-
src/lib/asiolink/io_socket.cc | 2 -
src/lib/asiolink/io_socket.h | 2 -
src/lib/asiolink/simple_callback.h | 4 +-
src/lib/asiolink/tcp_socket.h | 6 --
src/lib/{acl => asiolink}/tests/.gitignore | 0
src/lib/asiolink/tests/Makefile.am | 7 ++-
src/lib/asiolink/tests/interval_timer_unittest.cc | 10 ----
src/lib/asiolink/tests/io_address_unittest.cc | 16 ++++++
src/lib/asiolink/tests/io_endpoint_unittest.cc | 64 ++++++++++++++++++---
src/lib/asiolink/udp_socket.h | 2 -
19 files changed, 182 insertions(+), 92 deletions(-)
copy src/lib/{acl => asiolink}/tests/.gitignore (100%)
-----------------------------------------------------------------------
diff --git a/src/lib/asiolink/Makefile.am b/src/lib/asiolink/Makefile.am
index 22b3a8e..07c3e13 100644
--- a/src/lib/asiolink/Makefile.am
+++ b/src/lib/asiolink/Makefile.am
@@ -7,10 +7,16 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
CLEANFILES = *.gcno *.gcda
-# This is a wrapper library solely used for b10-auth. The ASIO header files
-# have some code fragments that would hit gcc's unused-parameter warning,
-# which would make the build fail with -Werror (our default setting).
+# This is a wrapper library.
+
+# The ASIO header files have some code fragments that would hit
+# gcc's unused-parameter warning, which would make the build fail
+# with -Werror (our default setting).
+
lib_LTLIBRARIES = libasiolink.la
+
+libasiolink_la_LDFLAGS = -no-undefined -version-info 1:0:1
+
libasiolink_la_SOURCES = asiolink.h
libasiolink_la_SOURCES += dummy_io_cb.h
libasiolink_la_SOURCES += interval_timer.cc interval_timer.h
diff --git a/src/lib/asiolink/dummy_io_cb.h b/src/lib/asiolink/dummy_io_cb.h
index 2081906..bcaefe9 100644
--- a/src/lib/asiolink/dummy_io_cb.h
+++ b/src/lib/asiolink/dummy_io_cb.h
@@ -39,7 +39,8 @@ public:
/// \brief Asynchronous I/O callback method
///
- /// \param error Unused
+ /// TODO: explain why this method should never be called.
+ /// This should be unused.
void operator()(asio::error_code)
{
// TODO: log an error if this method ever gets called.
@@ -47,8 +48,8 @@ public:
/// \brief Asynchronous I/O callback method
///
- /// \param error Unused
- /// \param length Unused
+ /// TODO: explain why this method should never be called.
+ /// This should be unused.
void operator()(asio::error_code, size_t)
{
// TODO: log an error if this method ever gets called.
diff --git a/src/lib/asiolink/io_address.cc b/src/lib/asiolink/io_address.cc
index dabf82d..832452c 100644
--- a/src/lib/asiolink/io_address.cc
+++ b/src/lib/asiolink/io_address.cc
@@ -14,13 +14,10 @@
#include <config.h>
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#else
#include <unistd.h> // for some IPC/network system calls
+#include <stdint.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#endif
#include <asio.hpp>
@@ -40,7 +37,7 @@ namespace asiolink {
// XXX: we cannot simply construct the address in the initialization list,
// because we'd like to throw our own exception on failure.
-IOAddress::IOAddress(const string& address_str) {
+IOAddress::IOAddress(const std::string& address_str) {
asio::error_code err;
asio_address_ = ip::address::from_string(address_str, err);
if (err) {
@@ -49,10 +46,15 @@ IOAddress::IOAddress(const string& address_str) {
}
}
-IOAddress::IOAddress(const ip::address& asio_address) :
+IOAddress::IOAddress(const asio::ip::address& asio_address) :
asio_address_(asio_address)
{}
+IOAddress::IOAddress(uint32_t v4address):
+ asio_address_(asio::ip::address_v4(v4address)) {
+
+}
+
string
IOAddress::toText() const {
return (asio_address_.to_string());
@@ -70,12 +72,7 @@ IOAddress::from_bytes(short family, const uint8_t* data) {
BOOST_STATIC_ASSERT(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN);
char addr_str[INET6_ADDRSTRLEN];
-#ifdef _WIN32
-#define DECONST (void *)
-#else
-#define DECONST
-#endif
- inet_ntop(family, DECONST data, addr_str, INET6_ADDRSTRLEN);
+ inet_ntop(family, data, addr_str, INET6_ADDRSTRLEN);
return IOAddress(string(addr_str));
}
@@ -93,5 +90,14 @@ IOAddress::getAddress() const {
return asio_address_;
}
+IOAddress::operator uint32_t() const {
+ if (getAddress().is_v4()) {
+ return (getAddress().to_v4().to_ulong());
+ } else {
+ isc_throw(BadValue, "Can't convert " << toText()
+ << " address to IPv4.");
+ }
+}
+
} // namespace asiolink
} // namespace isc
diff --git a/src/lib/asiolink/io_address.h b/src/lib/asiolink/io_address.h
index 3306341..c40e5b9 100644
--- a/src/lib/asiolink/io_address.h
+++ b/src/lib/asiolink/io_address.h
@@ -15,14 +15,11 @@
#ifndef __IO_ADDRESS_H
#define __IO_ADDRESS_H 1
-#include <stdint.h>
-
// IMPORTANT NOTE: only very few ASIO headers files can be included in
// this file. In particular, asio.hpp should never be included here.
// See the description of the namespace below.
-#ifndef _WIN32
#include <unistd.h> // for some network system calls
-#endif
+#include <stdint.h> // for uint32_t
#include <asio/ip/address.hpp>
#include <functional>
@@ -75,6 +72,15 @@ public:
IOAddress(const asio::ip::address& asio_address);
//@}
+ /// @brief Constructor for ip::address_v4 object.
+ ///
+ /// This constructor is intented to be used when constructing
+ /// IPv4 address out of uint32_t type. Passed value must be in
+ /// network byte order
+ ///
+ /// @param v4address IPv4 address represnted by uint32_t
+ IOAddress(uint32_t v4address);
+
/// \brief Convert the address to a string.
///
/// This method is basically expected to be exception free, but
@@ -143,6 +149,14 @@ public:
return (nequals(other));
}
+ /// \brief Converts IPv4 address to uint32_t
+ ///
+ /// Will throw BadValue exception if that is not IPv4
+ /// address.
+ ///
+ /// \return uint32_t that represents IPv4 address in
+ /// network byte order
+ operator uint32_t () const;
private:
asio::ip::address asio_address_;
diff --git a/src/lib/asiolink/io_asio_socket.h b/src/lib/asiolink/io_asio_socket.h
index 10fce0e..aeac63d 100644
--- a/src/lib/asiolink/io_asio_socket.h
+++ b/src/lib/asiolink/io_asio_socket.h
@@ -18,9 +18,7 @@
// IMPORTANT NOTE: only very few ASIO headers files can be included in
// this file. In particular, asio.hpp should never be included here.
// See the description of the namespace below.
-#ifndef _WIN32
#include <unistd.h> // for some network system calls
-#endif
#include <functional>
#include <string>
@@ -84,8 +82,6 @@ class IOEndpoint;
/// derived class for testing purposes rather than providing factory methods
/// (i.e., getDummy variants below).
///
-/// TODO: Check if IOAsioSocket class is still needed
-///
/// \param C Template parameter identifying type of the callback object.
template <typename C>
@@ -330,10 +326,9 @@ public:
///
/// A call that is a no-op on UDP sockets, this opens a connection to the
/// system identified by the given endpoint.
+ /// The endpoint and callback are unused.
///
- /// \param endpoint Unused
- /// \param callback Unused.
- ///false indicating that the operation completed synchronously.
+ /// \return false indicating that the operation completed synchronously.
virtual bool open(const IOEndpoint*, C&) {
return (false);
}
@@ -341,23 +336,14 @@ public:
/// \brief Send Asynchronously
///
/// Must be supplied as it is abstract in the base class.
- ///
- /// \param data Unused
- /// \param length Unused
- /// \param endpoint Unused
- /// \param callback Unused
+ /// This is unused.
virtual void asyncSend(const void*, size_t, const IOEndpoint*, C&) {
}
/// \brief Receive Asynchronously
///
/// Must be supplied as it is abstract in the base class.
- ///
- /// \param data Unused
- /// \param length Unused
- /// \param offset Unused
- /// \param endpoint Unused
- /// \param callback Unused
+ /// The parameters are unused.
virtual void asyncReceive(void* data, size_t, size_t, IOEndpoint*, C&) {
}
diff --git a/src/lib/asiolink/io_endpoint.cc b/src/lib/asiolink/io_endpoint.cc
index c1d3668..2354521 100644
--- a/src/lib/asiolink/io_endpoint.cc
+++ b/src/lib/asiolink/io_endpoint.cc
@@ -14,14 +14,6 @@
#include <config.h>
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#else
-#include <unistd.h> // for some IPC/network system calls
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
#include <asio.hpp>
#include <asiolink/io_address.h>
@@ -30,6 +22,13 @@
#include <asiolink/tcp_endpoint.h>
#include <asiolink/udp_endpoint.h>
+#include <boost/lexical_cast.hpp>
+
+#include <cassert>
+#include <unistd.h> // for some IPC/network system calls
+#include <sys/socket.h>
+#include <netinet/in.h>
+
using namespace std;
namespace isc {
@@ -62,5 +61,18 @@ IOEndpoint::operator!=(const IOEndpoint& other) const {
return (!operator==(other));
}
+ostream&
+operator<<(ostream& os, const IOEndpoint& endpoint) {
+ if (endpoint.getFamily() == AF_INET6) {
+ os << "[" << endpoint.getAddress().toText() << "]";
+ } else {
+ // In practice this should be AF_INET, but it's not guaranteed by
+ // the interface. We'll use the result of textual address
+ // representation opaquely.
+ os << endpoint.getAddress().toText();
+ }
+ os << ":" << boost::lexical_cast<string>(endpoint.getPort());
+ return (os);
+}
} // namespace asiolink
} // namespace isc
diff --git a/src/lib/asiolink/io_endpoint.h b/src/lib/asiolink/io_endpoint.h
index 14d76b6..973fc8b 100644
--- a/src/lib/asiolink/io_endpoint.h
+++ b/src/lib/asiolink/io_endpoint.h
@@ -18,11 +18,6 @@
// IMPORTANT NOTE: only very few ASIO headers files can be included in
// this file. In particular, asio.hpp should never be included here.
// See the description of the namespace below.
-#ifndef _WIN32
-#include <unistd.h> // for some network system calls
-
-#include <sys/socket.h> // for sockaddr
-#endif
#include <functional>
#include <string>
@@ -30,6 +25,12 @@
#include <exceptions/exceptions.h>
#include <asiolink/io_address.h>
+# include <ostream>
+
+#include <unistd.h> // for some network system calls
+
+#include <sys/socket.h> // for sockaddr
+
namespace isc {
namespace asiolink {
@@ -160,6 +161,27 @@ public:
const unsigned short port);
};
+/// \brief Insert the \c IOEndpoint as a string into stream.
+///
+/// This method converts \c endpoint into a string and inserts it into the
+/// output stream \c os.
+///
+/// This method converts the address and port of the endpoint in the textual
+/// format that other BIND 10 modules would use in logging, i.e.,
+/// - For IPv6 address: [<address>]:port (e.g., [2001:db8::5300]:53)
+/// - For IPv4 address: <address>:port (e.g., 192.0.2.53:5300)
+///
+/// If it's neither IPv6 nor IPv4, it converts the endpoint into text in the
+/// same format as that for IPv4, although in practice such a case is not
+/// really expected.
+///
+/// \param os A \c std::ostream object on which the insertion operation is
+/// performed.
+/// \param endpoint A reference to an \c IOEndpoint object output by the
+/// operation.
+/// \return A reference to the same \c std::ostream object referenced by
+/// parameter \c os after the insertion operation.
+std::ostream& operator<<(std::ostream& os, const IOEndpoint& endpoint);
} // namespace asiolink
} // namespace isc
#endif // __IO_ENDPOINT_H
diff --git a/src/lib/asiolink/io_message.h b/src/lib/asiolink/io_message.h
index ea2a255..81f6da1 100644
--- a/src/lib/asiolink/io_message.h
+++ b/src/lib/asiolink/io_message.h
@@ -18,9 +18,7 @@
// IMPORTANT NOTE: only very few ASIO headers files can be included in
// this file. In particular, asio.hpp should never be included here.
// See the description of the namespace below.
-#ifndef _WIN32
#include <unistd.h> // for some network system calls
-#endif
#include <functional>
#include <string>
diff --git a/src/lib/asiolink/io_service.cc b/src/lib/asiolink/io_service.cc
index e7b9f8e..15fad0c 100644
--- a/src/lib/asiolink/io_service.cc
+++ b/src/lib/asiolink/io_service.cc
@@ -14,13 +14,9 @@
#include <config.h>
-#ifdef _WIN32
-#include <ws2tcpip.h>
-#else
+#include <unistd.h> // for some IPC/network system calls
#include <netinet/in.h>
#include <sys/socket.h>
-#include <unistd.h> // for some IPC/network system calls
-#endif
#include <asio.hpp>
#include <asiolink/io_service.h>
diff --git a/src/lib/asiolink/io_socket.cc b/src/lib/asiolink/io_socket.cc
index 2e31003..e1498dc 100644
--- a/src/lib/asiolink/io_socket.cc
+++ b/src/lib/asiolink/io_socket.cc
@@ -12,8 +12,6 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <config.h>
-
#include "io_socket.h"
#include <asio.hpp>
diff --git a/src/lib/asiolink/io_socket.h b/src/lib/asiolink/io_socket.h
index 2f51895..ab6479c 100644
--- a/src/lib/asiolink/io_socket.h
+++ b/src/lib/asiolink/io_socket.h
@@ -18,9 +18,7 @@
// IMPORTANT NOTE: only very few ASIO headers files can be included in
// this file. In particular, asio.hpp should never be included here.
// See the description of the namespace below.
-#ifndef _WIN32
#include <unistd.h> // for some network system calls
-#endif
#include <functional>
#include <string>
diff --git a/src/lib/asiolink/simple_callback.h b/src/lib/asiolink/simple_callback.h
index 6cb07e2..a297a1d 100644
--- a/src/lib/asiolink/simple_callback.h
+++ b/src/lib/asiolink/simple_callback.h
@@ -49,7 +49,9 @@ protected:
///
/// This is intentionally defined as \c protected as this base class
/// should never be instantiated (except as part of a derived class).
- SimpleCallback() { self_ = this; }
+ SimpleCallback() {
+ self_ = this;
+ }
public:
/// \brief The destructor
virtual ~SimpleCallback() {}
diff --git a/src/lib/asiolink/tcp_socket.h b/src/lib/asiolink/tcp_socket.h
index b0fc4fb..2505d7b 100644
--- a/src/lib/asiolink/tcp_socket.h
+++ b/src/lib/asiolink/tcp_socket.h
@@ -20,11 +20,9 @@
#endif
#include <log/dummylog.h>
-#ifndef _WIN32
#include <netinet/in.h>
#include <sys/socket.h>
#include <unistd.h> // for some IPC/network system calls
-#endif
#include <algorithm>
#include <cassert>
@@ -43,10 +41,6 @@
#include <asiolink/io_service.h>
#include <asiolink/tcp_endpoint.h>
-#if defined(_WIN32) && defined(min)
-#undef min
-#endif
-
namespace isc {
namespace asiolink {
diff --git a/src/lib/asiolink/tests/.gitignore b/src/lib/asiolink/tests/.gitignore
new file mode 100644
index 0000000..d6d1ec8
--- /dev/null
+++ b/src/lib/asiolink/tests/.gitignore
@@ -0,0 +1 @@
+/run_unittests
diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am
index 984cf07..d0f859a 100644
--- a/src/lib/asiolink/tests/Makefile.am
+++ b/src/lib/asiolink/tests/Makefile.am
@@ -18,6 +18,9 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
CLEANFILES = *.gcno *.gcda
+TESTS_ENVIRONMENT = \
+ $(LIBTOOL) --mode=execute $(VALGRIND_COMMAND)
+
TESTS =
if HAVE_GTEST
TESTS += run_unittests
@@ -33,11 +36,11 @@ run_unittests_SOURCES += udp_socket_unittest.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libasiolink.la
+run_unittests_LDADD = $(top_builddir)/src/lib/asiolink/libasiolink.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(GTEST_LDADD)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
diff --git a/src/lib/asiolink/tests/interval_timer_unittest.cc b/src/lib/asiolink/tests/interval_timer_unittest.cc
index 9fb31db..420cb90 100644
--- a/src/lib/asiolink/tests/interval_timer_unittest.cc
+++ b/src/lib/asiolink/tests/interval_timer_unittest.cc
@@ -97,10 +97,6 @@ protected:
TimerCallBackCounter& counter_;
int count_;
int prev_counter_;
- // silence MSVC warning C4512:
- // assignment operator could not be generated
- TimerCallBackCancelDeleter&
- operator=(TimerCallBackCancelDeleter const&);
};
class TimerCallBackCanceller {
public:
@@ -114,9 +110,6 @@ protected:
private:
unsigned int& counter_;
IntervalTimer& itimer_;
- // silence MSVC warning C4512:
- // assignment operator could not be generated
- TimerCallBackCanceller& operator=(TimerCallBackCanceller const&);
};
class TimerCallBackOverwriter : public std::unary_function<void, void> {
public:
@@ -143,9 +136,6 @@ protected:
IntervalTimerTest* test_obj_;
IntervalTimer& timer_;
int count_;
- // silence MSVC warning C4512:
- // assignment operator could not be generated
- TimerCallBackOverwriter& operator=(TimerCallBackOverwriter const&);
};
protected:
IOService io_service_;
diff --git a/src/lib/asiolink/tests/io_address_unittest.cc b/src/lib/asiolink/tests/io_address_unittest.cc
index eddb0e8..4322283 100644
--- a/src/lib/asiolink/tests/io_address_unittest.cc
+++ b/src/lib/asiolink/tests/io_address_unittest.cc
@@ -83,3 +83,19 @@ TEST(IOAddressTest, from_bytes) {
});
EXPECT_EQ(addr.toText(), IOAddress("192.0.2.3").toText());
}
+
+TEST(IOAddressTest, uint32) {
+ IOAddress addr1("192.0.2.5");
+
+ // operator uint_32() is used here
+ uint32_t tmp = addr1;
+
+ uint32_t expected = (192U << 24) + (0U << 16) + (2U << 8) + 5U;
+
+ EXPECT_EQ(expected, tmp);
+
+ // now let's try opposite conversion
+ IOAddress addr3 = IOAddress(expected);
+
+ EXPECT_EQ(addr3.toText(), "192.0.2.5");
+}
diff --git a/src/lib/asiolink/tests/io_endpoint_unittest.cc b/src/lib/asiolink/tests/io_endpoint_unittest.cc
index 500eb88..27f8d12 100644
--- a/src/lib/asiolink/tests/io_endpoint_unittest.cc
+++ b/src/lib/asiolink/tests/io_endpoint_unittest.cc
@@ -13,8 +13,17 @@
// PERFORMANCE OF THIS SOFTWARE.
#include <config.h>
+
+#include <asiolink/io_endpoint.h>
+#include <asiolink/io_error.h>
+
#include <gtest/gtest.h>
+#include <boost/shared_ptr.hpp>
+
+#include <sstream>
+#include <string>
+
#ifdef _WIN32
#include <ws2tcpip.h>
#else
@@ -24,16 +33,10 @@
#endif
#include <string.h>
-#include <boost/shared_ptr.hpp>
-
-#include <asiolink/io_endpoint.h>
-#include <asiolink/io_error.h>
-
-using boost::shared_ptr;
using namespace isc::asiolink;
namespace {
-typedef shared_ptr<const IOEndpoint> ConstIOEndpointPtr;
+typedef boost::shared_ptr<const IOEndpoint> ConstIOEndpointPtr;
TEST(IOEndpointTest, createUDPv4) {
ConstIOEndpointPtr ep(IOEndpoint::create(IPPROTO_UDP,
@@ -245,4 +248,51 @@ TEST(IOEndpointTest, getSockAddr) {
sockAddrMatch(ep->getSockAddr(), "2001:db8::5300", "35");
}
+// A faked IOEndpoint for an uncommon address family. It wouldn't be possible
+// to create via the normal factory, so we define a special derived class
+// for it.
+class TestIOEndpoint : public IOEndpoint {
+ virtual IOAddress getAddress() const {
+ return IOAddress("2001:db8::bad:add");
+ }
+ virtual uint16_t getPort() const { return (42); }
+ virtual short getProtocol() const { return (IPPROTO_UDP); }
+ virtual short getFamily() const { return (AF_UNSPEC); }
+ virtual const struct sockaddr& getSockAddr() const {
+ static struct sockaddr sa_placeholder;
+ return (sa_placeholder);
+ }
+};
+
+void
+checkEndpointText(const std::string& expected, const IOEndpoint& ep) {
+ std::ostringstream oss;
+ oss << ep;
+ EXPECT_EQ(expected, oss.str());
+}
+
+// test operator<<. We simply confirm it appends the result of toText().
+TEST(IOEndpointTest, LeftShiftOperator) {
+ // UDP/IPv4
+ ConstIOEndpointPtr ep(IOEndpoint::create(IPPROTO_UDP,
+ IOAddress("192.0.2.1"), 53210));
+ checkEndpointText("192.0.2.1:53210", *ep);
+
+ // UDP/IPv6
+ ep.reset(IOEndpoint::create(IPPROTO_UDP, IOAddress("2001:db8::53"), 53));
+ checkEndpointText("[2001:db8::53]:53", *ep);
+
+ // Same for TCP: shouldn't be different
+ ep.reset(IOEndpoint::create(IPPROTO_TCP, IOAddress("192.0.2.1"), 53210));
+ checkEndpointText("192.0.2.1:53210", *ep);
+ ep.reset(IOEndpoint::create(IPPROTO_TCP, IOAddress("2001:db8::53"), 53));
+ checkEndpointText("[2001:db8::53]:53", *ep);
+
+ // Uncommon address family. The actual behavior doesn't matter much
+ // in practice, but we check such input doesn't make it crash.
+ // We explicitly instantiate the test EP because otherwise some compilers
+ // would be confused and complain.
+ TestIOEndpoint test_ep;
+ checkEndpointText("2001:db8::bad:add:42", test_ep);
+}
}
diff --git a/src/lib/asiolink/udp_socket.h b/src/lib/asiolink/udp_socket.h
index 0063744..c061fba 100644
--- a/src/lib/asiolink/udp_socket.h
+++ b/src/lib/asiolink/udp_socket.h
@@ -20,11 +20,9 @@
#endif
#include <log/dummylog.h>
-#ifndef _WIN32
#include <netinet/in.h>
#include <sys/socket.h>
#include <unistd.h> // for some IPC/network system calls
-#endif
#include <cstddef>
More information about the bind10-changes
mailing list