X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=0e6dea3350357632170d86ae3262c6d3e8180c82;hb=866152d7203c8f11a686d073a2c3f617f9131675;hp=30d2c8e8b21431cf917c0ec6d1436c7016f3a07c;hpb=a264197c4fa7babe2ce2865f1b12e4db07ae687e;p=dnsseed-rust diff --git a/src/datastore.rs b/src/datastore.rs index 30d2c8e..0e6dea3 100644 --- a/src/datastore.rs +++ b/src/datastore.rs @@ -1,7 +1,7 @@ use std::{cmp, mem}; use std::collections::{HashSet, HashMap, hash_map}; use std::sync::{Arc, RwLock}; -use std::net::{IpAddr, SocketAddr}; +use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr}; use std::time::{Duration, Instant}; use std::io::{BufRead, BufReader}; @@ -16,6 +16,10 @@ use tokio::io::write_all; use regex::Regex; +use crate::bgp_client::BGPClient; + +pub const SECS_PER_SCAN_RESULTS: u64 = 15; + #[derive(Clone, Copy, Hash, PartialEq, Eq)] pub enum AddressState { Untested, @@ -104,7 +108,6 @@ impl AddressState { #[derive(Hash, PartialEq, Eq)] pub enum U64Setting { - ConnsPerSec, RunTimeout, WasGoodTimeout, RescanInterval(AddressState), @@ -170,7 +173,6 @@ impl Store { } } } let mut u64s = HashMap::with_capacity(AddressState::get_count() as usize + 4); - u64s.insert(U64Setting::ConnsPerSec, try_read!(l, u64)); u64s.insert(U64Setting::RunTimeout, try_read!(l, u64)); u64s.insert(U64Setting::WasGoodTimeout, try_read!(l, u64)); u64s.insert(U64Setting::MinProtocolVersion, try_read!(l, u64)); @@ -192,10 +194,9 @@ impl Store { future::ok((u64s, try_read!(l, Regex))) }).or_else(|_| -> future::FutureResult<(HashMap, Regex), ()> { let mut u64s = HashMap::with_capacity(15); - u64s.insert(U64Setting::ConnsPerSec, 10); u64s.insert(U64Setting::RunTimeout, 120); u64s.insert(U64Setting::WasGoodTimeout, 21600); - u64s.insert(U64Setting::RescanInterval(AddressState::Untested), 0); + u64s.insert(U64Setting::RescanInterval(AddressState::Untested), 1); u64s.insert(U64Setting::RescanInterval(AddressState::LowBlockCount), 3600); u64s.insert(U64Setting::RescanInterval(AddressState::HighBlockCount), 7200); u64s.insert(U64Setting::RescanInterval(AddressState::LowVersion), 21600); @@ -233,6 +234,7 @@ impl Store { } let nodes_future = File::open(store.clone() + "/nodes").and_then(|f| { + let start_time = Instant::now() - Duration::from_secs(60 * 60 * 24); let mut res = nodes_uninitd!(); let l = BufReader::new(f).lines(); for line_res in l { @@ -271,7 +273,7 @@ impl Store { } } } - res.state_next_scan[node.state.to_num() as usize].push((Instant::now(), sockaddr)); + res.state_next_scan[node.state.to_num() as usize].push((start_time, sockaddr)); res.nodes_to_state.insert(sockaddr, node); } future::ok(res) @@ -384,8 +386,7 @@ impl Store { pub fn save_data(&'static self) -> impl Future { let settings_file = self.store.clone() + "/settings"; let settings_future = File::create(settings_file.clone() + ".tmp").and_then(move |f| { - let settings_string = format!("{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}", - self.get_u64(U64Setting::ConnsPerSec), + let settings_string = format!("{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}", self.get_u64(U64Setting::RunTimeout), self.get_u64(U64Setting::WasGoodTimeout), self.get_u64(U64Setting::MinProtocolVersion), @@ -437,23 +438,32 @@ impl Store { settings_future.join(nodes_future).then(|_| { future::ok(()) }) } - pub fn write_dns(&'static self) -> impl Future { + pub fn write_dns(&'static self, bgp_client: Arc) -> impl Future { let dns_file = self.store.clone() + "/nodes.dump"; File::create(dns_file.clone() + ".tmp").and_then(move |f| { let mut dns_buff = String::new(); { 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 = Vec::new(); - let mut v4_set: Vec = Vec::new(); + let mut tor_set: Vec = Vec::new(); + let mut v6_set: Vec = Vec::new(); + let mut v4_set: Vec = Vec::new(); + macro_rules! add_addr { ($addr: expr) => { + match $addr.ip() { + IpAddr::V4(v4addr) => v4_set.push(v4addr), + IpAddr::V6(v6addr) if v6addr.octets()[..6] == [0xFD,0x87,0xD8,0x7E,0xEB,0x43][..] => tor_set.push(v6addr), + IpAddr::V6(v6addr) => v6_set.push(v6addr), + } + } } { let nodes = self.nodes.read().unwrap(); if i.count_ones() == 1 { for j in 0..64 { if i & (1 << j) != 0 { let set_ref = &nodes.good_node_services[j]; - v4_set = set_ref.iter().filter(|e| e.is_ipv4() && e.port() == 8333).map(|e| e.ip()).collect(); - v6_set = set_ref.iter().filter(|e| e.is_ipv6() && e.port() == 8333).map(|e| e.ip()).collect(); + for a in set_ref.iter().filter(|e| e.port() == 8333) { + add_addr!(a); + } break; } } @@ -470,10 +480,9 @@ impl Store { } } } - v4_set = first_set.unwrap().intersection(&second_set.unwrap()) - .filter(|e| e.is_ipv4() && e.port() == 8333).map(|e| e.ip()).collect(); - v6_set = first_set.unwrap().intersection(&second_set.unwrap()) - .filter(|e| e.is_ipv6() && e.port() == 8333).map(|e| e.ip()).collect(); + for a in first_set.unwrap().intersection(&second_set.unwrap()).filter(|e| e.port() == 8333) { + add_addr!(a); + } } else { //TODO: Could optimize this one a bit let mut intersection; @@ -490,16 +499,22 @@ impl Store { } } } - v4_set = intersection_set_ref.unwrap().iter() - .filter(|e| e.is_ipv4() && e.port() == 8333).map(|e| e.ip()).collect(); - v6_set = intersection_set_ref.unwrap().iter() - .filter(|e| e.is_ipv6() && e.port() == 8333).map(|e| e.ip()).collect(); + for a in intersection_set_ref.unwrap().iter().filter(|e| e.port() == 8333) { + add_addr!(a); + } } } - for a in v4_set.iter().choose_multiple(&mut rng, 21) { + let mut asn_set = HashSet::with_capacity(cmp::max(v4_set.len(), v6_set.len())); + asn_set.insert(0); + for a in v4_set.iter().filter(|a| asn_set.insert(bgp_client.get_asn(IpAddr::V4(**a)))).choose_multiple(&mut rng, 21) { dns_buff += &format!("x{:x}.dnsseed\tIN\tA\t{}\n", i, a); } - for a in v6_set.iter().choose_multiple(&mut rng, 12) { + asn_set.clear(); + asn_set.insert(0); + for a in v6_set.iter().filter(|a| asn_set.insert(bgp_client.get_asn(IpAddr::V6(**a)))).choose_multiple(&mut rng, 10) { + dns_buff += &format!("x{:x}.dnsseed\tIN\tAAAA\t{}\n", i, a); + } + for a in tor_set.iter().choose_multiple(&mut rng, 2) { dns_buff += &format!("x{:x}.dnsseed\tIN\tAAAA\t{}\n", i, a); } } @@ -513,18 +528,17 @@ impl Store { } pub fn get_next_scan_nodes(&self) -> Vec { - let results = 30 * self.get_u64(U64Setting::ConnsPerSec) as usize; - let per_bucket_results = results / (AddressState::get_count() as usize); - let mut res = Vec::with_capacity(results); + let mut res = Vec::with_capacity(128); let cur_time = Instant::now(); { let mut nodes = self.nodes.write().unwrap(); for (idx, state_nodes) in nodes.state_next_scan.iter_mut().enumerate() { - let cmp_time = cur_time - Duration::from_secs(self.get_u64(U64Setting::RescanInterval(AddressState::from_num(idx as u8).unwrap()))); - let split_point = cmp::min(cmp::min(results - res.len(), (per_bucket_results * (idx + 1)) - res.len()), - state_nodes.binary_search_by(|a| a.0.cmp(&cmp_time)).unwrap_or_else(|idx| idx)); - let mut new_nodes = state_nodes.split_off(split_point); + let rescan_interval = cmp::max(self.get_u64(U64Setting::RescanInterval(AddressState::from_num(idx as u8).unwrap())), 1); + let cmp_time = cur_time - Duration::from_secs(rescan_interval); + let split_point = cmp::min(SECS_PER_SCAN_RESULTS * state_nodes.len() as u64 / rescan_interval, + state_nodes.binary_search_by(|a| a.0.cmp(&cmp_time)).unwrap_or_else(|idx| idx) as u64); + let mut new_nodes = state_nodes.split_off(split_point as usize); mem::swap(&mut new_nodes, state_nodes); for (_, node) in new_nodes.drain(..) { res.push(node);