Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-11-28 01:51:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2877

Browse source 
43f5269f Wallets now do not depend on the daemon rpc lib (moneromooo-monero)
bb89ae8b move connection_basic and network_throttle from src/p2p to epee (moneromooo-monero)
4abf25f3 cryptonote_core does not depend on p2p anymore (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-12-17 12:59:43 +02:00
commit 066fd7aced
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
30 changed files with 206 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cryptonote_protocol/cryptonote_protocol_handler-base.cpp
View file

@ -70,7 +70,7 @@
#include <boost/asio/ip/unicast.hpp>
#include "cryptonote_protocol_handler.h"
#include "p2p/network_throttle.hpp"
#include "net/network_throttle.hpp"
#include "cryptonote_core/cryptonote_core.h" // e.g. for the send_stop_signal()

6
src/cryptonote_protocol/cryptonote_protocol_handler.h
View file

@ -36,7 +36,6 @@
#include <boost/program_options/variables_map.hpp>
#include <string>
#include <ctime>
#include "math_helper.h"
#include "storages/levin_abstract_invoke2.h"
@ -46,8 +45,6 @@
#include "block_queue.h"
#include "cryptonote_basic/connection_context.h"
#include "cryptonote_basic/cryptonote_stat_info.h"
#include "cryptonote_basic/verification_context.h"
// #include <netinet/in.h>
#include <boost/circular_buffer.hpp>
PUSH_WARNINGS
@ -173,7 +170,4 @@ namespace cryptonote
} // namespace
#include "cryptonote_protocol_handler.inl"
POP_WARNINGS

6
src/cryptonote_protocol/cryptonote_protocol_handler.inl
View file

@ -37,11 +37,11 @@
#include <boost/interprocess/detail/atomic.hpp>
#include <list>
#include <unordered_map>
#include <ctime>
#include "cryptonote_basic/cryptonote_format_utils.h"
#include "profile_tools.h"
#include "p2p/network_throttle-detail.hpp"
#include "net/network_throttle-detail.hpp"
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.cn"
@ -1561,7 +1561,7 @@ skip:
size_t t_cryptonote_protocol_handler<t_core>::get_synchronizing_connections_count()
{
size_t count = 0;
m_p2p->for_each_connection([&](cryptonote_connection_context& context, nodetool::peerid_type peer_id)->bool{
m_p2p->for_each_connection([&](cryptonote_connection_context& context, nodetool::peerid_type peer_id, uint32_t support_flags)->bool{
if(context.m_state == cryptonote_connection_context::state_synchronizing)
++count;
return true;