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

diff --git a/src/main.rs b/src/main.rs
index 3086731..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};
@@ -194,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) {
@@ -230,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()],