X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=c00bc0165a71d98ef8ed80d17a0d88a5e970d4a5;hb=9640749bafef6edbe18540c2ce4bc1d5bea80a17;hp=30d2c8e8b21431cf917c0ec6d1436c7016f3a07c;hpb=a264197c4fa7babe2ce2865f1b12e4db07ae687e;p=dnsseed-rust diff --git a/src/datastore.rs b/src/datastore.rs index 30d2c8e..c00bc01 100644 --- a/src/datastore.rs +++ b/src/datastore.rs @@ -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, @@ -437,7 +439,7 @@ 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(); @@ -496,10 +498,14 @@ impl Store { .filter(|e| e.is_ipv6() && e.port() == 8333).map(|e| e.ip()).collect(); } } - 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(**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(**a))).choose_multiple(&mut rng, 12) { dns_buff += &format!("x{:x}.dnsseed\tIN\tAAAA\t{}\n", i, a); } }