mod timeout_stream;
mod datastore;
-use std::{cmp, env};
+use std::env;
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use std::sync::atomic::{Ordering, AtomicBool};
use std::time::{Duration, Instant};
use std::net::{SocketAddr, ToSocketAddrs};
-use bitcoin_hashes::sha256d;
-
use bitcoin::blockdata::block::Block;
use bitcoin::blockdata::constants::genesis_block;
-use bitcoin::network::constants::Network;
+use bitcoin::hash_types::{BlockHash};
+use bitcoin::network::constants::{Network, ServiceFlags};
use bitcoin::network::message::NetworkMessage;
-use bitcoin::network::message_blockdata::{GetHeadersMessage, Inventory, InvType};
+use bitcoin::network::message_blockdata::{GetHeadersMessage, Inventory};
use bitcoin::util::hash::BitcoinHash;
use printer::{Printer, Stat};
use tokio::prelude::*;
use tokio::timer::Delay;
-static mut REQUEST_BLOCK: Option<Box<Mutex<Arc<(u64, sha256d::Hash, Block)>>>> = None;
-static mut HIGHEST_HEADER: Option<Box<Mutex<(sha256d::Hash, u64)>>> = None;
-static mut HEADER_MAP: Option<Box<Mutex<HashMap<sha256d::Hash, u64>>>> = None;
-static mut HEIGHT_MAP: Option<Box<Mutex<HashMap<u64, sha256d::Hash>>>> = None;
+static mut REQUEST_BLOCK: Option<Box<Mutex<Arc<(u64, BlockHash, Block)>>>> = None;
+static mut HIGHEST_HEADER: Option<Box<Mutex<(BlockHash, u64)>>> = None;
+static mut HEADER_MAP: Option<Box<Mutex<HashMap<BlockHash, u64>>>> = None;
+static mut HEIGHT_MAP: Option<Box<Mutex<HashMap<u64, BlockHash>>>> = None;
static mut DATA_STORE: Option<Box<Store>> = None;
static mut PRINTER: Option<Box<Printer>> = None;
+static mut TOR_PROXY: Option<SocketAddr> = None;
pub static START_SHUTDOWN: AtomicBool = AtomicBool::new(false);
static SCANNING: AtomicBool = AtomicBool::new(false);
struct PeerState {
- request: Arc<(u64, sha256d::Hash, Block)>,
+ request: Arc<(u64, BlockHash, Block)>,
node_services: u64,
msg: (String, bool),
fail_reason: AddressState,
let peer = Delay::new(scan_time).then(move |_| {
printer.set_stat(Stat::NewConnection);
let timeout = store.get_u64(U64Setting::RunTimeout);
- Peer::new(node.clone(), Duration::from_secs(timeout), printer)
+ Peer::new(node.clone(), unsafe { TOR_PROXY.as_ref().unwrap() }, Duration::from_secs(timeout), printer)
});
tokio::spawn(peer.and_then(move |(mut write, read)| {
TimeoutStream::new_timeout(read, scan_time + Duration::from_secs(store.get_u64(U64Setting::RunTimeout))).map_err(move |err| {
}
state_lock.fail_reason = AddressState::TimeoutDuringRequest;
match msg {
- NetworkMessage::Version(ver) => {
+ Some(NetworkMessage::Version(ver)) => {
if ver.start_height < 0 || ver.start_height as u64 > state_lock.request.0 + 1008*2 {
state_lock.fail_reason = AddressState::HighBlockCount;
return future::err(());
state_lock.fail_reason = AddressState::LowVersion;
return future::err(());
}
- if ver.services & (1 | (1 << 10)) == 0 {
+ if !ver.services.has(ServiceFlags::NETWORK) && !ver.services.has(ServiceFlags::NETWORK_LIMITED) {
state_lock.msg = (format!("({}: services {:x})", safe_ua, ver.services), true);
state_lock.fail_reason = AddressState::NotFullNode;
return future::err(());
return future::err(());
}
check_set_flag!(recvd_version, "version");
- state_lock.node_services = ver.services;
+ state_lock.node_services = ver.services.as_u64();
state_lock.msg = (format!("(subver: {})", safe_ua), false);
if let Err(_) = write.try_send(NetworkMessage::Verack) {
return future::err(());
}
},
- NetworkMessage::Verack => {
+ Some(NetworkMessage::Verack) => {
check_set_flag!(recvd_verack, "verack");
if let Err(_) = write.try_send(NetworkMessage::Ping(state_lock.pong_nonce)) {
return future::err(());
}
},
- NetworkMessage::Ping(v) => {
+ Some(NetworkMessage::Ping(v)) => {
if let Err(_) = write.try_send(NetworkMessage::Pong(v)) {
return future::err(())
}
},
- NetworkMessage::Pong(v) => {
+ Some(NetworkMessage::Pong(v)) => {
if v != state_lock.pong_nonce {
state_lock.fail_reason = AddressState::ProtocolViolation;
state_lock.msg = ("due to invalid pong nonce".to_string(), true);
return future::err(());
}
},
- NetworkMessage::Addr(addrs) => {
+ Some(NetworkMessage::Addr(addrs)) => {
if addrs.len() > 1000 {
state_lock.fail_reason = AddressState::ProtocolViolation;
state_lock.msg = (format!("due to oversized addr: {}", addrs.len()), true);
}
if addrs.len() > 10 {
if !state_lock.recvd_addrs {
- if let Err(_) = write.try_send(NetworkMessage::GetData(vec![Inventory {
- inv_type: InvType::WitnessBlock,
- hash: state_lock.request.1,
- }])) {
+ if let Err(_) = write.try_send(NetworkMessage::GetData(vec![Inventory::WitnessBlock(state_lock.request.1)])) {
return future::err(());
}
}
}
unsafe { DATA_STORE.as_ref().unwrap() }.add_fresh_nodes(&addrs);
},
- NetworkMessage::Block(block) => {
+ Some(NetworkMessage::Block(block)) => {
if block != state_lock.request.2 {
state_lock.fail_reason = AddressState::ProtocolViolation;
state_lock.msg = ("due to bad block".to_string(), true);
check_set_flag!(recvd_block, "block");
return future::err(());
},
- NetworkMessage::Inv(invs) => {
+ Some(NetworkMessage::Inv(invs)) => {
for inv in invs {
- if inv.inv_type == InvType::Transaction {
- state_lock.fail_reason = AddressState::EvilNode;
- state_lock.msg = ("due to unrequested inv tx".to_string(), true);
- return future::err(());
+ match inv {
+ Inventory::Transaction(_) | Inventory::WitnessTransaction(_) => {
+ state_lock.fail_reason = AddressState::EvilNode;
+ state_lock.msg = ("due to unrequested inv tx".to_string(), true);
+ return future::err(());
+ }
+ _ => {},
}
}
},
- NetworkMessage::Tx(_) => {
+ Some(NetworkMessage::Tx(_)) => {
state_lock.fail_reason = AddressState::EvilNode;
state_lock.msg = ("due to unrequested transaction".to_string(), true);
return future::err(());
let printer = unsafe { PRINTER.as_ref().unwrap() };
let store = unsafe { DATA_STORE.as_ref().unwrap() };
+ let start_time = Instant::now();
let mut scan_nodes = store.get_next_scan_nodes();
printer.add_line(format!("Got {} addresses to scan", scan_nodes.len()), false);
- let per_iter_time = Duration::from_millis(1000 / store.get_u64(U64Setting::ConnsPerSec));
- let start_time = Instant::now();
- let mut iter_time = start_time;
+ if !scan_nodes.is_empty() {
+ let per_iter_time = Duration::from_millis(datastore::SECS_PER_SCAN_RESULTS * 1000 / scan_nodes.len() as u64);
+ let mut iter_time = start_time;
- for node in scan_nodes.drain(..) {
- scan_node(iter_time, node, false);
- iter_time += per_iter_time;
+ for node in scan_nodes.drain(..) {
+ scan_node(iter_time, node, false);
+ iter_time += per_iter_time;
+ }
}
- Delay::new(cmp::max(iter_time, start_time + Duration::from_secs(1))).then(|_| {
+ Delay::new(start_time + Duration::from_secs(datastore::SECS_PER_SCAN_RESULTS)).then(move |_| {
if !START_SHUTDOWN.load(Ordering::Relaxed) {
scan_net();
}
fn make_trusted_conn(trusted_sockaddr: SocketAddr, bgp_client: Arc<BGPClient>) {
let printer = unsafe { PRINTER.as_ref().unwrap() };
- let trusted_peer = Peer::new(trusted_sockaddr.clone(), Duration::from_secs(600), printer);
+ let trusted_peer = Peer::new(trusted_sockaddr.clone(), unsafe { TOR_PROXY.as_ref().unwrap() }, Duration::from_secs(600), printer);
let bgp_reload = Arc::clone(&bgp_client);
tokio::spawn(trusted_peer.and_then(move |(mut trusted_write, trusted_read)| {
printer.add_line("Connected to local peer".to_string(), false);
return future::err(());
}
match msg {
- NetworkMessage::Version(ver) => {
+ Some(NetworkMessage::Version(ver)) => {
if let Err(_) = trusted_write.try_send(NetworkMessage::Verack) {
return future::err(())
}
starting_height = ver.start_height;
},
- NetworkMessage::Verack => {
+ Some(NetworkMessage::Verack) => {
if let Err(_) = trusted_write.try_send(NetworkMessage::SendHeaders) {
return future::err(());
}
return future::err(());
}
},
- NetworkMessage::Addr(addrs) => {
+ Some(NetworkMessage::Addr(addrs)) => {
unsafe { DATA_STORE.as_ref().unwrap() }.add_fresh_nodes(&addrs);
},
- NetworkMessage::Headers(headers) => {
+ Some(NetworkMessage::Headers(headers)) => {
if headers.is_empty() {
return future::ok(());
}
printer.set_stat(printer::Stat::HeaderCount(top_height));
if top_height >= starting_height as u64 {
- if let Err(_) = trusted_write.try_send(NetworkMessage::GetData(vec![Inventory {
- inv_type: InvType::WitnessBlock,
- hash: height_map.get(&(top_height - 216)).unwrap().clone(),
- }])) {
+ if let Err(_) = trusted_write.try_send(NetworkMessage::GetData(vec![
+ Inventory::WitnessBlock(height_map.get(&(top_height - 216)).unwrap().clone())
+ ])) {
return future::err(());
}
}
return future::err(())
}
},
- NetworkMessage::Block(block) => {
+ Some(NetworkMessage::Block(block)) => {
let hash = block.header.bitcoin_hash();
let header_map = unsafe { HEADER_MAP.as_ref().unwrap() }.lock().unwrap();
let height = *header_map.get(&hash).expect("Got loose block from trusted peer we coulnd't have requested");
}
}
},
- NetworkMessage::Ping(v) => {
+ Some(NetworkMessage::Ping(v)) => {
if let Err(_) = trusted_write.try_send(NetworkMessage::Pong(v)) {
return future::err(())
}
}
fn main() {
- if env::args().len() != 4 {
- println!("USAGE: dnsseed-rust datastore localPeerAddress bgp_peer");
+ if env::args().len() != 5 {
+ println!("USAGE: dnsseed-rust datastore localPeerAddress tor_proxy_addr bgp_peer");
return;
}
unsafe { REQUEST_BLOCK = Some(Box::new(Mutex::new(Arc::new((0, genesis_block(Network::Bitcoin).bitcoin_hash(), genesis_block(Network::Bitcoin)))))) };
let trt = tokio::runtime::Builder::new()
- .blocking_threads(2).core_threads(num_cpus::get().max(1) * 3)
+ .blocking_threads(2).core_threads(num_cpus::get().max(1) * 2)
.build().unwrap();
let _ = trt.block_on_all(future::lazy(|| {
args.next();
let path = args.next().unwrap();
let trusted_sockaddr: SocketAddr = args.next().unwrap().parse().unwrap();
+
+ let tor_socks5_sockaddr: SocketAddr = args.next().unwrap().parse().unwrap();
+ unsafe { TOR_PROXY = Some(tor_socks5_sockaddr); }
+
let bgp_sockaddr: SocketAddr = args.next().unwrap().parse().unwrap();
Store::new(path).and_then(move |store| {
let store = unsafe { DATA_STORE.as_ref().unwrap() };
unsafe { PRINTER = Some(Box::new(Printer::new(store))) };
- let bgp_client = BGPClient::new(bgp_sockaddr, Duration::from_secs(600), unsafe { PRINTER.as_ref().unwrap() });
- make_trusted_conn(trusted_sockaddr, bgp_client);
+ let bgp_client = BGPClient::new(bgp_sockaddr, Duration::from_secs(60), unsafe { PRINTER.as_ref().unwrap() });
+ make_trusted_conn(trusted_sockaddr, Arc::clone(&bgp_client));
- reader::read(store, unsafe { PRINTER.as_ref().unwrap() });
+ reader::read(store, unsafe { PRINTER.as_ref().unwrap() }, bgp_client);
future::ok(())
}).or_else(|_| {
projects / dnsseed-rust / blobdiff