aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-01-30 18:45:53 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-01-30 18:45:53 +0000
commitd97582cf95adc78e631286a609cbeccead9751de (patch)
treefabe178a5a01ea13310ecaafe2449485e3f9b718
parentepee: remove dodgy random code that nobody uses (diff)
downloadmonero-d97582cf95adc78e631286a609cbeccead9751de.tar.xz
epee: use generate_random_bytes for new random uuids
Instead of using boost::uuids::generate_random, which uses uninitialized stuff *on purpose*, just to annoy people who use valgrind
-rw-r--r--contrib/epee/include/net/abstract_tcp_server2.inl7
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 5bf65d7fd..934132ea2 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -141,7 +141,12 @@ PRAGMA_WARNING_DISABLE_VS(4355)
context = boost::value_initialized<t_connection_context>();
long ip_ = boost::asio::detail::socket_ops::host_to_network_long(remote_ep.address().to_v4().to_ulong());
- context.set_details(boost::uuids::random_generator()(), ip_, remote_ep.port(), is_income);
+ // create a random uuid
+ boost::uuids::uuid random_uuid;
+ // that stuff turns out to be included, even though it's from src... Taking advantage
+ crypto::generate_random_bytes(sizeof(random_uuid), &random_uuid);
+
+ context.set_details(random_uuid, ip_, remote_ep.port(), is_income);
_dbg3("[sock " << socket_.native_handle() << "] new connection from " << print_connection_context_short(context) <<
" to " << local_ep.address().to_string() << ':' << local_ep.port() <<
", total sockets objects " << m_ref_sock_count);