Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
6812f901
Commit
6812f901
authored
Apr 10, 2022
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement optional timeout for TCP connections
parent
a642ccd6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
198 additions
and
29 deletions
+198
-29
libcaf_net/caf/net/socket.hpp
libcaf_net/caf/net/socket.hpp
+7
-0
libcaf_net/caf/net/stream_transport.hpp
libcaf_net/caf/net/stream_transport.hpp
+13
-0
libcaf_net/caf/net/tcp_stream_socket.hpp
libcaf_net/caf/net/tcp_stream_socket.hpp
+30
-4
libcaf_net/src/socket.cpp
libcaf_net/src/socket.cpp
+39
-7
libcaf_net/src/tcp_stream_socket.cpp
libcaf_net/src/tcp_stream_socket.cpp
+109
-18
No files found.
libcaf_net/caf/net/socket.hpp
View file @
6812f901
...
...
@@ -74,6 +74,13 @@ bool CAF_NET_EXPORT last_socket_error_is_temporary();
/// @relates socket
std
::
string
CAF_NET_EXPORT
last_socket_error_as_string
();
/// Queries whether `x` is a valid and connected socket by reading the socket
/// option `SO_ERROR`. Sets the last socket error in case the socket entered an
/// error state.
/// @returns `true` if no error is pending on `x`, `false` otherwise.
/// @relates socket
bool
CAF_NET_EXPORT
probe
(
socket
x
);
/// Sets x to be inherited by child processes if `new_value == true`
/// or not if `new_value == false`. Not implemented on Windows.
/// @relates socket
...
...
libcaf_net/caf/net/stream_transport.hpp
View file @
6812f901
...
...
@@ -44,6 +44,19 @@ public:
:
stream_transport_error
::
permanent
;
}
/// Checks whether connecting a non-blocking socket was successful.
static
ptrdiff_t
connect
(
stream_socket
x
)
{
// A connection is established if the OS reports a socket as ready for read
// or write and if there is no error on the socket.
return
net
::
probe
(
x
)
?
1
:
-
1
;
}
/// Convenience function that always returns 1. Exists to make writing code
/// against multiple policies easier by providing the same interface.
static
ptrdiff_t
accept
(
stream_socket
)
{
return
1
;
}
/// Returns the number of bytes that are buffered internally and that
/// available for immediate read.
static
constexpr
size_t
buffered
()
{
...
...
libcaf_net/caf/net/tcp_stream_socket.hpp
View file @
6812f901
...
...
@@ -8,6 +8,7 @@
#include "caf/ip_endpoint.hpp"
#include "caf/net/socket.hpp"
#include "caf/net/stream_socket.hpp"
#include "caf/timespan.hpp"
#include "caf/uri.hpp"
namespace
caf
::
net
{
...
...
@@ -21,16 +22,41 @@ struct CAF_NET_EXPORT tcp_stream_socket : stream_socket {
/// Creates a `tcp_stream_socket` connected to given remote node.
/// @param node Host and port of the remote node.
/// @param timeout Maximum waiting time on the connection before canceling it.
/// @returns The connected socket or an error.
/// @relates tcp_stream_socket
expected
<
tcp_stream_socket
>
CAF_NET_EXPORT
make_connected_tcp_stream_socket
(
ip_endpoint
nod
e
);
expected
<
tcp_stream_socket
>
CAF_NET_EXPORT
//
make_connected_tcp_stream_socket
(
ip_endpoint
node
,
timespan
timeout
=
infinit
e
);
/// Creates a `tcp_stream_socket` connected to @p auth.
/// @param auth Host and port of the remote node.
/// @param timeout Maximum waiting time on the connection before canceling it.
/// @returns The connected socket or an error.
/// @note The timeout applies to a *single* connection attempt. If the DNS
/// lookup for @p auth returns more than one possible IP address then the
/// @p timeout applies to each connection attempt individually. For
/// example, passing a timeout of one second with a DNS result of five
/// entries would mean this function can block up to five seconds if all
/// attempts time out.
/// @relates tcp_stream_socket
expected
<
tcp_stream_socket
>
CAF_NET_EXPORT
make_connected_tcp_stream_socket
(
const
uri
::
authority_type
&
auth
);
expected
<
tcp_stream_socket
>
CAF_NET_EXPORT
//
make_connected_tcp_stream_socket
(
const
uri
::
authority_type
&
auth
,
timespan
timeout
=
infinite
);
/// Creates a `tcp_stream_socket` connected to given @p host and @p port.
/// @param host TCP endpoint for connecting to.
/// @param port TCP port of the server.
/// @param timeout Maximum waiting time on the connection before canceling it.
/// @returns The connected socket or an error.
/// @note The timeout applies to a *single* connection attempt. If the DNS
/// lookup for @p auth returns more than one possible IP address then the
/// @p timeout applies to each connection attempt individually. For
/// example, passing a timeout of one second with a DNS result of five
/// entries would mean this function can block up to five seconds if all
/// attempts time out.
/// @relates tcp_stream_socket
expected
<
tcp_stream_socket
>
CAF_NET_EXPORT
//
make_connected_tcp_stream_socket
(
std
::
string
host
,
uint16_t
port
,
timespan
timeout
=
infinite
);
}
// namespace caf::net
libcaf_net/src/socket.cpp
View file @
6812f901
...
...
@@ -91,8 +91,14 @@ std::errc last_socket_error() {
}
bool
last_socket_error_is_temporary
()
{
int
wsa_code
=
WSAGetLastError
();
return
wsa_code
==
WSAEWOULDBLOCK
||
wsa_code
==
WSATRY_AGAIN
;
switch
(
WSAGetLastError
())
{
case
WSATRY_AGAIN
:
case
WSAEINPROGRESS
:
case
WSAEWOULDBLOCK
:
return
true
;
default:
return
false
;
}
}
std
::
string
last_socket_error_as_string
()
{
...
...
@@ -115,6 +121,17 @@ bool would_block_or_temporarily_unavailable(int errcode) {
return
errcode
==
WSAEWOULDBLOCK
||
errcode
==
WSATRY_AGAIN
;
}
bool
probe
(
socket
x
)
{
auto
err
=
0
;
auto
len
=
static_cast
<
socklen_t
>
(
sizeof
(
err
));
if
(
getsockopt
(
x
.
id
,
SOL_SOCKET
,
SO_ERROR
,
&
err
,
&
len
)
==
0
)
{
WSASetLastError
(
err
);
return
err
==
0
;
}
else
{
return
false
;
}
}
error
child_process_inherit
(
socket
x
,
bool
)
{
// TODO: possible to implement via SetHandleInformation?
if
(
x
==
invalid_socket
)
...
...
@@ -143,12 +160,16 @@ std::errc last_socket_error() {
}
bool
last_socket_error_is_temporary
()
{
auto
code
=
errno
;
# if EAGAIN == EWOULDBLOCK
return
code
==
EAGAIN
;
#
else
return
code
==
EAGAIN
||
code
==
EWOULDBLOCK
;
switch
(
errno
)
{
case
EAGAIN
:
case
EINPROGRESS
:
#
if EAGAIN != EWOULDBLOCK
case
EWOULDBLOCK
:
# endif
return
true
;
default:
return
false
;
}
}
std
::
string
last_socket_error_as_string
()
{
...
...
@@ -159,6 +180,17 @@ bool would_block_or_temporarily_unavailable(int errcode) {
return
errcode
==
EAGAIN
||
errcode
==
EWOULDBLOCK
;
}
bool
probe
(
socket
x
)
{
auto
err
=
0
;
auto
len
=
static_cast
<
socklen_t
>
(
sizeof
(
err
));
if
(
getsockopt
(
x
.
id
,
SOL_SOCKET
,
SO_ERROR
,
&
err
,
&
len
)
==
0
)
{
errno
=
err
;
return
err
==
0
;
}
else
{
return
false
;
}
}
error
child_process_inherit
(
socket
x
,
bool
new_value
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
x
)
<<
CAF_ARG
(
new_value
));
// read flags for x
...
...
libcaf_net/src/tcp_stream_socket.cpp
View file @
6812f901
...
...
@@ -15,31 +15,115 @@
#include "caf/sec.hpp"
#include "caf/variant.hpp"
#include <algorithm>
#ifndef CAF_WINDOWS
# include <poll.h>
#endif
#ifdef CAF_WINDOWS
# define POLL_FN ::WSAPoll
#else
# define POLL_FN ::poll
#endif
namespace
caf
::
net
{
namespace
{
bool
connect_with_timeout
(
stream_socket
fd
,
const
sockaddr
*
addr
,
socklen_t
addrlen
,
timespan
timeout
)
{
namespace
sc
=
std
::
chrono
;
CAF_LOG_TRACE
(
CAF_ARG
(
fd
.
id
)
<<
CAF_ARG
(
timeout
));
// Set to non-blocking or fail.
if
(
auto
err
=
nonblocking
(
fd
,
true
))
return
false
;
// Calculate deadline and define a lambda for getting the relative time in ms.
auto
deadline
=
sc
::
steady_clock
::
now
()
+
timeout
;
auto
ms_until_deadline
=
[
deadline
]
{
auto
t
=
sc
::
steady_clock
::
now
();
auto
ms_count
=
sc
::
duration_cast
<
sc
::
milliseconds
>
(
deadline
-
t
).
count
();
return
std
::
max
(
static_cast
<
int
>
(
ms_count
),
0
);
};
// Call connect() once and see if it succeeds. Otherwise enter a poll()-loop.
if
(
connect
(
fd
.
id
,
addr
,
addrlen
)
==
0
)
{
// Done! Try restoring the socket to blocking and return.
if
(
auto
err
=
nonblocking
(
fd
,
false
))
return
false
;
else
return
true
;
}
else
if
(
!
last_socket_error_is_temporary
())
{
// Hard error. No need to restore the socket to blocking since we are going
// to close it.
return
false
;
}
else
{
// Loop until the reaching the deadline.
pollfd
pollset
[
1
];
pollset
[
0
].
fd
=
fd
.
id
;
pollset
[
0
].
events
=
POLLOUT
;
auto
ms
=
ms_until_deadline
();
do
{
auto
pres
=
POLL_FN
(
pollset
,
1
,
ms
);
if
(
pres
>
0
)
{
// Check that the socket really is ready to go by reading SO_ERROR.
if
(
probe
(
fd
))
{
// Done! Try restoring the socket to blocking and return.
if
(
auto
err
=
nonblocking
(
fd
,
false
))
return
false
;
else
return
true
;
}
else
{
return
false
;
}
}
else
if
(
pres
<
0
&&
!
last_socket_error_is_temporary
())
{
return
false
;
}
// Else: timeout or EINTR. Try-again.
ms
=
ms_until_deadline
();
}
while
(
ms
>
0
);
}
// No need to restore the socket to blocking since we are going to close it.
return
false
;
}
template
<
int
Family
>
bool
ip_connect
(
stream_socket
fd
,
std
::
string
host
,
uint16_t
port
)
{
bool
ip_connect
(
stream_socket
fd
,
std
::
string
host
,
uint16_t
port
,
timespan
timeout
)
{
CAF_LOG_TRACE
(
"Family ="
<<
(
Family
==
AF_INET
?
"AF_INET"
:
"AF_INET6"
)
<<
CAF_ARG
(
fd
.
id
)
<<
CAF_ARG
(
host
)
<<
CAF_ARG
(
port
));
<<
CAF_ARG
(
fd
.
id
)
<<
CAF_ARG
(
host
)
<<
CAF_ARG
(
port
)
<<
CAF_ARG
(
timeout
));
static_assert
(
Family
==
AF_INET
||
Family
==
AF_INET6
,
"invalid family"
);
using
sockaddr_type
=
typename
std
::
conditional
<
Family
==
AF_INET
,
sockaddr_in
,
sockaddr_in6
>::
type
;
sockaddr_type
sa
;
memset
(
&
sa
,
0
,
sizeof
(
sockaddr_type
));
inet_pton
(
Family
,
host
.
c_str
(),
&
detail
::
addr_of
(
sa
));
detail
::
family_of
(
sa
)
=
Family
;
detail
::
port_of
(
sa
)
=
htons
(
port
);
using
sa_ptr
=
const
sockaddr
*
;
return
::
connect
(
fd
.
id
,
reinterpret_cast
<
sa_ptr
>
(
&
sa
),
sizeof
(
sa
))
==
0
;
if
(
inet_pton
(
Family
,
host
.
c_str
(),
&
detail
::
addr_of
(
sa
))
==
1
)
{
detail
::
family_of
(
sa
)
=
Family
;
detail
::
port_of
(
sa
)
=
htons
(
port
);
using
sa_ptr
=
const
sockaddr
*
;
if
(
timeout
==
infinite
)
{
return
::
connect
(
fd
.
id
,
reinterpret_cast
<
sa_ptr
>
(
&
sa
),
sizeof
(
sa
))
==
0
;
}
else
{
return
connect_with_timeout
(
fd
,
reinterpret_cast
<
sa_ptr
>
(
&
sa
),
sizeof
(
sa
),
timeout
);
}
}
else
{
CAF_LOG_DEBUG
(
"inet_pton failed to parse"
<<
host
<<
"for family"
<<
(
Family
==
AF_INET
?
"AF_INET"
:
"AF_INET6"
));
return
false
;
}
}
}
// namespace
expected
<
tcp_stream_socket
>
make_connected_tcp_stream_socket
(
ip_endpoint
node
)
{
CAF_LOG_DEBUG
(
"tcp connect to: "
<<
to_string
(
node
));
expected
<
tcp_stream_socket
>
make_connected_tcp_stream_socket
(
ip_endpoint
node
,
timespan
timeout
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
node
)
<<
CAF_ARG
(
timeout
));
CAF_LOG_DEBUG_IF
(
timeout
==
infinite
,
"try to connect to TCP node"
<<
node
);
CAF_LOG_DEBUG_IF
(
timeout
!=
infinite
,
"try to connect to TCP node"
<<
node
<<
"with timeout"
<<
timeout
);
auto
proto
=
node
.
address
().
embeds_v4
()
?
AF_INET
:
AF_INET6
;
int
socktype
=
SOCK_STREAM
;
#ifdef SOCK_CLOEXEC
...
...
@@ -51,21 +135,25 @@ expected<tcp_stream_socket> make_connected_tcp_stream_socket(ip_endpoint node) {
return
err
;
auto
sguard
=
make_socket_guard
(
sock
);
if
(
proto
==
AF_INET6
)
{
if
(
ip_connect
<
AF_INET6
>
(
sock
,
to_string
(
node
.
address
()),
node
.
port
()))
{
CAF_LOG_INFO
(
"successfully connected to (IPv6):"
<<
to_string
(
node
));
if
(
ip_connect
<
AF_INET6
>
(
sock
,
to_string
(
node
.
address
()),
node
.
port
(),
timeout
))
{
CAF_LOG_INFO
(
"established TCP connection to IPv6 node"
<<
to_string
(
node
));
return
sguard
.
release
();
}
}
else
if
(
ip_connect
<
AF_INET
>
(
sock
,
to_string
(
node
.
address
().
embedded_v4
()),
node
.
port
()))
{
CAF_LOG_INFO
(
"
successfully connected to (IPv4):
"
<<
to_string
(
node
));
node
.
port
()
,
timeout
))
{
CAF_LOG_INFO
(
"
established TCP connection to IPv4 node
"
<<
to_string
(
node
));
return
sguard
.
release
();
}
CAF_LOG_
WARNING
(
"could not connect to: "
<<
to_string
(
node
)
);
CAF_LOG_
INFO
(
"failed to connect to"
<<
node
);
return
make_error
(
sec
::
cannot_connect_to_node
);
}
expected
<
tcp_stream_socket
>
make_connected_tcp_stream_socket
(
const
uri
::
authority_type
&
node
)
{
make_connected_tcp_stream_socket
(
const
uri
::
authority_type
&
node
,
timespan
timeout
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
node
)
<<
CAF_ARG
(
timeout
));
auto
port
=
node
.
port
;
if
(
port
==
0
)
return
make_error
(
sec
::
cannot_connect_to_node
,
"port is zero"
);
...
...
@@ -77,18 +165,21 @@ make_connected_tcp_stream_socket(const uri::authority_type& node) {
if
(
addrs
.
empty
())
return
make_error
(
sec
::
cannot_connect_to_node
,
"empty authority"
);
for
(
auto
&
addr
:
addrs
)
{
if
(
auto
sock
=
make_connected_tcp_stream_socket
(
ip_endpoint
{
addr
,
port
}))
auto
ep
=
ip_endpoint
{
addr
,
port
};
if
(
auto
sock
=
make_connected_tcp_stream_socket
(
ep
,
timeout
))
return
*
sock
;
}
return
make_error
(
sec
::
cannot_connect_to_node
,
to_string
(
node
));
}
expected
<
tcp_stream_socket
>
make_connected_tcp_stream_socket
(
std
::
string
host
,
uint16_t
port
)
{
uint16_t
port
,
timespan
timeout
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
host
)
<<
CAF_ARG
(
port
)
<<
CAF_ARG
(
timeout
));
uri
::
authority_type
auth
;
auth
.
host
=
std
::
move
(
host
);
auth
.
port
=
port
;
return
make_connected_tcp_stream_socket
(
auth
);
return
make_connected_tcp_stream_socket
(
auth
,
timeout
);
}
}
// namespace caf::net
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment