Remove epee header dependency on cryptonote_core

This commit is contained in:
moneromooo-monero 2018-10-12 15:20:42 +00:00
parent 77e1ebff26
commit e736964a0c
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
7 changed files with 10 additions and 6 deletions

View File

@ -43,6 +43,8 @@
#include <boost/date_time/posix_time/posix_time.hpp> // TODO #include <boost/date_time/posix_time/posix_time.hpp> // TODO
#include <boost/thread/thread.hpp> // TODO #include <boost/thread/thread.hpp> // TODO
#include <boost/thread/condition_variable.hpp> // TODO #include <boost/thread/condition_variable.hpp> // TODO
#include "warnings.h"
#include "string_tools.h"
#include "misc_language.h" #include "misc_language.h"
#include "net/local_ip.h" #include "net/local_ip.h"
#include "pragma_comp_defs.h" #include "pragma_comp_defs.h"
@ -51,8 +53,6 @@
#include <iomanip> #include <iomanip>
#include <algorithm> #include <algorithm>
#include "../../../../src/cryptonote_core/cryptonote_core.h" // e.g. for the send_stop_signal()
#undef MONERO_DEFAULT_LOG_CATEGORY #undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net" #define MONERO_DEFAULT_LOG_CATEGORY "net"
@ -149,10 +149,8 @@ PRAGMA_WARNING_DISABLE_VS(4355)
const unsigned long ip_{boost::asio::detail::socket_ops::host_to_network_long(remote_ep.address().to_v4().to_ulong())}; const unsigned long ip_{boost::asio::detail::socket_ops::host_to_network_long(remote_ep.address().to_v4().to_ulong())};
m_local = epee::net_utils::is_ip_loopback(ip_) || epee::net_utils::is_ip_local(ip_); m_local = epee::net_utils::is_ip_loopback(ip_) || epee::net_utils::is_ip_local(ip_);
// create a random uuid // create a random uuid, we don't need crypto strength here
boost::uuids::uuid random_uuid; const boost::uuids::uuid random_uuid = boost::uuids::random_generator()();
// that stuff turns out to be included, even though it's from src... Taking advantage
random_uuid = crypto::rand<boost::uuids::uuid>();
context.set_details(random_uuid, epee::net_utils::ipv4_network_address(ip_, remote_ep.port()), is_income); context.set_details(random_uuid, epee::net_utils::ipv4_network_address(ip_, remote_ep.port()), is_income);
_dbg3("[sock " << socket_.native_handle() << "] new connection from " << print_connection_context_short(context) << _dbg3("[sock " << socket_.native_handle() << "] new connection from " << print_connection_context_short(context) <<

View File

@ -32,6 +32,7 @@
#include "string_tools.h" #include "string_tools.h"
#include "file_io_utils.h" #include "file_io_utils.h"
#include "net_parse_helpers.h" #include "net_parse_helpers.h"
#include "time_helper.h"
#undef MONERO_DEFAULT_LOG_CATEGORY #undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.http" #define MONERO_DEFAULT_LOG_CATEGORY "net.http"

View File

@ -29,6 +29,7 @@
#include <map> #include <map>
#include "cryptonote_basic/cryptonote_basic.h" #include "cryptonote_basic/cryptonote_basic.h"
#include "cryptonote_basic/tx_extra.h" #include "cryptonote_basic/tx_extra.h"
#include "cryptonote_core/cryptonote_core.h"
#include "cryptonote_core/blockchain.h" #include "cryptonote_core/blockchain.h"
#include "p2p/p2p_protocol_defs.h" #include "p2p/p2p_protocol_defs.h"
#include "net/connection_basic.hpp" #include "net/connection_basic.hpp"

View File

@ -29,6 +29,7 @@
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
#include "common/command_line.h" #include "common/command_line.h"
#include "cryptonote_core/cryptonote_core.h"
#include "net_node.h" #include "net_node.h"
namespace nodetool namespace nodetool

View File

@ -35,6 +35,7 @@
#include <string> #include <string>
#include "common/util.h" #include "common/util.h"
#include "net/http_server_impl_base.h" #include "net/http_server_impl_base.h"
#include "math_helper.h"
#include "wallet_rpc_server_commands_defs.h" #include "wallet_rpc_server_commands_defs.h"
#include "wallet2.h" #include "wallet2.h"

View File

@ -41,6 +41,7 @@
#include "misc_language.h" #include "misc_language.h"
#include "misc_log_ex.h" #include "misc_log_ex.h"
#include "storages/levin_abstract_invoke2.h" #include "storages/levin_abstract_invoke2.h"
#include "common/util.h"
#include "net_load_tests.h" #include "net_load_tests.h"

View File

@ -34,6 +34,7 @@
#include "include_base_utils.h" #include "include_base_utils.h"
#include "misc_log_ex.h" #include "misc_log_ex.h"
#include "storages/levin_abstract_invoke2.h" #include "storages/levin_abstract_invoke2.h"
#include "common/util.h"
#include "net_load_tests.h" #include "net_load_tests.h"