Commit 79405550 authored by Dominik Charousset's avatar Dominik Charousset

maintenance

parent 94adf390
...@@ -44,7 +44,7 @@ class ipv4_acceptor : public acceptor { ...@@ -44,7 +44,7 @@ class ipv4_acceptor : public acceptor {
public: public:
static std::unique_ptr<acceptor> create(std::uint16_t port, static std::unique_ptr<acceptor> create(std::uint16_t port,
const char* addr); const char* addr = nullptr);
~ipv4_acceptor(); ~ipv4_acceptor();
......
...@@ -60,21 +60,19 @@ atom_value default_protocol::identifier() const { ...@@ -60,21 +60,19 @@ atom_value default_protocol::identifier() const {
} }
void default_protocol::publish(const actor_ptr& whom, variant_args args) { void default_protocol::publish(const actor_ptr& whom, variant_args args) {
CPPA_LOG_TRACE("whom: " << to_string(whom) CPPA_LOG_TRACE(CPPA_TARG(whom, to_string)
<< ", args.size() = " << args.size()); << ", args.size() = " << args.size());
if (!whom) return; if (!whom) return;
CPPA_REQUIRE(args.size() == 2 || args.size() == 1); CPPA_REQUIRE(args.size() == 2 || args.size() == 1);
auto i = args.begin(); auto i = args.begin();
if (args.size() == 1) { if (args.size() == 1) {
auto port = get<uint16_t>(*i++); auto port = get<uint16_t>(*i++);
publish(whom, publish(whom, ipv4_acceptor::create(port), {});
unique_ptr<acceptor>(ipv4_acceptor::create(port, nullptr)),
{});
} }
else if (args.size() == 2) { else if (args.size() == 2) {
auto port = get<uint16_t>(*i++); auto port = get<uint16_t>(*i++);
auto& addr = get<string>(*i); auto& addr = get<string>(*i);
publish(whom, unique_ptr<acceptor>(ipv4_acceptor::create(port, addr.c_str())), {}); publish(whom, ipv4_acceptor::create(port, addr.c_str()), {});
} }
else throw logic_error("wrong number of arguments, expected one or two"); else throw logic_error("wrong number of arguments, expected one or two");
} }
...@@ -82,8 +80,7 @@ void default_protocol::publish(const actor_ptr& whom, variant_args args) { ...@@ -82,8 +80,7 @@ void default_protocol::publish(const actor_ptr& whom, variant_args args) {
void default_protocol::publish(const actor_ptr& whom, void default_protocol::publish(const actor_ptr& whom,
std::unique_ptr<acceptor> ptr, std::unique_ptr<acceptor> ptr,
variant_args args ) { variant_args args ) {
CPPA_LOG_TRACE("whom: " << to_string(whom) CPPA_LOG_TRACE(CPPA_TARG(whom, to_string) << ", " << CPPA_MARG(ptr, get)
<< ", ptr = " << ptr.get()
<< ", args.size() = " << args.size()); << ", args.size() = " << args.size());
if (!whom) return; if (!whom) return;
CPPA_REQUIRE(args.size() == 0); CPPA_REQUIRE(args.size() == 0);
......
...@@ -103,7 +103,7 @@ ipv4_acceptor::ipv4_acceptor(native_socket_type fd, bool nonblocking) ...@@ -103,7 +103,7 @@ ipv4_acceptor::ipv4_acceptor(native_socket_type fd, bool nonblocking)
: m_fd(fd), m_is_nonblocking(nonblocking) { } : m_fd(fd), m_is_nonblocking(nonblocking) { }
std::unique_ptr<acceptor> ipv4_acceptor::create(std::uint16_t port, std::unique_ptr<acceptor> ipv4_acceptor::create(std::uint16_t port,
const char* addr) { const char* addr) {
native_socket_type sockfd; native_socket_type sockfd;
sockfd = socket(AF_INET, SOCK_STREAM, 0); sockfd = socket(AF_INET, SOCK_STREAM, 0);
if (sockfd == invalid_socket) { if (sockfd == invalid_socket) {
......
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