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

diff --git a/src/main.rs b/src/main.rs
index 0f14333..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),
@@ -180,7 +181,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 		} else {
 			assert!(state_lock.fail_reason != AddressState::Good);
 			let old_state = store.set_node_state(node, state_lock.fail_reason, 0);
-			if old_state != state_lock.fail_reason && state_lock.msg.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);
 			}
 		}
@@ -193,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) {
@@ -229,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()],
@@ -263,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...