X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=e040b95e7913ff1c51c7839a2d155a78c9490931;hb=b2521170a57b654f8df69aacf8ccdfdb744d5172;hp=86d394d62108345417f418d5d46d7416d37d3dc9;hpb=46abcf4ec312fddf75e60ce0fde055794b4b817a;p=dnsseed-rust

diff --git a/src/main.rs b/src/main.rs
index 86d394d..e040b95 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,7 @@ mod peer;
 mod timeout_stream;
 mod datastore;
 
-use std::env;
+use std::{cmp, env};
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 use std::sync::atomic::{Ordering, AtomicBool};
@@ -33,6 +33,7 @@ static mut HEIGHT_MAP: Option<Box<Mutex<HashMap<u64, sha256d::Hash>>>> = None;
 static mut DATA_STORE: Option<Box<Store>> = None;
 static mut PRINTER: Option<Box<Printer>> = None;
 pub static START_SHUTDOWN: AtomicBool = AtomicBool::new(false);
+static SCANNING: AtomicBool = AtomicBool::new(false);
 
 struct PeerState {
 	request: (u64, sha256d::Hash),
@@ -78,7 +79,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 				($recvd_flag: ident, $msg: expr) => { {
 					if state_lock.$recvd_flag {
 						state_lock.fail_reason = AddressState::ProtocolViolation;
-						state_lock.msg = (format!("Updating {} to ProtocolViolation due to dup {}", node, $msg), true);
+						state_lock.msg = (format!("ProtocolViolation due to dup {}", $msg), true);
 						state_lock.$recvd_flag = false;
 						return future::err(());
 					}
@@ -94,29 +95,29 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 					}
 					let safe_ua = ver.user_agent.replace(|c: char| !c.is_ascii() || c < ' ' || c > '~', "");
 					if (ver.start_height as u64) < state_lock.request.0 {
-						state_lock.msg = (format!("Updating {} to LowBlockCount ({} < {})", node, ver.start_height, state_lock.request.0), true);
+						state_lock.msg = (format!("LowBlockCount ({} < {})", ver.start_height, state_lock.request.0), true);
 						state_lock.fail_reason = AddressState::LowBlockCount;
 						return future::err(());
 					}
 					let min_version = store.get_u64(U64Setting::MinProtocolVersion);
 					if (ver.version as u64) < min_version {
-						state_lock.msg = (format!("Updating {} to LowVersion ({} < {})", node, ver.version, min_version), true);
+						state_lock.msg = (format!("LowVersion ({} < {})", ver.version, min_version), true);
 						state_lock.fail_reason = AddressState::LowVersion;
 						return future::err(());
 					}
 					if ver.services & (1 | (1 << 10)) == 0 {
-						state_lock.msg = (format!("Updating {} to NotFullNode ({}: services {:x})", node, safe_ua, ver.services), true);
+						state_lock.msg = (format!("NotFullNode ({}: services {:x})", safe_ua, ver.services), true);
 						state_lock.fail_reason = AddressState::NotFullNode;
 						return future::err(());
 					}
 					if !store.get_regex(RegexSetting::SubverRegex).is_match(&ver.user_agent) {
-						state_lock.msg = (format!("Updating {} to BadVersion subver {}", node, safe_ua), true);
+						state_lock.msg = (format!("BadVersion subver {}", safe_ua), true);
 						state_lock.fail_reason = AddressState::BadVersion;
 						return future::err(());
 					}
 					check_set_flag!(recvd_version, "version");
 					state_lock.node_services = ver.services;
-					state_lock.msg = (format!("Updating {} to Good: {}", node, safe_ua), false);
+					state_lock.msg = (format!("to Good: {}", safe_ua), false);
 					if let Err(_) = write.try_send(NetworkMessage::Verack) {
 						return future::err(());
 					}
@@ -135,15 +136,17 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 				NetworkMessage::Addr(addrs) => {
 					if addrs.len() > 1000 {
 						state_lock.fail_reason = AddressState::ProtocolViolation;
-						state_lock.msg = (format!("Updating {} to ProtocolViolation due to oversized addr: {}", node, addrs.len()), true);
+						state_lock.msg = (format!("ProtocolViolation due to oversized addr: {}", addrs.len()), true);
 						state_lock.recvd_addrs = false;
 						return future::err(());
 					}
-					if let Err(_) = write.try_send(NetworkMessage::GetData(vec![Inventory {
-						inv_type: InvType::WitnessBlock,
-						hash: state_lock.request.1,
-					}])) {
-						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(());
+						}
 					}
 					state_lock.recvd_addrs = true;
 					unsafe { DATA_STORE.as_ref().unwrap() }.add_fresh_nodes(&addrs);
@@ -152,7 +155,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 					if block.header.bitcoin_hash() != state_lock.request.1 ||
 							!block.check_merkle_root() || !block.check_witness_commitment() {
 						state_lock.fail_reason = AddressState::ProtocolViolation;
-						state_lock.msg = (format!("Updating {} to ProtocolViolation due to bad block", node), true);
+						state_lock.msg = ("ProtocolViolation due to bad block".to_string(), true);
 						return future::err(());
 					}
 					check_set_flag!(recvd_block, "block");
@@ -171,13 +174,15 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 		let state_lock = final_peer_state.lock().unwrap();
 		if state_lock.recvd_version && state_lock.recvd_verack &&
 				state_lock.recvd_addrs && state_lock.recvd_block {
-			if store.set_node_state(node, AddressState::Good, state_lock.node_services) && state_lock.msg.0 != "" {
-				printer.add_line(state_lock.msg.0.clone(), state_lock.msg.1);
+			let old_state = store.set_node_state(node, AddressState::Good, state_lock.node_services);
+			if old_state != AddressState::Good && state_lock.msg.0 != "" {
+				printer.add_line(format!("Updating {} from {} to {}", node, old_state.to_str(), &state_lock.msg.0), state_lock.msg.1);
 			}
 		} else {
 			assert!(state_lock.fail_reason != AddressState::Good);
-			if store.set_node_state(node, state_lock.fail_reason, 0) && state_lock.msg.0 != "" {
-				printer.add_line(state_lock.msg.0.clone(), state_lock.msg.1);
+			let old_state = store.set_node_state(node, state_lock.fail_reason, 0);
+			if 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.msg.0), state_lock.msg.1);
 			}
 		}
 		future::ok(())
@@ -189,13 +194,14 @@ fn scan_net() {
 		let store = unsafe { DATA_STORE.as_ref().unwrap() };
 		let mut scan_nodes = store.get_next_scan_nodes();
 		let per_iter_time = Duration::from_millis(1000 / store.get_u64(U64Setting::ConnsPerSec));
-		let mut iter_time = Instant::now();
+		let start_time = Instant::now();
+		let mut iter_time = start_time;
 
 		for node in scan_nodes.drain(..) {
 			scan_node(iter_time, node);
 			iter_time += per_iter_time;
 		}
-		Delay::new(iter_time).then(|_| {
+		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) {
@@ -225,6 +231,9 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) {
 					starting_height = ver.start_height;
 				},
 				NetworkMessage::Verack => {
+					if let Err(_) = trusted_write.try_send(NetworkMessage::SendHeaders) {
+						return future::err(());
+					}
 					if let Err(_) = trusted_write.try_send(NetworkMessage::GetHeaders(GetHeadersMessage {
 						version: 70015,
 						locator_hashes: vec![unsafe { HIGHEST_HEADER.as_ref().unwrap() }.lock().unwrap().0.clone()],
@@ -259,7 +268,9 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) {
 							= (headers.last().unwrap().bitcoin_hash(), top_height);
 						printer.set_stat(printer::Stat::HeaderCount(top_height));
 						if top_height >= starting_height as u64 {
-							scan_net();
+							if !SCANNING.swap(true, Ordering::SeqCst) {
+								scan_net();
+							}
 						}
 					} else {
 						// Wat? Lets start again...