Fix was_good timer check

[dnsseed-rust] / src / datastore.rs

diff --git a/src/datastore.rs b/src/datastore.rs
index 309d361fbb70517daf5159ae7d6c5958bfcc9c2c..53f03edb24fdd664a5de2583764e9222d172380d 100644 (file)
--- a/src/datastore.rs
+++ b/src/datastore.rs
@@ -46,9 +46,10 @@ pub enum RegexSetting {
 }
 
 struct Node {
-       state: AddressState,
-       last_services: u64,
        last_update: Instant,
+       last_good: Instant, // Ignored unless state is Good or WasGood
+       last_services: u64,
+       state: AddressState,
 }
 
 struct Nodes {
@@ -200,6 +201,7 @@ impl Store {
                                        },
                                        last_services,
                                        last_update: Instant::now(),
+                                       last_good: Instant::now(),
                                };
                                if node.state == AddressState::Good {
                                        for i in 0..64 {
@@ -256,6 +258,7 @@ impl Store {
                                                        state: AddressState::Untested,
                                                        last_services: 0,
                                                        last_update: cur_time,
+                                                       last_good: Instant::now(),
                                                });
                                                nodes.state_next_scan.get_mut(&AddressState::Untested).unwrap().push((cur_time, socketaddr));
                                        },
@@ -267,12 +270,15 @@ impl Store {
                }
        }
 
-       pub fn set_node_state(&self, addr: SocketAddr, state: AddressState, services: u64) {
+       pub fn set_node_state(&self, addr: SocketAddr, state: AddressState, services: u64) -> bool {
                let mut nodes_lock = self.nodes.write().unwrap();
                let nodes = nodes_lock.borrow_mut();
                let state_ref = nodes.nodes_to_state.get_mut(&addr).unwrap();
-               state_ref.last_update = Instant::now();
-               if state_ref.state == AddressState::Good && state != AddressState::Good {
+               let ret = state != state_ref.state;
+               let now = Instant::now();
+               if (state_ref.state == AddressState::Good || state_ref.state == AddressState::WasGood)
+                               && state != AddressState::Good
+                               && state_ref.last_good >= now - Duration::from_secs(self.get_u64(U64Setting::WasGoodTimeout)) {
                        state_ref.state = AddressState::WasGood;
                        for i in 0..64 {
                                if state_ref.last_services & (1 << i) != 0 {
@@ -280,7 +286,7 @@ impl Store {
                                }
                        }
                        state_ref.last_services = 0;
-                       nodes.state_next_scan.get_mut(&AddressState::WasGood).unwrap().push((state_ref.last_update, addr));
+                       nodes.state_next_scan.get_mut(&AddressState::WasGood).unwrap().push((now, addr));
                } else {
                        state_ref.state = state;
                        if state == AddressState::Good {
@@ -292,9 +298,12 @@ impl Store {
                                        }
                                }
                                state_ref.last_services = services;
+                               state_ref.last_good = now;
                        }
-                       nodes.state_next_scan.get_mut(&state).unwrap().push((state_ref.last_update, addr));
+                       nodes.state_next_scan.get_mut(&state).unwrap().push((now, addr));
                }
+               state_ref.last_update = now;
+               ret
        }
 
        pub fn save_data(&'static self) -> impl Future<Item=(), Error=()> {