X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=c8ef0e0aed812f52599ac6d1ca47dcde0692e48b;hb=ecd6d703b476c659c343d0e2c034c5b094645ce5;hp=9032b09c056b86d127ac29e7e31c543ca9099981;hpb=2cf23b8a5638990cbf244e7aaf0b9b8b47f24f2e;p=dnsseed-rust diff --git a/src/datastore.rs b/src/datastore.rs index 9032b09..c8ef0e0 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::SocketAddr; +use std::net::{IpAddr, SocketAddr}; use std::time::{Duration, Instant}; use std::io::{BufRead, BufReader}; @@ -16,6 +16,8 @@ use tokio::io::write_all; use regex::Regex; +use crate::bgp_client::BGPClient; + #[derive(Clone, Copy, Hash, PartialEq, Eq)] pub enum AddressState { Untested, @@ -434,72 +436,74 @@ impl Store { 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"; - let dns_future = File::create(dns_file.clone() + ".tmp").and_then(move |f| { + 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[j]; - 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[j]); - } else { - second_set = Some(&nodes.good_node_services[j]); + let mut v6_set: Vec = Vec::new(); + let mut v4_set: Vec = Vec::new(); + { + 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(); 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[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()); + } 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; + } + } + } + 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(); + } 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()); + } } } + 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(); } - 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 { + let mut asn_set = HashSet::with_capacity(cmp::max(v4_set.len(), v6_set.len())); + for a in v4_set.iter().filter(|a| asn_set.insert(bgp_client.get_asn(**a))).choose_multiple(&mut rng, 21) { dns_buff += &format!("x{:x}.dnsseed\tIN\tA\t{}\n", i, a); } - for a in v6_set { + asn_set.clear(); + for a in v6_set.iter().filter(|a| asn_set.insert(bgp_client.get_asn(**a))).choose_multiple(&mut rng, 12) { dns_buff += &format!("x{:x}.dnsseed\tIN\tAAAA\t{}\n", i, a); } } @@ -509,9 +513,7 @@ impl Store { 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(()) }) + }).then(|_| { future::ok(()) }) } pub fn get_next_scan_nodes(&self) -> Vec {