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
1d2fa463
Commit
1d2fa463
authored
Sep 24, 2015
by
ufownl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow accessing underlying network address for connection handles
parent
1f0e3c52
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
140 additions
and
21 deletions
+140
-21
libcaf_io/caf/io/abstract_broker.hpp
libcaf_io/caf/io/abstract_broker.hpp
+12
-0
libcaf_io/caf/io/doorman.hpp
libcaf_io/caf/io/doorman.hpp
+1
-6
libcaf_io/caf/io/network/asio_multiplexer.hpp
libcaf_io/caf/io/network/asio_multiplexer.hpp
+2
-0
libcaf_io/caf/io/network/asio_multiplexer_impl.hpp
libcaf_io/caf/io/network/asio_multiplexer_impl.hpp
+15
-4
libcaf_io/caf/io/network/manager.hpp
libcaf_io/caf/io/network/manager.hpp
+6
-0
libcaf_io/src/abstract_broker.cpp
libcaf_io/src/abstract_broker.cpp
+15
-0
libcaf_io/src/default_multiplexer.cpp
libcaf_io/src/default_multiplexer.cpp
+67
-4
libcaf_io/src/doorman.cpp
libcaf_io/src/doorman.cpp
+2
-3
libcaf_io/src/test_multiplexer.cpp
libcaf_io/src/test_multiplexer.cpp
+20
-4
No files found.
libcaf_io/caf/io/abstract_broker.hpp
View file @
1d2fa463
...
...
@@ -159,6 +159,18 @@ public:
/// Creates and assigns a new `doorman` from given native socked `fd`.
accept_handle
add_tcp_doorman
(
network
::
native_socket
fd
);
/// Returns the remote address associated to `hdl`
/// or empty string if `hdl` is invalid.
std
::
string
remote_addr
(
connection_handle
hdl
);
/// Returns the remote port associated to `hdl`
/// or `0` if `hdl` is invalid.
uint16_t
remote_port
(
connection_handle
hdl
);
/// Returns the local address associated to `hdl`
/// or empty string if `hdl` is invalid.
std
::
string
local_addr
(
accept_handle
hdl
);
/// Returns the local port associated to `hdl` or `0` if `hdl` is invalid.
uint16_t
local_port
(
accept_handle
hdl
);
...
...
libcaf_io/caf/io/doorman.hpp
View file @
1d2fa463
...
...
@@ -35,7 +35,7 @@ namespace io {
/// @ingroup Broker
class
doorman
:
public
network
::
acceptor_manager
{
public:
doorman
(
abstract_broker
*
parent
,
accept_handle
hdl
,
uint16_t
local_port
);
doorman
(
abstract_broker
*
parent
,
accept_handle
hdl
);
~
doorman
();
...
...
@@ -48,10 +48,6 @@ public:
// needs to be launched explicitly
virtual
void
launch
()
=
0
;
uint16_t
port
()
const
{
return
port_
;
}
protected:
void
detach_from_parent
()
override
;
...
...
@@ -67,7 +63,6 @@ protected:
accept_handle
hdl_
;
message
accept_msg_
;
uint16_t
port_
;
};
}
// namespace io
...
...
libcaf_io/caf/io/network/asio_multiplexer.hpp
View file @
1d2fa463
...
...
@@ -139,6 +139,7 @@ public:
/// Returns the IO socket.
Socket
&
socket_handle
()
{
return
fd_
;
}
const
Socket
&
socket_handle
()
const
{
return
fd_
;
}
/// Initializes this stream, setting the socket handle to `fd`.
void
init
(
Socket
fd
)
{
fd_
=
std
::
move
(
fd
);
}
...
...
@@ -311,6 +312,7 @@ public:
/// Returns the IO socket.
inline
SocketAcceptor
&
socket_handle
()
{
return
accept_fd_
;
}
inline
const
SocketAcceptor
&
socket_handle
()
const
{
return
accept_fd_
;
}
/// Returns the accepted socket. This member function should
/// be called only from the `new_connection` callback.
...
...
libcaf_io/caf/io/network/asio_multiplexer_impl.hpp
View file @
1d2fa463
...
...
@@ -145,13 +145,19 @@ connection_handle asio_multiplexer::add_tcp_scribe(abstract_broker* self,
CAF_LOG_TRACE
(
""
);
stream_
.
flush
(
this
);
}
std
::
string
addr
()
const
override
{
return
stream_
.
socket_handle
().
remote_endpoint
().
address
().
to_string
();
}
uint16_t
port
()
const
override
{
return
stream_
.
socket_handle
().
remote_endpoint
().
port
();
}
void
launch
()
{
CAF_LOG_TRACE
(
""
);
CAF_ASSERT
(
!
launched_
);
launched_
=
true
;
stream_
.
start
(
this
);
}
private:
bool
launched_
;
stream
<
Socket
>
stream_
;
...
...
@@ -214,8 +220,7 @@ asio_multiplexer::add_tcp_doorman(abstract_broker* self,
public:
impl
(
abstract_broker
*
ptr
,
default_socket_acceptor
&&
s
,
network
::
asio_multiplexer
&
am
)
:
doorman
(
ptr
,
network
::
accept_hdl_from_socket
(
s
),
s
.
local_endpoint
().
port
()),
:
doorman
(
ptr
,
network
::
accept_hdl_from_socket
(
s
)),
acceptor_
(
am
,
s
.
get_io_service
())
{
acceptor_
.
init
(
std
::
move
(
s
));
}
...
...
@@ -236,7 +241,13 @@ asio_multiplexer::add_tcp_doorman(abstract_broker* self,
CAF_LOG_TRACE
(
""
);
acceptor_
.
start
(
this
);
}
std
::
string
addr
()
const
override
{
return
acceptor_
.
socket_handle
().
local_endpoint
().
address
().
to_string
();
}
uint16_t
port
()
const
override
{
return
acceptor_
.
socket_handle
().
local_endpoint
().
port
();
}
private:
network
::
acceptor
<
default_socket_acceptor
>
acceptor_
;
};
...
...
libcaf_io/caf/io/network/manager.hpp
View file @
1d2fa463
...
...
@@ -64,6 +64,12 @@ public:
/// Called by the underlying IO device to report failures.
virtual
void
io_failure
(
operation
op
)
=
0
;
/// Get the address of the underlying IO device.
virtual
std
::
string
addr
()
const
=
0
;
/// Get the port of the underlying IO device.
virtual
uint16_t
port
()
const
=
0
;
protected:
/// Creates a message signalizing a disconnect to the parent.
virtual
message
detach_message
()
=
0
;
...
...
libcaf_io/src/abstract_broker.cpp
View file @
1d2fa463
...
...
@@ -176,6 +176,21 @@ accept_handle abstract_broker::add_tcp_doorman(network::native_socket fd) {
return
backend
().
add_tcp_doorman
(
this
,
fd
);
}
std
::
string
abstract_broker
::
remote_addr
(
connection_handle
hdl
)
{
auto
i
=
scribes_
.
find
(
hdl
);
return
i
!=
scribes_
.
end
()
?
i
->
second
->
addr
()
:
std
::
string
{};
}
uint16_t
abstract_broker
::
remote_port
(
connection_handle
hdl
)
{
auto
i
=
scribes_
.
find
(
hdl
);
return
i
!=
scribes_
.
end
()
?
i
->
second
->
port
()
:
0
;
}
std
::
string
abstract_broker
::
local_addr
(
accept_handle
hdl
)
{
auto
i
=
doormen_
.
find
(
hdl
);
return
i
!=
doormen_
.
end
()
?
i
->
second
->
addr
()
:
std
::
string
{};
}
uint16_t
abstract_broker
::
local_port
(
accept_handle
hdl
)
{
auto
i
=
doormen_
.
find
(
hdl
);
return
i
!=
doormen_
.
end
()
?
i
->
second
->
port
()
:
0
;
...
...
libcaf_io/src/default_multiplexer.cpp
View file @
1d2fa463
...
...
@@ -104,7 +104,10 @@ namespace io {
namespace
network
{
// helper function
uint16_t
port_of_fd
(
native_socket
fd
);
std
::
string
local_addr_of_fd
(
native_socket
fd
);
uint16_t
local_port_of_fd
(
native_socket
fd
);
std
::
string
remote_addr_of_fd
(
native_socket
fd
);
uint16_t
remote_port_of_fd
(
native_socket
fd
);
/******************************************************************************
* platform-dependent implementations *
...
...
@@ -776,6 +779,12 @@ connection_handle default_multiplexer::add_tcp_scribe(abstract_broker* self,
CAF_LOG_TRACE
(
""
);
stream_
.
flush
(
this
);
}
std
::
string
addr
()
const
override
{
return
remote_addr_of_fd
(
stream_
.
fd
());
}
uint16_t
port
()
const
override
{
return
remote_port_of_fd
(
stream_
.
fd
());
}
void
launch
()
{
CAF_LOG_TRACE
(
""
);
CAF_ASSERT
(
!
launched_
);
...
...
@@ -799,7 +808,7 @@ default_multiplexer::add_tcp_doorman(abstract_broker* self,
class
impl
:
public
doorman
{
public:
impl
(
abstract_broker
*
ptr
,
default_socket_acceptor
&&
s
)
:
doorman
(
ptr
,
network
::
accept_hdl_from_socket
(
s
)
,
port_of_fd
(
s
.
fd
())
),
:
doorman
(
ptr
,
network
::
accept_hdl_from_socket
(
s
)),
acceptor_
(
s
.
backend
())
{
acceptor_
.
init
(
std
::
move
(
s
));
}
...
...
@@ -820,6 +829,12 @@ default_multiplexer::add_tcp_doorman(abstract_broker* self,
CAF_LOG_TRACE
(
""
);
acceptor_
.
start
(
this
);
}
std
::
string
addr
()
const
override
{
return
local_addr_of_fd
(
acceptor_
.
fd
());
}
uint16_t
port
()
const
override
{
return
local_port_of_fd
(
acceptor_
.
fd
());
}
private:
network
::
acceptor
<
default_socket_acceptor
>
acceptor_
;
};
...
...
@@ -1217,10 +1232,58 @@ new_tcp_acceptor(uint16_t port, const char* addr, bool reuse) {
bound_port
};
}
uint16_t
port_of_fd
(
native_socket
fd
)
{
std
::
string
local_addr_of_fd
(
native_socket
fd
)
{
sockaddr_storage
st
;
socklen_t
st_len
=
sizeof
(
st
);
sockaddr
*
sa
=
reinterpret_cast
<
sockaddr
*>
(
&
st
);
ccall
(
cc_zero
,
"getsockname() failed"
,
getsockname
,
fd
,
sa
,
&
st_len
);
char
addr
[
INET6_ADDRSTRLEN
]
{
0
};
switch
(
sa
->
sa_family
)
{
case
AF_INET
:
return
inet_ntop
(
AF_INET
,
&
reinterpret_cast
<
sockaddr_in
*>
(
sa
)
->
sin_addr
,
addr
,
sizeof
(
addr
));
case
AF_INET6
:
return
inet_ntop
(
AF_INET6
,
&
reinterpret_cast
<
sockaddr_in6
*>
(
sa
)
->
sin6_addr
,
addr
,
sizeof
(
addr
));
default:
break
;
}
throw
std
::
invalid_argument
(
"invalid protocol family"
);
}
uint16_t
local_port_of_fd
(
native_socket
fd
)
{
sockaddr_storage
st
;
socklen_t
st_len
=
sizeof
(
st
);
ccall
(
cc_zero
,
"getsockname() failed"
,
getsockname
,
fd
,
reinterpret_cast
<
sockaddr
*>
(
&
st
),
&
st_len
);
return
ntohs
(
port_of
(
reinterpret_cast
<
sockaddr
&>
(
st
)));
}
std
::
string
remote_addr_of_fd
(
native_socket
fd
)
{
sockaddr_storage
st
;
socklen_t
st_len
=
sizeof
(
st
);
sockaddr
*
sa
=
reinterpret_cast
<
sockaddr
*>
(
&
st
);
ccall
(
cc_zero
,
"getpeername() failed"
,
getpeername
,
fd
,
sa
,
&
st_len
);
char
addr
[
INET6_ADDRSTRLEN
]
{
0
};
switch
(
sa
->
sa_family
)
{
case
AF_INET
:
return
inet_ntop
(
AF_INET
,
&
reinterpret_cast
<
sockaddr_in
*>
(
sa
)
->
sin_addr
,
addr
,
sizeof
(
addr
));
case
AF_INET6
:
return
inet_ntop
(
AF_INET6
,
&
reinterpret_cast
<
sockaddr_in6
*>
(
sa
)
->
sin6_addr
,
addr
,
sizeof
(
addr
));
default:
break
;
}
throw
std
::
invalid_argument
(
"invalid protocol family"
);
}
uint16_t
remote_port_of_fd
(
native_socket
fd
)
{
sockaddr_storage
st
;
socklen_t
st_len
=
sizeof
(
st
);
ccall
(
cc_zero
,
"get
socketname() failed"
,
getsock
name
,
ccall
(
cc_zero
,
"get
peername() failed"
,
getpeer
name
,
fd
,
reinterpret_cast
<
sockaddr
*>
(
&
st
),
&
st_len
);
return
ntohs
(
port_of
(
reinterpret_cast
<
sockaddr
&>
(
st
)));
}
...
...
libcaf_io/src/doorman.cpp
View file @
1d2fa463
...
...
@@ -26,11 +26,10 @@
namespace
caf
{
namespace
io
{
doorman
::
doorman
(
abstract_broker
*
ptr
,
accept_handle
acc_hdl
,
uint16_t
p
)
doorman
::
doorman
(
abstract_broker
*
ptr
,
accept_handle
acc_hdl
)
:
network
::
acceptor_manager
(
ptr
),
hdl_
(
acc_hdl
),
accept_msg_
(
make_message
(
new_connection_msg
{
hdl_
,
connection_handle
{}})),
port_
(
p
)
{
accept_msg_
(
make_message
(
new_connection_msg
{
hdl_
,
connection_handle
{}}))
{
// nop
}
...
...
libcaf_io/src/test_multiplexer.cpp
View file @
1d2fa463
...
...
@@ -69,6 +69,14 @@ void test_multiplexer::assign_tcp_scribe(abstract_broker* ptr,
// nop
}
std
::
string
addr
()
const
override
{
return
std
::
string
{};
}
uint16_t
port
()
const
override
{
return
0
;
}
private:
test_multiplexer
*
mpx_
;
};
...
...
@@ -109,12 +117,12 @@ void test_multiplexer::assign_tcp_doorman(abstract_broker* ptr,
class
impl
:
public
doorman
{
public:
impl
(
abstract_broker
*
self
,
accept_handle
ah
,
test_multiplexer
*
mpx
)
:
doorman
(
self
,
ah
,
mpx
->
port
(
ah
)
),
:
doorman
(
self
,
ah
),
mpx_
(
mpx
)
{
// nop
}
void
new_connection
()
{
void
new_connection
()
override
{
auto
&
mm
=
mpx_
->
pending_connects
();
auto
i
=
mm
.
find
(
hdl
());
if
(
i
!=
mm
.
end
())
{
...
...
@@ -125,15 +133,23 @@ void test_multiplexer::assign_tcp_doorman(abstract_broker* ptr,
}
}
void
stop_reading
()
{
void
stop_reading
()
override
{
mpx_
->
stopped_reading
(
hdl
())
=
true
;
detach
(
false
);
}
void
launch
()
{
void
launch
()
override
{
// nop
}
std
::
string
addr
()
const
override
{
return
std
::
string
{};
}
uint16_t
port
()
const
override
{
return
mpx_
->
port
(
hdl
());
}
private:
test_multiplexer
*
mpx_
;
};
...
...
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