X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.rs;h=0f2838f68f48e29842966283ccd11d8cccf54674;hb=82ab324e5e800a6dc8b952c3b776ce2f8f827f2f;hp=a1d03d2b978533266f94c80f03d25e4196387c5b;hpb=591344ed66e57115f5847b995f7ec42dc9eaa871;p=dnsseed-rust

diff --git a/src/main.rs b/src/main.rs
index a1d03d2..0f2838f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -202,8 +202,10 @@ 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 && state_lock.recvd_pong {
-				if !state_lock.recvd_addrs {
+			if state_lock.fail_reason == AddressState::TimeoutDuringRequest && state_lock.recvd_version && state_lock.recvd_verack {
+				if !state_lock.recvd_pong {
+					state_lock.fail_reason = AddressState::TimeoutAwaitingPong;
+				} else if !state_lock.recvd_addrs {
 					state_lock.fail_reason = AddressState::TimeoutAwaitingAddr;
 				} else if !state_lock.recvd_block {
 					state_lock.fail_reason = AddressState::TimeoutAwaitingBlock;
@@ -211,8 +213,8 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) {
 			}
 			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: {}, pong: {})",
-					node, old_state.to_str(), state_lock.recvd_version, state_lock.recvd_verack, state_lock.recvd_pong), 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);
 			}