Send trusted peer a sendheaders

[dnsseed-rust] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index ae38a5bc3e6845fcf3a658812f49233339673873..2c4acee6b7e393ca65278d318e414c2242b3d5ab 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,6 +33,7 @@ static mut HEIGHT_MAP: Option<Box<Mutex<HashMap<u64, sha256d::Hash>>>> = None;
 static mut DATA_STORE: Option<Box<Store>> = None;
 static mut PRINTER: Option<Box<Printer>> = None;
 pub static START_SHUTDOWN: AtomicBool = AtomicBool::new(false);
+static SCANNING: AtomicBool = AtomicBool::new(false);
 
 struct PeerState {
        request: (u64, sha256d::Hash),
@@ -229,6 +230,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()],
@@ -263,7 +267,9 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) {
                                                        = (headers.last().unwrap().bitcoin_hash(), top_height);
                                                printer.set_stat(printer::Stat::HeaderCount(top_height));
                                                if top_height >= starting_height as u64 {
-                                                       scan_net();
+                                                       if !SCANNING.swap(true, Ordering::SeqCst) {
+                                                               scan_net();
+                                                       }
                                                }
                                        } else {
                                                // Wat? Lets start again...