Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-10-25 10:29:06 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-11-07 08:30:05 (GMT) |
| commit | 7eab2eb9de931236b7bbc10265b963a9948492f0 (patch) | |
| tree | 86efb533d0790fd0343a646f9032386297ba6c25 /Swiften/Network/HostAddress.cpp | |
| parent | b55dcace49c6dc8c18c854f27fbb75f96e846f24 (diff) | |
| download | swift-7eab2eb9de931236b7bbc10265b963a9948492f0.zip swift-7eab2eb9de931236b7bbc10265b963a9948492f0.tar.bz2 | |
Log address when failing to initialise HostAddress from string
Test-Information:
Builds on macOS 10.12.1.
Change-Id: Id06e66171cbc5b6417701a8de57b901b0d80f17c
Diffstat (limited to 'Swiften/Network/HostAddress.cpp')
| -rw-r--r-- | Swiften/Network/HostAddress.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Network/HostAddress.cpp b/Swiften/Network/HostAddress.cpp index a6c77f3..63cd3f2 100644 --- a/Swiften/Network/HostAddress.cpp +++ b/Swiften/Network/HostAddress.cpp @@ -1,57 +1,57 @@ /* * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Network/HostAddress.h> #include <cassert> #include <cstring> #include <string> #include <Swiften/Base/Log.h> static boost::asio::ip::address localhost4 = boost::asio::ip::address(boost::asio::ip::address_v4::loopback()); static boost::asio::ip::address localhost6 = boost::asio::ip::address(boost::asio::ip::address_v6::loopback()); namespace Swift { HostAddress::HostAddress() { } HostAddress::HostAddress(const std::string& address) { boost::system::error_code errorCode; address_ = boost::asio::ip::address::from_string(address, errorCode); if (errorCode) { - SWIFT_LOG(warning) << "error: " << errorCode.message() << std::endl; + SWIFT_LOG(warning) << "error: " << errorCode.message() << " (" << errorCode << ")" << ", " << "address: " << address << std::endl; } } HostAddress::HostAddress(const unsigned char* address, size_t length) { assert(length == 4 || length == 16); if (length == 4) { boost::asio::ip::address_v4::bytes_type data; std::memcpy(data.data(), address, length); address_ = boost::asio::ip::address(boost::asio::ip::address_v4(data)); } else { boost::asio::ip::address_v6::bytes_type data; std::memcpy(data.data(), address, length); address_ = boost::asio::ip::address(boost::asio::ip::address_v6(data)); } } HostAddress::HostAddress(const boost::asio::ip::address& address) : address_(address) { } std::string HostAddress::toString() const { std::string addressString; boost::system::error_code errorCode; addressString = address_.to_string(errorCode); if (errorCode) { SWIFT_LOG(debug) << "error: " << errorCode.message() << std::endl; } return addressString; |