Commit 474738fb authored by Jakob Otto's avatar Jakob Otto

Cleanup

parent b1946595
......@@ -100,9 +100,8 @@ variant<std::pair<size_t, ip_endpoint>, sec> read(udp_datagram_socket x,
<< CAF_ARG(buf.size()) << " of " << CAF_ARG(num_bytes)
<< " bytes");
ip_endpoint ep;
// TODO: how to properly pass error further?
if (auto err = detail::convert(addr, ep))
return sec::runtime_error;
return static_cast<sec>(err.code());
return std::pair<size_t, ip_endpoint>(*num_bytes, ep);
} else {
return get<sec>(ret);
......
......@@ -77,6 +77,7 @@ CAF_TEST(send and receive) {
CAF_MESSAGE("sending data to " << to_string(ep));
CAF_CHECK_EQUAL(write(send_socket, as_bytes(make_span(hello_test)), ep),
hello_test.size());
int rounds = 0;
variant<std::pair<size_t, ip_endpoint>, sec> read_ret;
do {
read_ret = read(receive_socket, make_span(buf));
......@@ -86,6 +87,7 @@ CAF_TEST(send and receive) {
} else if (get<sec>(read_ret) != sec::unavailable_or_would_block) {
CAF_FAIL("read returned an error: " << sys.render(get<sec>(read_ret)));
}
CAF_CHECK_LESS(++rounds, 100);
} while (holds_alternative<sec>(read_ret)
&& get<sec>(read_ret) == sec::unavailable_or_would_block);
string_view received{reinterpret_cast<const char*>(buf.data()), buf.size()};
......
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