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
f4c7ebae
Unverified
Commit
f4c7ebae
authored
Jun 07, 2019
by
Dominik Charousset
Committed by
GitHub
Jun 07, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #846
Fix disconnect issue on Windows
parents
2f6ad935
eed5e9ca
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
53 additions
and
15 deletions
+53
-15
libcaf_io/caf/io/network/native_socket.hpp
libcaf_io/caf/io/network/native_socket.hpp
+3
-0
libcaf_io/src/default_multiplexer.cpp
libcaf_io/src/default_multiplexer.cpp
+2
-2
libcaf_io/src/native_socket.cpp
libcaf_io/src/native_socket.cpp
+11
-3
libcaf_io/src/tcp.cpp
libcaf_io/src/tcp.cpp
+22
-6
libcaf_io/src/udp.cpp
libcaf_io/src/udp.cpp
+11
-2
libcaf_openssl/src/middleman_actor.cpp
libcaf_openssl/src/middleman_actor.cpp
+4
-2
No files found.
libcaf_io/caf/io/network/native_socket.hpp
View file @
f4c7ebae
...
...
@@ -79,6 +79,9 @@ bool would_block_or_temporarily_unavailable(int errcode);
/// Returns the last socket error as human-readable string.
std
::
string
last_socket_error_as_string
();
/// Returns a human-readable string for a given socket error.
std
::
string
socket_error_as_string
(
int
errcode
);
/// Creates two connected sockets. The former is the read handle
/// and the latter is the write handle.
std
::
pair
<
native_socket
,
native_socket
>
create_pipe
();
...
...
libcaf_io/src/default_multiplexer.cpp
View file @
f4c7ebae
...
...
@@ -339,8 +339,6 @@ namespace network {
presult
=
::
poll
(
pollset_
.
data
(),
static_cast
<
nfds_t
>
(
pollset_
.
size
()),
block
?
-
1
:
0
);
# endif
CAF_LOG_DEBUG
(
"poll() on"
<<
pollset_
.
size
()
<<
"sockets reported"
<<
presult
<<
"event(s)"
);
if
(
presult
<
0
)
{
switch
(
last_socket_error
())
{
case
EINTR
:
{
...
...
@@ -362,6 +360,8 @@ namespace network {
}
continue
;
// rinse and repeat
}
CAF_LOG_DEBUG
(
"poll() on"
<<
pollset_
.
size
()
<<
"sockets reported"
<<
presult
<<
"event(s)"
);
if
(
presult
==
0
)
return
false
;
// scan pollset for events first, because we might alter pollset_
...
...
libcaf_io/src/native_socket.cpp
View file @
f4c7ebae
...
...
@@ -125,6 +125,11 @@ namespace network {
return
strerror
(
errno
);
}
string
socket_error_as_string
(
int
errcode
)
{
return
strerror
(
errcode
);
}
expected
<
void
>
child_process_inherit
(
native_socket
fd
,
bool
new_value
)
{
CAF_LOG_TRACE
(
CAF_ARG
(
fd
)
<<
CAF_ARG
(
new_value
));
// read flags for fd
...
...
@@ -187,9 +192,12 @@ namespace network {
}
string
last_socket_error_as_string
()
{
return
socket_error_as_string
(
last_socket_error
());
}
string
socket_error_as_string
(
int
errcode
)
{
LPTSTR
errorText
=
NULL
;
auto
hresult
=
last_socket_error
();
FormatMessage
(
// use system message tables to retrieve error text
FormatMessage
(
// use system message tables to retrieve error text
FORMAT_MESSAGE_FROM_SYSTEM
// allocate buffer on local heap for error text
|
FORMAT_MESSAGE_ALLOCATE_BUFFER
...
...
@@ -197,7 +205,7 @@ namespace network {
// (and CANNOT) pass insertion parameters
|
FORMAT_MESSAGE_IGNORE_INSERTS
,
nullptr
,
// unused with FORMAT_MESSAGE_FROM_SYSTEM
hresult
,
MAKELANGID
(
LANG_NEUTRAL
,
SUBLANG_DEFAULT
),
errcode
,
MAKELANGID
(
LANG_NEUTRAL
,
SUBLANG_DEFAULT
),
(
LPTSTR
)
&
errorText
,
// output
0
,
// minimum size for output buffer
nullptr
);
// arguments - see note
...
...
libcaf_io/src/tcp.cpp
View file @
f4c7ebae
...
...
@@ -20,6 +20,7 @@
#include <cstring>
#include "caf/io/network/native_socket.hpp"
#include "caf/logger.hpp"
#ifdef CAF_WINDOWS
...
...
@@ -33,7 +34,9 @@ using caf::io::network::is_error;
using
caf
::
io
::
network
::
rw_state
;
using
caf
::
io
::
network
::
native_socket
;
using
caf
::
io
::
network
::
socket_size_type
;
using
caf
::
io
::
network
::
last_socket_error
;
using
caf
::
io
::
network
::
no_sigpipe_io_flag
;
using
caf
::
io
::
network
::
socket_error_as_string
;
namespace
caf
{
namespace
policy
{
...
...
@@ -43,11 +46,18 @@ rw_state tcp::read_some(size_t& result, native_socket fd, void* buf,
CAF_LOG_TRACE
(
CAF_ARG
(
fd
)
<<
CAF_ARG
(
len
));
auto
sres
=
::
recv
(
fd
,
reinterpret_cast
<
io
::
network
::
socket_recv_ptr
>
(
buf
),
len
,
no_sigpipe_io_flag
);
CAF_LOG_DEBUG
(
CAF_ARG
(
len
)
<<
CAF_ARG
(
fd
)
<<
CAF_ARG
(
sres
));
if
(
is_error
(
sres
,
true
)
||
sres
==
0
)
{
if
(
is_error
(
sres
,
true
))
{
// Make sure WSAGetLastError gets called immediately on Windows.
auto
err
=
last_socket_error
();
CAF_IGNORE_UNUSED
(
err
);
CAF_LOG_ERROR
(
"recv failed:"
<<
socket_error_as_string
(
err
));
return
rw_state
::
failure
;
}
else
if
(
sres
==
0
)
{
// recv returns 0 when the peer has performed an orderly shutdown
CAF_LOG_DEBUG
(
"peer performed orderly shutdown"
<<
CAF_ARG
(
fd
));
return
rw_state
::
failure
;
}
CAF_LOG_DEBUG
(
CAF_ARG
(
len
)
<<
CAF_ARG
(
fd
)
<<
CAF_ARG
(
sres
));
result
=
(
sres
>
0
)
?
static_cast
<
size_t
>
(
sres
)
:
0
;
return
rw_state
::
success
;
}
...
...
@@ -57,9 +67,14 @@ rw_state tcp::write_some(size_t& result, native_socket fd, const void* buf,
CAF_LOG_TRACE
(
CAF_ARG
(
fd
)
<<
CAF_ARG
(
len
));
auto
sres
=
::
send
(
fd
,
reinterpret_cast
<
io
::
network
::
socket_send_ptr
>
(
buf
),
len
,
no_sigpipe_io_flag
);
CAF_LOG_DEBUG
(
CAF_ARG
(
len
)
<<
CAF_ARG
(
fd
)
<<
CAF_ARG
(
sres
));
if
(
is_error
(
sres
,
true
))
if
(
is_error
(
sres
,
true
))
{
// Make sure WSAGetLastError gets called immediately on Windows.
auto
err
=
last_socket_error
();
CAF_IGNORE_UNUSED
(
err
);
CAF_LOG_ERROR
(
"send failed:"
<<
socket_error_as_string
(
err
));
return
rw_state
::
failure
;
}
CAF_LOG_DEBUG
(
CAF_ARG
(
len
)
<<
CAF_ARG
(
fd
)
<<
CAF_ARG
(
sres
));
result
=
(
sres
>
0
)
?
static_cast
<
size_t
>
(
sres
)
:
0
;
return
rw_state
::
success
;
}
...
...
@@ -72,14 +87,15 @@ bool tcp::try_accept(native_socket& result, native_socket fd) {
socket_size_type
addrlen
=
sizeof
(
addr
);
result
=
::
accept
(
fd
,
reinterpret_cast
<
sockaddr
*>
(
&
addr
),
&
addrlen
);
// note accept4 is better to avoid races in setting CLOEXEC (but not posix)
child_process_inherit
(
result
,
false
);
CAF_LOG_DEBUG
(
CAF_ARG
(
fd
)
<<
CAF_ARG
(
result
));
if
(
result
==
invalid_native_socket
)
{
auto
err
=
last_socket_error
();
if
(
!
would_block_or_temporarily_unavailable
(
err
))
{
CAF_LOG_ERROR
(
"accept failed:"
<<
socket_error_as_string
(
err
));
return
false
;
}
}
child_process_inherit
(
result
,
false
);
CAF_LOG_DEBUG
(
CAF_ARG
(
fd
)
<<
CAF_ARG
(
result
));
return
true
;
}
...
...
libcaf_io/src/udp.cpp
View file @
f4c7ebae
...
...
@@ -18,6 +18,7 @@
#include "caf/policy/udp.hpp"
#include "caf/io/network/native_socket.hpp"
#include "caf/logger.hpp"
#ifdef CAF_WINDOWS
...
...
@@ -32,6 +33,8 @@ using caf::io::network::ip_endpoint;
using
caf
::
io
::
network
::
native_socket
;
using
caf
::
io
::
network
::
signed_size_type
;
using
caf
::
io
::
network
::
socket_size_type
;
using
caf
::
io
::
network
::
last_socket_error
;
using
caf
::
io
::
network
::
socket_error_as_string
;
namespace
caf
{
namespace
policy
{
...
...
@@ -44,7 +47,10 @@ bool udp::read_datagram(size_t& result, native_socket fd, void* buf,
auto
sres
=
::
recvfrom
(
fd
,
static_cast
<
io
::
network
::
socket_recv_ptr
>
(
buf
),
buf_len
,
0
,
ep
.
address
(),
&
len
);
if
(
is_error
(
sres
,
true
))
{
CAF_LOG_ERROR
(
"recvfrom returned"
<<
CAF_ARG
(
sres
));
// Make sure WSAGetLastError gets called immediately on Windows.
auto
err
=
last_socket_error
();
CAF_IGNORE_UNUSED
(
err
);
CAF_LOG_ERROR
(
"recvfrom failed:"
<<
socket_error_as_string
(
err
));
return
false
;
}
if
(
sres
==
0
)
...
...
@@ -64,7 +70,10 @@ bool udp::write_datagram(size_t& result, native_socket fd, void* buf,
auto
sres
=
::
sendto
(
fd
,
reinterpret_cast
<
io
::
network
::
socket_send_ptr
>
(
buf
),
buf_len
,
0
,
ep
.
caddress
(),
len
);
if
(
is_error
(
sres
,
true
))
{
CAF_LOG_ERROR
(
"sendto returned"
<<
CAF_ARG
(
sres
));
// Make sure WSAGetLastError gets called immediately on Windows.
auto
err
=
last_socket_error
();
CAF_IGNORE_UNUSED
(
err
);
CAF_LOG_ERROR
(
"sendto failed:"
<<
socket_error_as_string
(
err
));
return
false
;
}
result
=
(
sres
>
0
)
?
static_cast
<
size_t
>
(
sres
)
:
0
;
...
...
libcaf_openssl/src/middleman_actor.cpp
View file @
f4c7ebae
...
...
@@ -81,13 +81,15 @@ struct ssl_policy {
caf
::
io
::
network
::
socket_size_type
addrlen
=
sizeof
(
addr
);
result
=
accept
(
fd
,
reinterpret_cast
<
sockaddr
*>
(
&
addr
),
&
addrlen
);
// note accept4 is better to avoid races in setting CLOEXEC (but not posix)
io
::
network
::
child_process_inherit
(
result
,
false
);
CAF_LOG_DEBUG
(
CAF_ARG
(
fd
)
<<
CAF_ARG
(
result
));
if
(
result
==
io
::
network
::
invalid_native_socket
)
{
auto
err
=
io
::
network
::
last_socket_error
();
if
(
!
io
::
network
::
would_block_or_temporarily_unavailable
(
err
))
CAF_LOG_ERROR
(
"accept failed:"
<<
io
::
network
::
socket_error_as_string
(
err
));
return
false
;
}
io
::
network
::
child_process_inherit
(
result
,
false
);
CAF_LOG_DEBUG
(
CAF_ARG
(
fd
)
<<
CAF_ARG
(
result
));
return
session_
->
try_accept
(
result
);
}
...
...
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