diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-06-18 14:23:59 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-06-18 14:23:59 +0200 |
commit | a237f90c5be32adb125edfa76954adefea09674b (patch) | |
tree | b1041ada449f6d9d127e83ddc71c728ca7e07a1c /contrib/epee/include/net/abstract_tcp_server.h | |
parent | Merge pull request #2059 (diff) | |
parent | abstracted nework addresses (diff) | |
download | monero-a237f90c5be32adb125edfa76954adefea09674b.tar.xz |
Merge pull request #2052
072102cf abstracted nework addresses (moneromooo-monero)
Diffstat (limited to 'contrib/epee/include/net/abstract_tcp_server.h')
-rw-r--r-- | contrib/epee/include/net/abstract_tcp_server.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server.h b/contrib/epee/include/net/abstract_tcp_server.h index 1efd5091c..000305cfa 100644 --- a/contrib/epee/include/net/abstract_tcp_server.h +++ b/contrib/epee/include/net/abstract_tcp_server.h @@ -296,7 +296,7 @@ namespace net_utils } //---------------------------------------------------------------------------------------- template<class THandler> - bool abstract_tcp_server<THandler>::invoke_connection(SOCKET hnew_sock, long ip_from, int post_from) + bool abstract_tcp_server<THandler>::invoke_connection(SOCKET hnew_sock, const network_address &remote_address) { m_connections_lock.lock(); m_connections.push_back(thread_context()); @@ -304,8 +304,7 @@ namespace net_utils m_connections.back().m_socket = hnew_sock; m_connections.back().powner = this; m_connections.back().m_self_it = --m_connections.end(); - m_connections.back().m_context.m_remote_ip = ip_from; - m_connections.back().m_context.m_remote_port = post_from; + m_connections.back().m_context.m_remote_address = remote_address; m_connections.back().m_htread = threads_helper::create_thread(ConnectionHandlerProc, &m_connections.back()); return true; |