X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=30c363541ceacd3f269c0aa676da6b95afb18c10;hb=eab7aa919b970eaf32fe93ec4407750b2d2afdab;hp=8b49782a29b3cf220af245010611a1a3b2419be4;hpb=fa44fd6c5494d91c3aea82ac33e4af7c08bd87bc;p=dnsseed-rust

diff --git a/src/main.rs b/src/main.rs
index 8b49782..30c3635 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -138,15 +138,17 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) {
 						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) => {
@@ -156,6 +158,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) {
 						return future::err(());
 					}
 					check_set_flag!(recvd_block, "block");
+					return future::err(());
 				},
 				_ => {},
 			}
@@ -168,7 +171,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) {
 		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);
@@ -177,10 +180,17 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) {
 			}
 		} 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 (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: {}, addr: {}, block: {})",
-					node, old_state.to_str(), state_lock.recvd_version, state_lock.recvd_verack, state_lock.recvd_addrs, state_lock.recvd_block), true);
+				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);
 			}