use bitcoin::network::address::Address;
use rand::thread_rng;
-use rand::seq::SliceRandom;
+use rand::seq::{SliceRandom, IteratorRandom};
use tokio::prelude::*;
use tokio::fs::File;
}
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 {
},
last_services,
last_update: Instant::now(),
+ last_good: Instant::now(),
};
if node.state == AddressState::Good {
for i in 0..64 {
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));
},
}
}
- 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 {
}
}
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 {
nodes.good_node_services.get_mut(&i).unwrap().remove(&addr);
}
}
+ 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=()> {
}
write_all(f, nodes_buff)
}).and_then(|(mut f, _)| {
- f.poll_sync_all()
+ f.poll_sync_all()
}).and_then(|_| {
tokio::fs::rename(nodes_file.clone() + ".tmp", nodes_file)
});
- settings_future.join(nodes_future).then(|_| { future::ok(()) })
+
+ let dns_file = self.store.clone() + "/nodes.dump";
+ let dns_future = File::create(dns_file.clone() + ".tmp").and_then(move |f| {
+ let mut dns_buff = String::new();
+ {
+ let nodes = self.nodes.read().unwrap();
+ let mut rng = thread_rng();
+ for i in &[1u64, 4, 5, 8, 9, 12, 13, 1024, 1025, 1028, 1029, 1032, 1033, 1036, 1037] {
+ let mut v6_set = Vec::new();
+ let mut v4_set = Vec::new();
+ if i.count_ones() == 1 {
+ for j in 0..64 {
+ if i & (1 << j) != 0 {
+ let set_ref = nodes.good_node_services.get(&j).unwrap();
+ v4_set = set_ref.iter().filter(|e| e.is_ipv4() && e.port() == 8333)
+ .choose_multiple(&mut rng, 21).iter().map(|e| e.ip()).collect();
+ v6_set = set_ref.iter().filter(|e| e.is_ipv6() && e.port() == 8333)
+ .choose_multiple(&mut rng, 12).iter().map(|e| e.ip()).collect();
+ break;
+ }
+ }
+ } else if i.count_ones() == 2 {
+ let mut first_set = None;
+ let mut second_set = None;
+ for j in 0..64 {
+ if i & (1 << j) != 0 {
+ if first_set == None {
+ first_set = Some(nodes.good_node_services.get(&j).unwrap());
+ } else {
+ second_set = Some(nodes.good_node_services.get(&j).unwrap());
+ break;
+ }
+ }
+ }
+ v4_set = first_set.unwrap().intersection(second_set.unwrap())
+ .filter(|e| e.is_ipv4() && e.port() == 8333)
+ .choose_multiple(&mut rng, 21).iter().map(|e| e.ip()).collect();
+ v6_set = first_set.unwrap().intersection(second_set.unwrap())
+ .filter(|e| e.is_ipv6() && e.port() == 8333)
+ .choose_multiple(&mut rng, 12).iter().map(|e| e.ip()).collect();
+ } else {
+ //TODO: Could optimize this one a bit
+ let mut intersection;
+ let mut intersection_set_ref = None;
+ for j in 0..64 {
+ if i & (1 << j) != 0 {
+ if intersection_set_ref == None {
+ intersection_set_ref = Some(nodes.good_node_services.get(&j).unwrap());
+ } else {
+ let new_intersection = intersection_set_ref.unwrap()
+ .intersection(nodes.good_node_services.get(&j).unwrap()).map(|e| (*e).clone()).collect();
+ intersection = Some(new_intersection);
+ intersection_set_ref = Some(intersection.as_ref().unwrap());
+ }
+ }
+ }
+ v4_set = intersection_set_ref.unwrap().iter()
+ .filter(|e| e.is_ipv4() && e.port() == 8333)
+ .choose_multiple(&mut rng, 21).iter().map(|e| e.ip()).collect();
+ v6_set = intersection_set_ref.unwrap().iter()
+ .filter(|e| e.is_ipv6() && e.port() == 8333)
+ .choose_multiple(&mut rng, 12).iter().map(|e| e.ip()).collect();
+ }
+ for a in v4_set {
+ dns_buff += &format!("x{:x}.dnsseed\tIN\tA\t{}\n", i, a);
+ }
+ for a in v6_set {
+ dns_buff += &format!("x{:x}.dnsseed\tIN\tAAAA\t{}\n", i, a);
+ }
+ }
+ }
+ write_all(f, dns_buff)
+ }).and_then(|(mut f, _)| {
+ f.poll_sync_all()
+ }).and_then(|_| {
+ tokio::fs::rename(dns_file.clone() + ".tmp", dns_file)
+ });
+
+ settings_future.join3(nodes_future, dns_future).then(|_| { future::ok(()) })
}
pub fn get_next_scan_nodes(&self) -> Vec<SocketAddr> {
projects / dnsseed-rust / blobdiff