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

diff --git a/src/main.rs b/src/main.rs
index 3086731..be27835 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,12 +4,12 @@ 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};
 use std::time::{Duration, Instant};
-use std::net::SocketAddr;
+use std::net::{SocketAddr, ToSocketAddrs};
 
 use bitcoin_hashes::sha256d;
 
@@ -189,18 +189,40 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 	}));
 }
 
+fn poll_dnsseeds() {
+	tokio::spawn(future::lazy(|| {
+		let printer = unsafe { PRINTER.as_ref().unwrap() };
+		let store = unsafe { DATA_STORE.as_ref().unwrap() };
+
+		let mut new_addrs = 0;
+		for seed in ["seed.bitcoin.sipa.be", "dnsseed.bitcoin.dashjr.org", "seed.bitcoinstats.com", "seed.bitcoin.jonasschnelli.ch", "seed.btc.petertodd.org", "seed.bitcoin.sprovoost.nl", "dnsseed.emzy.de"].iter() {
+			new_addrs += store.add_fresh_addrs((*seed, 8333u16).to_socket_addrs().unwrap_or(Vec::new().into_iter()));
+			new_addrs += store.add_fresh_addrs((("x9.".to_string() + seed).as_str(), 8333u16).to_socket_addrs().unwrap_or(Vec::new().into_iter()));
+		}
+		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(())
+		})
+	}));
+}
+
 fn scan_net() {
 	tokio::spawn(future::lazy(|| {
 		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 +252,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()],
@@ -266,6 +291,7 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) {
 						if top_height >= starting_height as u64 {
 							if !SCANNING.swap(true, Ordering::SeqCst) {
 								scan_net();
+								poll_dnsseeds();
 							}
 						}
 					} else {
@@ -306,8 +332,8 @@ fn main() {
 		return;
 	}
 
-	unsafe { HEADER_MAP = Some(Box::new(Mutex::new(HashMap::new()))) };
-	unsafe { HEIGHT_MAP = Some(Box::new(Mutex::new(HashMap::new()))) };
+	unsafe { HEADER_MAP = Some(Box::new(Mutex::new(HashMap::with_capacity(600000)))) };
+	unsafe { HEIGHT_MAP = Some(Box::new(Mutex::new(HashMap::with_capacity(600000)))) };
 	unsafe { HEADER_MAP.as_ref().unwrap() }.lock().unwrap().insert(genesis_block(Network::Bitcoin).bitcoin_hash(), 0);
 	unsafe { HEIGHT_MAP.as_ref().unwrap() }.lock().unwrap().insert(0, genesis_block(Network::Bitcoin).bitcoin_hash());
 	unsafe { HIGHEST_HEADER = Some(Box::new(Mutex::new((genesis_block(Network::Bitcoin).bitcoin_hash(), 0)))) };