Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Modify socket_connected event

Browse source
This commit is contained in:
Piotr Wójcik 2024-10-30 20:18:06 +01:00
commit 420d8d5359
5 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nano/core_test/network.cpp
View file

@ -1068,8 +1068,8 @@ TEST (network, purge_dead_channel)
auto & node1 = *system.add_node (flags);
node1.observers.socket_connected.add ([&] (nano::transport::tcp_socket & sock) {
system.logger.debug (nano::log::type::test, "Connected: {}", sock);
node1.observers.socket_connected.add ([&] (auto const & socket) {
system.logger.debug (nano::log::type::test, "Connected socket: {}", nano::streamed (socket));
});
auto & node2 = *system.add_node (flags);
@ -1119,8 +1119,8 @@ TEST (network, purge_dead_channel_remote)
auto & node1 = *system.add_node (flags);
auto & node2 = *system.add_node (flags);
node2.observers.socket_connected.add ([&] (nano::transport::tcp_socket & sock) {
system.logger.debug (nano::log::type::test, "Connected: {}", sock);
node2.observers.socket_connected.add ([&] (auto const & socket) {
system.logger.debug (nano::log::type::test, "Connected socket: {}", nano::streamed (socket));
});
ASSERT_EQ (node1.network.size (), 1);

2
nano/node/node_observers.hpp
View file

@ -32,7 +32,7 @@ public:
nano::observer_set<> disconnect;
nano::observer_set<nano::root const &> work_cancel;
nano::observer_set<nano::telemetry_data const &, std::shared_ptr<nano::transport::channel> const &> telemetry;
nano::observer_set<nano::transport::tcp_socket &> socket_connected;
nano::observer_set<std::shared_ptr<nano::transport::tcp_socket>> socket_connected;
nano::observer_set<std::shared_ptr<nano::transport::channel>> channel_connected;
nano::container_info container_info () const;

2
nano/node/transport/tcp_listener.cpp
View file

@ -27,7 +27,7 @@ nano::transport::tcp_listener::tcp_listener (uint16_t port_a, tcp_config const &
task{ strand }
{
connection_accepted.add ([this] (auto const & socket, auto const & server) {
node.observers.socket_connected.notify (*socket);
node.observers.socket_connected.notify (socket);
});
}

10
nano/node/transport/tcp_listener.hpp
View file

@ -80,13 +80,13 @@ public:
size_t realtime_count () const;
size_t bootstrap_count () const;
std::vector<std::shared_ptr<nano::transport::tcp_socket>> sockets () const;
std::vector<std::shared_ptr<nano::transport::tcp_server>> servers () const;
std::vector<std::shared_ptr<tcp_socket>> sockets () const;
std::vector<std::shared_ptr<tcp_server>> servers () const;
nano::container_info container_info () const;
public: // Events
using connection_accepted_event_t = nano::observer_set<std::shared_ptr<nano::transport::tcp_socket>, std::shared_ptr<nano::transport::tcp_server>>;
using connection_accepted_event_t = nano::observer_set<std::shared_ptr<tcp_socket>, std::shared_ptr<tcp_server>>;
connection_accepted_event_t connection_accepted;
private: // Dependencies
@ -135,8 +135,8 @@ private:
{
connection_type type;
asio::ip::tcp::endpoint endpoint;
std::weak_ptr<nano::transport::tcp_socket> socket;
std::weak_ptr<nano::transport::tcp_server> server;
std::weak_ptr<tcp_socket> socket;
std::weak_ptr<tcp_server> server;
asio::ip::address address () const
{

1
nano/node/transport/tcp_socket.cpp
View file

@ -85,7 +85,6 @@ void nano::transport::tcp_socket::async_connect (nano::tcp_endpoint const & endp
boost::system::error_code ec;
this_l->local = this_l->raw_socket.local_endpoint (ec);
}
node_l->observers.socket_connected.notify (*this_l);
}
callback (ec);
}));