Commit 03713e97 authored by Jakob Otto's avatar Jakob Otto

Include review feedback

parent e512ec72
...@@ -72,7 +72,6 @@ public: ...@@ -72,7 +72,6 @@ public:
CAF_LOG_ERROR("accept failed:" << parent.system().render(x.error())); CAF_LOG_ERROR("accept failed:" << parent.system().render(x.error()));
return false; return false;
} }
// TODO this won't work anymore
auto mpx = parent.multiplexer(); auto mpx = parent.multiplexer();
if (!mpx) { if (!mpx) {
CAF_LOG_DEBUG("unable to get multiplexer from parent"); CAF_LOG_DEBUG("unable to get multiplexer from parent");
......
...@@ -49,8 +49,7 @@ public: ...@@ -49,8 +49,7 @@ public:
return handle_; return handle_;
} }
/// Returns a pointer to the multiplexer running the socket manager or /// Returns a pointer to the multiplexer running this `socket_manager`.
/// `nullptr` if the manager is no assigned to one.
multiplexer_ptr multiplexer() const { multiplexer_ptr multiplexer() const {
return parent_.lock(); return parent_.lock();
} }
......
...@@ -118,7 +118,7 @@ make_tcp_accept_socket(const uri::authority_type& node, bool reuse_addr) { ...@@ -118,7 +118,7 @@ make_tcp_accept_socket(const uri::authority_type& node, bool reuse_addr) {
if (auto ip = get_if<ip_address>(&node.host)) if (auto ip = get_if<ip_address>(&node.host))
return make_tcp_accept_socket(ip_endpoint{*ip, node.port}, reuse_addr); return make_tcp_accept_socket(ip_endpoint{*ip, node.port}, reuse_addr);
auto host = get<std::string>(node.host); auto host = get<std::string>(node.host);
auto addrs = ip::resolve(host); // TODO: switch to local_addresses() auto addrs = ip::local_addresses(host);
if (addrs.empty()) if (addrs.empty())
return make_error(sec::cannot_open_port, "no local interface available", return make_error(sec::cannot_open_port, "no local interface available",
to_string(node)); to_string(node));
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#define CAF_SUITE doorman #define CAF_SUITE net.doorman
#include "caf/net/doorman.hpp" #include "caf/net/doorman.hpp"
......
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