X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=d359118e48053981b8882d05fef472073aa3c533;hb=5bbc516963d4bd7ad60bb085f6ef887d46fe2d01;hp=7495d17229e035563702b458eda097416770acfb;hpb=18a1f7614129571ce67d63521e79a0fbf4d7de1b;p=dnsseed-rust

diff --git a/src/main.rs b/src/main.rs
index 7495d17..d359118 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -48,7 +48,7 @@ struct PeerState {
 	recvd_block: bool,
 }
 
-pub fn scan_node(scan_time: Instant, node: SocketAddr) {
+pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) {
 	if START_SHUTDOWN.load(Ordering::Relaxed) { return; }
 	let printer = unsafe { PRINTER.as_ref().unwrap() };
 	let store = unsafe { DATA_STORE.as_ref().unwrap() };
@@ -77,7 +77,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!("ProtocolViolation due to dup {}", $msg), true);
+						state_lock.msg = (format!("due to dup {}", $msg), true);
 						state_lock.$recvd_flag = false;
 						return future::err(());
 					}
@@ -93,29 +93,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!("LowBlockCount ({} < {})", ver.start_height, state_lock.request.0), true);
+						state_lock.msg = (format!("({} < {})", 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!("LowVersion ({} < {})", ver.version, min_version), true);
+						state_lock.msg = (format!("({} < {})", 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!("NotFullNode ({}: services {:x})", safe_ua, ver.services), true);
+						state_lock.msg = (format!("({}: 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!("BadVersion subver {}", safe_ua), true);
+						state_lock.msg = (format!("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!("to Good: {}", safe_ua), false);
+					state_lock.msg = (format!("(subver: {})", safe_ua), false);
 					if let Err(_) = write.try_send(NetworkMessage::Verack) {
 						return future::err(());
 					}
@@ -134,28 +134,31 @@ 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!("ProtocolViolation due to oversized addr: {}", addrs.len()), true);
+						state_lock.msg = (format!("due to oversized addr: {}", addrs.len()), true);
 						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) => {
 					if block != state_lock.request.2 {
 						state_lock.fail_reason = AddressState::ProtocolViolation;
-						state_lock.msg = ("ProtocolViolation due to bad block".to_string(), true);
+						state_lock.msg = ("due to bad block".to_string(), true);
 						return future::err(());
 					}
 					check_set_flag!(recvd_block, "block");
+					return future::err(());
 				},
 				_ => {},
 			}
@@ -168,21 +171,28 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr) {
 		let store = unsafe { DATA_STORE.as_ref().unwrap() };
 		printer.set_stat(Stat::ConnectionClosed);
 
-		let state_lock = final_peer_state.lock().unwrap();
+		let mut state_lock = final_peer_state.lock().unwrap();
 		if state_lock.recvd_version && state_lock.recvd_verack &&
 				state_lock.recvd_addrs && state_lock.recvd_block {
 			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);
+			if manual || (old_state != AddressState::Good && state_lock.msg.0 != "") {
+				printer.add_line(format!("Updating {} from {} to Good {}", node, old_state.to_str(), &state_lock.msg.0), state_lock.msg.1);
 			}
 		} 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_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 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);
-			} else if 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);
+			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: {})",
+					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);
 			}
 		}
 		future::ok(())
@@ -201,35 +211,37 @@ 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;
 
 		for node in scan_nodes.drain(..) {
-			scan_node(iter_time, node);
+			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 +306,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 +327,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();