Always return two tor addresses

[dnsseed-rust] / src / datastore.rs

diff --git a/src/datastore.rs b/src/datastore.rs
index 05d8a1e9ba0ef54fc0fa539899afda08ddf40a4e..2dbe37028fc781538fca01f4286e4c9c08d8221a 100644 (file)
--- 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,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,22 +436,35 @@ 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<BGPClient>) -> impl Future<Item=(), Error=()> {
                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 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<IpAddr> = Vec::new();
-                                       let mut v4_set: Vec<IpAddr> = Vec::new();
+                                       let mut tor_set: Vec<Ipv6Addr> = Vec::new();
+                                       let mut v6_set: Vec<Ipv6Addr> = Vec::new();
+                                       let mut v4_set: Vec<Ipv4Addr> = 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;
                                                                }
                                                        }
@@ -466,10 +481,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;
@@ -486,16 +500,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);
                                        }
                                }
@@ -505,9 +525,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<SocketAddr> {