Request 216, not 1008 blocks ago

[dnsseed-rust] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 0f6b931c5057127e7668d4d2730a0da5d9df3b92..d359118e48053981b8882d05fef472073aa3c533 100644 (file)
--- 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);
                        }
@@ -201,19 +211,24 @@ 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;
@@ -222,14 +237,11 @@ fn scan_net() {
                        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();