X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=27987714d347f566ea79d662f6bc4343b9c314d8;hb=852e939be31574ea13b9f0da3056393d23d55753;hp=3628ac202ec5045e6c36f74d6333db56889dd2ea;hpb=1ad3d257518100cc938b4dabfff8636414131ce0;p=dnsseed-rust diff --git a/src/datastore.rs b/src/datastore.rs index 3628ac2..2798771 100644 --- a/src/datastore.rs +++ b/src/datastore.rs @@ -1,14 +1,14 @@ -use std::{cmp, mem}; +use std::cmp; use std::collections::{HashSet, HashMap, hash_map}; use std::sync::{Arc, RwLock}; -use std::net::SocketAddr; +use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; use std::time::{Duration, Instant}; use std::io::{BufRead, BufReader}; -use bitcoin::network::address::Address; +use bitcoin::network::address::{Address, AddrV2Message}; use rand::thread_rng; -use rand::seq::SliceRandom; +use rand::seq::{SliceRandom, IteratorRandom}; use tokio::prelude::*; use tokio::fs::File; @@ -16,6 +16,11 @@ use tokio::io::write_all; use regex::Regex; +use crate::bgp_client::BGPClient; + +pub const SECS_PER_SCAN_RESULTS: u64 = 15; +const MAX_CONNS_PER_SEC_PER_STATUS: u64 = 30; + #[derive(Clone, Copy, Hash, PartialEq, Eq)] pub enum AddressState { Untested, @@ -27,13 +32,83 @@ pub enum AddressState { ProtocolViolation, Timeout, TimeoutDuringRequest, + TimeoutAwaitingPong, + TimeoutAwaitingAddr, + TimeoutAwaitingBlock, Good, WasGood, + EvilNode, +} + +impl AddressState { + pub fn from_num(num: u8) -> Option { + match num { + 0x0 => Some(AddressState::Untested), + 0x1 => Some(AddressState::LowBlockCount), + 0x2 => Some(AddressState::HighBlockCount), + 0x3 => Some(AddressState::LowVersion), + 0x4 => Some(AddressState::BadVersion), + 0x5 => Some(AddressState::NotFullNode), + 0x6 => Some(AddressState::ProtocolViolation), + 0x7 => Some(AddressState::Timeout), + 0x8 => Some(AddressState::TimeoutDuringRequest), + 0x9 => Some(AddressState::TimeoutAwaitingPong), + 0xa => Some(AddressState::TimeoutAwaitingAddr), + 0xb => Some(AddressState::TimeoutAwaitingBlock), + 0xc => Some(AddressState::Good), + 0xd => Some(AddressState::WasGood), + 0xe => Some(AddressState::EvilNode), + _ => None, + } + } + + pub fn to_num(&self) -> u8 { + match *self { + AddressState::Untested => 0, + AddressState::LowBlockCount => 1, + AddressState::HighBlockCount => 2, + AddressState::LowVersion => 3, + AddressState::BadVersion => 4, + AddressState::NotFullNode => 5, + AddressState::ProtocolViolation => 6, + AddressState::Timeout => 7, + AddressState::TimeoutDuringRequest => 8, + AddressState::TimeoutAwaitingPong => 9, + AddressState::TimeoutAwaitingAddr => 10, + AddressState::TimeoutAwaitingBlock => 11, + AddressState::Good => 12, + AddressState::WasGood => 13, + AddressState::EvilNode => 14, + } + } + + pub fn to_str(&self) -> &'static str { + match *self { + AddressState::Untested => "Untested", + AddressState::LowBlockCount => "Low Block Count", + AddressState::HighBlockCount => "High Block Count", + AddressState::LowVersion => "Low Version", + AddressState::BadVersion => "Bad Version", + AddressState::NotFullNode => "Not Full Node", + AddressState::ProtocolViolation => "Protocol Violation", + AddressState::Timeout => "Timeout", + AddressState::TimeoutDuringRequest => "Timeout During Request", + AddressState::TimeoutAwaitingPong => "Timeout Awaiting Pong", + AddressState::TimeoutAwaitingAddr => "Timeout Awaiting Addr", + AddressState::TimeoutAwaitingBlock => "Timeout Awaiting Block", + AddressState::Good => "Good", + AddressState::WasGood => "Was Good", + AddressState::EvilNode => "Evil Node", + } + } + + pub const fn get_count() -> u8 { + 15 + } } #[derive(Hash, PartialEq, Eq)] pub enum U64Setting { - ConnsPerSec, RunTimeout, WasGoodTimeout, RescanInterval(AddressState), @@ -46,22 +121,67 @@ 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, + queued: bool, +} + +/// Essentially SocketAddr but without a traffic class or scope +#[derive(Clone, PartialEq, Eq, Hash)] +enum SockAddr { + V4(SocketAddrV4), + V6((Ipv6Addr, u16)), +} +impl From for SockAddr { + fn from(addr: SocketAddr) -> SockAddr { + match addr { + SocketAddr::V4(sa) => SockAddr::V4(sa), + SocketAddr::V6(sa) => SockAddr::V6((sa.ip().clone(), sa.port())), + } + } +} +impl Into for &SockAddr { + fn into(self) -> SocketAddr { + match self { + &SockAddr::V4(sa) => SocketAddr::V4(sa), + &SockAddr::V6(sa) => SocketAddr::V6(SocketAddrV6::new(sa.0, sa.1, 0, 0)) + } + } +} +impl ToString for SockAddr { + fn to_string(&self) -> String { + let sa: SocketAddr = self.into(); + sa.to_string() + } +} +impl SockAddr { + pub fn port(&self) -> u16 { + match *self { + SockAddr::V4(sa) => sa.port(), + SockAddr::V6((_, port)) => port, + } + } + pub fn ip(&self) -> IpAddr { + match *self { + SockAddr::V4(sa) => IpAddr::V4(sa.ip().clone()), + SockAddr::V6((ip, _)) => IpAddr::V6(ip), + } + } } struct Nodes { - good_node_services: HashMap>, - nodes_to_state: HashMap, - state_next_scan: HashMap>, + good_node_services: [HashSet; 64], + nodes_to_state: HashMap, + state_next_scan: [Vec; AddressState::get_count() as usize], } struct NodesMutRef<'a> { - good_node_services: &'a mut HashMap>, - nodes_to_state: &'a mut HashMap, - state_next_scan: &'a mut HashMap>, - + good_node_services: &'a mut [HashSet; 64], + nodes_to_state: &'a mut HashMap, + state_next_scan: &'a mut [Vec; AddressState::get_count() as usize], } + impl Nodes { fn borrow_mut<'a>(&'a mut self) -> NodesMutRef<'a> { NodesMutRef { @@ -97,8 +217,7 @@ impl Store { } } } } - let mut u64s = HashMap::with_capacity(15); - u64s.insert(U64Setting::ConnsPerSec, try_read!(l, u64)); + let mut u64s = HashMap::with_capacity(AddressState::get_count() as usize + 4); u64s.insert(U64Setting::RunTimeout, try_read!(l, u64)); u64s.insert(U64Setting::WasGoodTimeout, try_read!(l, u64)); u64s.insert(U64Setting::MinProtocolVersion, try_read!(l, u64)); @@ -111,15 +230,18 @@ impl Store { u64s.insert(U64Setting::RescanInterval(AddressState::ProtocolViolation), try_read!(l, u64)); u64s.insert(U64Setting::RescanInterval(AddressState::Timeout), try_read!(l, u64)); u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingPong), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingAddr), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingBlock), try_read!(l, u64)); u64s.insert(U64Setting::RescanInterval(AddressState::Good), try_read!(l, u64)); u64s.insert(U64Setting::RescanInterval(AddressState::WasGood), try_read!(l, u64)); + u64s.insert(U64Setting::RescanInterval(AddressState::EvilNode), try_read!(l, u64)); 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); @@ -128,30 +250,20 @@ impl Store { u64s.insert(U64Setting::RescanInterval(AddressState::ProtocolViolation), 86400); u64s.insert(U64Setting::RescanInterval(AddressState::Timeout), 86400); u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest), 21600); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingPong), 3600); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingAddr), 1800); + u64s.insert(U64Setting::RescanInterval(AddressState::TimeoutAwaitingBlock), 3600); u64s.insert(U64Setting::RescanInterval(AddressState::Good), 1800); u64s.insert(U64Setting::RescanInterval(AddressState::WasGood), 1800); - u64s.insert(U64Setting::MinProtocolVersion, 10000); //XXX + u64s.insert(U64Setting::RescanInterval(AddressState::EvilNode), 315360000); + u64s.insert(U64Setting::MinProtocolVersion, 70002); future::ok((u64s, Regex::new(".*").unwrap())) }); macro_rules! nodes_uninitd { () => { { - let mut state_vecs = HashMap::with_capacity(11); - state_vecs.insert(AddressState::Untested, Vec::new()); - state_vecs.insert(AddressState::LowBlockCount, Vec::new()); - state_vecs.insert(AddressState::HighBlockCount, Vec::new()); - state_vecs.insert(AddressState::LowVersion, Vec::new()); - state_vecs.insert(AddressState::BadVersion, Vec::new()); - state_vecs.insert(AddressState::NotFullNode, Vec::new()); - state_vecs.insert(AddressState::ProtocolViolation, Vec::new()); - state_vecs.insert(AddressState::Timeout, Vec::new()); - state_vecs.insert(AddressState::TimeoutDuringRequest, Vec::new()); - state_vecs.insert(AddressState::Good, Vec::new()); - state_vecs.insert(AddressState::WasGood, Vec::new()); - let mut good_node_services = HashMap::with_capacity(64); - for i in 0..64 { - good_node_services.insert(i, HashSet::new()); - } + let state_vecs = [Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new(), Vec::new()]; + let good_node_services = [HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new(), HashSet::new()]; Nodes { good_node_services, nodes_to_state: HashMap::new(), @@ -184,32 +296,24 @@ impl Store { let state = try_read!(line_iter, u8); let last_services = try_read!(line_iter, u64); let node = Node { - state: match state { - 0x0 => AddressState::Untested, - 0x1 => AddressState::LowBlockCount, - 0x2 => AddressState::HighBlockCount, - 0x3 => AddressState::LowVersion, - 0x4 => AddressState::BadVersion, - 0x5 => AddressState::NotFullNode, - 0x6 => AddressState::ProtocolViolation, - 0x7 => AddressState::Timeout, - 0x8 => AddressState::TimeoutDuringRequest, - 0x9 => AddressState::Good, - 0xa => AddressState::WasGood, - _ => return future::ok(res), + state: match AddressState::from_num(state) { + Some(v) => v, + None => return future::ok(res), }, last_services, last_update: Instant::now(), + last_good: Instant::now(), + queued: true, }; if node.state == AddressState::Good { for i in 0..64 { if node.last_services & (1 << i) != 0 { - res.good_node_services.get_mut(&i).unwrap().insert(sockaddr); + res.good_node_services[i].insert(sockaddr.into()); } } } - res.state_next_scan.get_mut(&node.state).unwrap().push((Instant::now(), sockaddr)); - res.nodes_to_state.insert(sockaddr, node); + res.state_next_scan[node.state.to_num() as usize].push(sockaddr.into()); + res.nodes_to_state.insert(sockaddr.into(), node); } future::ok(res) }).or_else(|_| -> future::FutureResult { @@ -234,7 +338,7 @@ impl Store { } pub fn get_node_count(&self, state: AddressState) -> usize { - self.nodes.read().unwrap().state_next_scan.get(&state).unwrap().len() + self.nodes.read().unwrap().state_next_scan[state.to_num() as usize].len() } pub fn get_regex(&self, _setting: RegexSetting) -> Arc { @@ -245,62 +349,101 @@ impl Store { *self.subver_regex.write().unwrap() = Arc::new(value); } - pub fn add_fresh_nodes(&self, addresses: &Vec<(u32, Address)>) { + pub fn add_fresh_addrs>(&self, addresses: I) -> u64 { + let mut res = 0; let mut nodes = self.nodes.write().unwrap(); let cur_time = Instant::now(); - for &(_, ref addr) in addresses { - if let Ok(socketaddr) = addr.socket_addr() { - match nodes.nodes_to_state.entry(socketaddr.clone()) { - hash_map::Entry::Vacant(e) => { - e.insert(Node { - state: AddressState::Untested, - last_services: 0, - last_update: cur_time, - }); - nodes.state_next_scan.get_mut(&AddressState::Untested).unwrap().push((cur_time, socketaddr)); - }, - hash_map::Entry::Occupied(_) => {}, - } - } else { - //TODO: Handle onions + for addr in addresses { + match nodes.nodes_to_state.entry(addr.into()) { + hash_map::Entry::Vacant(e) => { + e.insert(Node { + state: AddressState::Untested, + last_services: 0, + last_update: cur_time, + last_good: cur_time, + queued: true, + }); + nodes.state_next_scan[AddressState::Untested.to_num() as usize].push(addr.into()); + res += 1; + }, + hash_map::Entry::Occupied(_) => {}, } } + res + } + + pub fn add_fresh_nodes(&self, addresses: &Vec<(u32, Address)>) { + self.add_fresh_addrs(addresses.iter().filter_map(|(_, addr)| { + match addr.socket_addr() { + Ok(socketaddr) => Some(socketaddr), + Err(_) => None, // TODO: Handle onions + } + })); } + pub fn add_fresh_nodes_v2(&self, addresses: &Vec) { + self.add_fresh_addrs(addresses.iter().filter_map(|addr| { + match addr.socket_addr() { + Ok(socketaddr) => Some(socketaddr), + Err(_) => None, // TODO: Handle onions + } + })); + } + + pub fn set_node_state(&self, sockaddr: SocketAddr, state: AddressState, services: u64) -> AddressState { + let addr: SockAddr = sockaddr.into(); + let now = Instant::now(); - pub fn set_node_state(&self, addr: SocketAddr, state: AddressState, services: u64) { 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 state_ref = nodes.nodes_to_state.entry(addr.clone()).or_insert(Node { + state: AddressState::Untested, + last_services: 0, + last_update: now, + last_good: now, + queued: false, + }); + let ret = state_ref.state; + 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 { - nodes.good_node_services.get_mut(&i).unwrap().remove(&addr); + nodes.good_node_services[i].remove(&addr); } } state_ref.last_services = 0; - nodes.state_next_scan.get_mut(&AddressState::WasGood).unwrap().push((state_ref.last_update, addr)); + if !state_ref.queued { + nodes.state_next_scan[AddressState::WasGood.to_num() as usize].push(addr); + state_ref.queued = true; + } } else { state_ref.state = state; if state == AddressState::Good { for i in 0..64 { if services & (1 << i) != 0 && state_ref.last_services & (1 << i) == 0 { - nodes.good_node_services.get_mut(&i).unwrap().insert(addr); + nodes.good_node_services[i].insert(addr.clone()); } else if services & (1 << i) == 0 && state_ref.last_services & (1 << i) != 0 { - nodes.good_node_services.get_mut(&i).unwrap().remove(&addr); + nodes.good_node_services[i].remove(&addr); } } + state_ref.last_services = services; + state_ref.last_good = now; + } + if !state_ref.queued { + nodes.state_next_scan[state.to_num() as usize].push(addr); + state_ref.queued = true; } - nodes.state_next_scan.get_mut(&state).unwrap().push((state_ref.last_update, addr)); } + state_ref.last_update = now; + ret } 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{}", - 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), @@ -313,8 +456,12 @@ impl Store { self.get_u64(U64Setting::RescanInterval(AddressState::ProtocolViolation)), self.get_u64(U64Setting::RescanInterval(AddressState::Timeout)), self.get_u64(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest)), + self.get_u64(U64Setting::RescanInterval(AddressState::TimeoutAwaitingPong)), + self.get_u64(U64Setting::RescanInterval(AddressState::TimeoutAwaitingAddr)), + self.get_u64(U64Setting::RescanInterval(AddressState::TimeoutAwaitingBlock)), self.get_u64(U64Setting::RescanInterval(AddressState::Good)), self.get_u64(U64Setting::RescanInterval(AddressState::WasGood)), + self.get_u64(U64Setting::RescanInterval(AddressState::EvilNode)), self.get_regex(RegexSetting::SubverRegex).as_str()); write_all(f, settings_string).and_then(|(mut f, _)| { f.poll_sync_all() @@ -328,23 +475,11 @@ impl Store { let mut nodes_buff = String::new(); { let nodes = self.nodes.read().unwrap(); - nodes_buff.reserve(nodes.nodes_to_state.len() * 20); + nodes_buff.reserve(nodes.nodes_to_state.len() * 32); for (ref sockaddr, ref node) in nodes.nodes_to_state.iter() { nodes_buff += &sockaddr.to_string(); nodes_buff += ","; - nodes_buff += &match node.state { - AddressState::Untested => 0u8, - AddressState::LowBlockCount => 1u8, - AddressState::HighBlockCount => 2u8, - AddressState::LowVersion => 3u8, - AddressState::BadVersion => 4u8, - AddressState::NotFullNode => 5u8, - AddressState::ProtocolViolation => 6u8, - AddressState::Timeout => 7u8, - AddressState::TimeoutDuringRequest => 8u8, - AddressState::Good => 9u8, - AddressState::WasGood => 10u8, - }.to_string(); + nodes_buff += &node.state.to_num().to_string(); nodes_buff += ","; nodes_buff += &node.last_services.to_string(); nodes_buff += "\n"; @@ -352,25 +487,139 @@ impl Store { } 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(()) }) } + 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 &[ 0b00000000001u64, + 0b00000000100, + 0b00000000101, + 0b00000001000, + 0b00000001001, + 0b00000001100, + 0b00000001101, + 0b00001001001, + 0b10000000000, + 0b10000000001, + 0b10000000100, + 0b10000000101, + 0b10000001000, + 0b10000001001, + 0b10000001100, + 0b10000001101, + 0b10001001000] { + // ^ NODE_NETWORK_LIIMTED + //COMPACT_FILTERS ^ ^ NODE_BLOOM + // NODE_WITNESS ^ ^ NODE_NETWORK + // We support all combos of NETWORK, NETWORK_LIMITED, BLOOM, and WITNESS + // We support COMPACT_FILTERS with WITNESS and NETWORK or NETWORK_LIIMTED. + 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]; + for a in set_ref.iter().filter(|e| e.port() == 8333) { + add_addr!(a); + } + 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[j]); + } else { + second_set = Some(&nodes.good_node_services[j]); + break; + } + } + } + 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; + 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[j]); + } else { + let new_intersection = intersection_set_ref.unwrap() + .intersection(&nodes.good_node_services[j]).map(|e| (*e).clone()).collect(); + intersection = Some(new_intersection); + intersection_set_ref = Some(intersection.as_ref().unwrap()); + } + } + } + for a in intersection_set_ref.unwrap().iter().filter(|e| e.port() == 8333) { + add_addr!(a); + } + } + } + let mut asn_set = HashSet::with_capacity(cmp::max(v4_set.len(), v6_set.len())); + asn_set.insert(0); + for (a, asn) in v4_set.iter().map(|a| (a, bgp_client.get_asn(IpAddr::V4(*a)))).filter(|a| asn_set.insert(a.1)).choose_multiple(&mut rng, 21) { + dns_buff += &format!("x{:x}.dnsseed\tIN\tA\t{} ; AS{}\n", i, a, asn); + } + asn_set.clear(); + asn_set.insert(0); + for (a, asn) in v6_set.iter().map(|a| (a, bgp_client.get_asn(IpAddr::V6(*a)))).filter(|a| asn_set.insert(a.1)).choose_multiple(&mut rng, 10) { + dns_buff += &format!("x{:x}.dnsseed\tIN\tAAAA\t{} ; AS{}\n", i, a, asn); + } + for a in tor_set.iter().choose_multiple(&mut rng, 2) { + dns_buff += &format!("x{:x}.dnsseed\tIN\tAAAA\t{} ; Tor Onionv2\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) + }).then(|_| { future::ok(()) }) + } + pub fn get_next_scan_nodes(&self) -> Vec { - let mut res = Vec::with_capacity(600); - let cur_time = Instant::now(); - let mut nodes = self.nodes.write().unwrap(); - for (state, state_nodes) in nodes.state_next_scan.iter_mut() { - let cmp_time = cur_time - Duration::from_secs(self.get_u64(U64Setting::RescanInterval(*state))); - let split_point = cmp::min(cmp::min(600 - res.len(), 60), - 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); - mem::swap(&mut new_nodes, state_nodes); - for (_, node) in new_nodes.drain(..) { - res.push(node); + let mut res = Vec::with_capacity(128); + + { + let mut nodes_lock = self.nodes.write().unwrap(); + let nodes = nodes_lock.borrow_mut(); + for (idx, state_nodes) in nodes.state_next_scan.iter_mut().enumerate() { + let rescan_interval = cmp::max(self.get_u64(U64Setting::RescanInterval(AddressState::from_num(idx as u8).unwrap())), 1); + let split_point = cmp::min(cmp::min(SECS_PER_SCAN_RESULTS * state_nodes.len() as u64 / rescan_interval, + SECS_PER_SCAN_RESULTS * MAX_CONNS_PER_SEC_PER_STATUS), + state_nodes.len() as u64); + for node in state_nodes.drain(..split_point as usize) { + nodes.nodes_to_state.get_mut(&node).unwrap().queued = false; + res.push((&node).into()); + } } } res.shuffle(&mut thread_rng());