X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=dnsseed-rust;a=blobdiff_plain;f=src%2Fmain.rs;h=0f2838f68f48e29842966283ccd11d8cccf54674;hp=0f6b931c5057127e7668d4d2730a0da5d9df3b92;hb=82ab324e5e800a6dc8b952c3b776ce2f8f827f2f;hpb=21edf2b35ff92adc201314535c0f71fadcad0d77 diff --git a/src/main.rs b/src/main.rs index 0f6b931..0f2838f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -24,6 +24,7 @@ use printer::{Printer, Stat}; use peer::Peer; use datastore::{AddressState, Store, U64Setting, RegexSetting}; use timeout_stream::TimeoutStream; +use rand::Rng; use tokio::prelude::*; use tokio::timer::Delay; @@ -44,8 +45,10 @@ struct PeerState { fail_reason: AddressState, recvd_version: bool, recvd_verack: bool, + recvd_pong: bool, recvd_addrs: bool, recvd_block: bool, + pong_nonce: u64, } pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) { @@ -53,11 +56,14 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) { let printer = unsafe { PRINTER.as_ref().unwrap() }; let store = unsafe { DATA_STORE.as_ref().unwrap() }; + let mut rng = rand::thread_rng(); let peer_state = Arc::new(Mutex::new(PeerState { recvd_version: false, recvd_verack: false, + recvd_pong: false, recvd_addrs: false, recvd_block: false, + pong_nonce: rng.gen(), node_services: 0, fail_reason: AddressState::Timeout, msg: (String::new(), false), @@ -122,7 +128,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) { }, NetworkMessage::Verack => { check_set_flag!(recvd_verack, "verack"); - if let Err(_) = write.try_send(NetworkMessage::GetAddr) { + if let Err(_) = write.try_send(NetworkMessage::Ping(state_lock.pong_nonce)) { return future::err(()); } }, @@ -131,6 +137,17 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) { return future::err(()) } }, + 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(()); + } + check_set_flag!(recvd_pong, "pong"); + if let Err(_) = write.try_send(NetworkMessage::GetAddr) { + return future::err(()); + } + }, NetworkMessage::Addr(addrs) => { if addrs.len() > 1000 { state_lock.fail_reason = AddressState::ProtocolViolation; @@ -138,15 +155,17 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) { state_lock.recvd_addrs = false; return future::err(()); } - if !state_lock.recvd_addrs { - if let Err(_) = write.try_send(NetworkMessage::GetData(vec![Inventory { - inv_type: InvType::WitnessBlock, - hash: state_lock.request.1, - }])) { - return future::err(()); + 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, + }])) { + return future::err(()); + } } + state_lock.recvd_addrs = true; } - state_lock.recvd_addrs = true; unsafe { DATA_STORE.as_ref().unwrap() }.add_fresh_nodes(&addrs); }, NetworkMessage::Block(block) => { @@ -156,6 +175,12 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) { return future::err(()); } check_set_flag!(recvd_block, "block"); + return future::err(()); + }, + NetworkMessage::Tx(_) => { + state_lock.fail_reason = AddressState::ProtocolViolation; + state_lock.msg = ("due to unrequested transaction".to_string(), true); + return future::err(()); }, _ => {}, } @@ -168,8 +193,8 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) { let store = unsafe { DATA_STORE.as_ref().unwrap() }; printer.set_stat(Stat::ConnectionClosed); - let state_lock = final_peer_state.lock().unwrap(); - if state_lock.recvd_version && state_lock.recvd_verack && + let mut state_lock = final_peer_state.lock().unwrap(); + if state_lock.recvd_version && state_lock.recvd_verack && state_lock.recvd_pong && state_lock.recvd_addrs && state_lock.recvd_block { let old_state = store.set_node_state(node, AddressState::Good, state_lock.node_services); if manual || (old_state != AddressState::Good && state_lock.msg.0 != "") { @@ -177,10 +202,19 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) { } } else { assert!(state_lock.fail_reason != AddressState::Good); + if state_lock.fail_reason == AddressState::TimeoutDuringRequest && state_lock.recvd_version && state_lock.recvd_verack { + if !state_lock.recvd_pong { + state_lock.fail_reason = AddressState::TimeoutAwaitingPong; + } else if !state_lock.recvd_addrs { + state_lock.fail_reason = AddressState::TimeoutAwaitingAddr; + } else if !state_lock.recvd_block { + state_lock.fail_reason = AddressState::TimeoutAwaitingBlock; + } + } let old_state = store.set_node_state(node, state_lock.fail_reason, 0); if (manual || old_state != state_lock.fail_reason) && state_lock.fail_reason == AddressState::TimeoutDuringRequest { - printer.add_line(format!("Updating {} from {} to Timeout During Request (ver: {}, vack: {}, addr: {}, block: {})", - node, old_state.to_str(), state_lock.recvd_version, state_lock.recvd_verack, state_lock.recvd_addrs, state_lock.recvd_block), true); + printer.add_line(format!("Updating {} from {} to Timeout During Request (ver: {}, vack: {})", + node, old_state.to_str(), state_lock.recvd_version, state_lock.recvd_verack), true); } else if manual || (old_state != state_lock.fail_reason && state_lock.msg.0 != "" && state_lock.msg.1) { printer.add_line(format!("Updating {} from {} to {} {}", node, old_state.to_str(), state_lock.fail_reason.to_str(), &state_lock.msg.0), state_lock.msg.1); } @@ -201,19 +235,24 @@ fn poll_dnsseeds() { } printer.add_line(format!("Added {} new addresses from other DNS seeds", new_addrs), false); Delay::new(Instant::now() + Duration::from_secs(60)).then(|_| { - if !START_SHUTDOWN.load(Ordering::Relaxed) { - poll_dnsseeds(); - } - future::ok(()) + let store = unsafe { DATA_STORE.as_ref().unwrap() }; + store.save_data().then(|_| { + if !START_SHUTDOWN.load(Ordering::Relaxed) { + poll_dnsseeds(); + } + future::ok(()) + }) }) })); } fn scan_net() { tokio::spawn(future::lazy(|| { + let printer = unsafe { PRINTER.as_ref().unwrap() }; let store = unsafe { DATA_STORE.as_ref().unwrap() }; 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; @@ -222,14 +261,11 @@ fn scan_net() { scan_node(iter_time, node, false); iter_time += per_iter_time; } - Delay::new(cmp::max(iter_time, start_time + Duration::from_secs(15))).then(|_| { - let store = unsafe { DATA_STORE.as_ref().unwrap() }; - store.save_data().then(|_| { - if !START_SHUTDOWN.load(Ordering::Relaxed) { - scan_net(); - } - future::ok(()) - }) + Delay::new(cmp::max(iter_time, start_time + Duration::from_secs(1))).then(|_| { + if !START_SHUTDOWN.load(Ordering::Relaxed) { + scan_net(); + } + future::ok(()) }) })); } @@ -294,7 +330,7 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) { 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 - 1008)).unwrap().clone(), + hash: height_map.get(&(top_height - 216)).unwrap().clone(), }])) { return future::err(()); } @@ -315,7 +351,7 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) { 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"); - if height == unsafe { HIGHEST_HEADER.as_ref().unwrap() }.lock().unwrap().1 - 1008 { + if height == unsafe { HIGHEST_HEADER.as_ref().unwrap() }.lock().unwrap().1 - 216 { *unsafe { REQUEST_BLOCK.as_ref().unwrap() }.lock().unwrap() = Arc::new((height, hash, block)); if !SCANNING.swap(true, Ordering::SeqCst) { scan_net();