X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=840863aed4d966988d370f63bdc5a3ecc3742919;hb=0e8e7d68a60e43ceaf3aa7b35bdb2317b51f3b07;hp=2dbe37028fc781538fca01f4286e4c9c08d8221a;hpb=2e27f7c082e18fe1ac1981a97a070aab8d84bad8;p=dnsseed-rust

diff --git a/src/datastore.rs b/src/datastore.rs
index 2dbe370..840863a 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, Ipv4Addr, Ipv6Addr, SocketAddr};
+use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 use std::time::{Duration, Instant};
 use std::io::{BufRead, BufReader};
 
@@ -18,6 +18,8 @@ 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,
@@ -106,7 +108,6 @@ impl AddressState {
 
 #[derive(Hash, PartialEq, Eq)]
 pub enum U64Setting {
-	ConnsPerSec,
 	RunTimeout,
 	WasGoodTimeout,
 	RescanInterval(AddressState),
@@ -125,17 +126,60 @@ struct Node {
 	state: AddressState,
 }
 
+/// Essentially SocketAddr but without a traffic class or scope
+#[derive(Clone, PartialEq, Eq, Hash)]
+enum SockAddr {
+	V4(SocketAddrV4),
+	V6((Ipv6Addr, u16)),
+}
+impl From<SocketAddr> 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<SocketAddr> 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: Vec<HashSet<SocketAddr>>,
-	nodes_to_state: HashMap<SocketAddr, Node>,
-	state_next_scan: Vec<Vec<(Instant, SocketAddr)>>,
+	good_node_services: [HashSet<SockAddr>; 64],
+	nodes_to_state: HashMap<SockAddr, Node>,
+	state_next_scan: Vec<Vec<(Instant, SockAddr)>>,
 }
 struct NodesMutRef<'a> {
-	good_node_services: &'a mut Vec<HashSet<SocketAddr>>,
-	nodes_to_state: &'a mut HashMap<SocketAddr, Node>,
-	state_next_scan: &'a mut Vec<Vec<(Instant, SocketAddr)>>,
-
+	good_node_services: &'a mut [HashSet<SockAddr>; 64],
+	nodes_to_state: &'a mut HashMap<SockAddr, Node>,
+	state_next_scan: &'a mut Vec<Vec<(Instant, SockAddr)>>,
 }
+
 impl Nodes {
 	fn borrow_mut<'a>(&'a mut self) -> NodesMutRef<'a> {
 		NodesMutRef {
@@ -172,7 +216,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));
@@ -194,10 +237,9 @@ impl Store {
 			future::ok((u64s, try_read!(l, Regex)))
 		}).or_else(|_| -> future::FutureResult<(HashMap<U64Setting, u64>, 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);
@@ -222,10 +264,7 @@ impl Store {
 				for _ in 0..AddressState::get_count() {
 					state_vecs.push(Vec::new());
 				}
-				let mut good_node_services = Vec::with_capacity(64);
-				for _ in 0..64 {
-					good_node_services.push(HashSet::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(),
@@ -235,6 +274,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 {
@@ -269,12 +309,12 @@ impl Store {
 				if node.state == AddressState::Good {
 					for i in 0..64 {
 						if node.last_services & (1 << i) != 0 {
-							res.good_node_services[i].insert(sockaddr);
+							res.good_node_services[i].insert(sockaddr.into());
 						}
 					}
 				}
-				res.state_next_scan[node.state.to_num() as usize].push((Instant::now(), sockaddr));
-				res.nodes_to_state.insert(sockaddr, node);
+				res.state_next_scan[node.state.to_num() as usize].push((start_time, sockaddr.into()));
+				res.nodes_to_state.insert(sockaddr.into(), node);
 			}
 			future::ok(res)
 		}).or_else(|_| -> future::FutureResult<Nodes, ()> {
@@ -315,7 +355,7 @@ impl Store {
 		let mut nodes = self.nodes.write().unwrap();
 		let cur_time = Instant::now();
 		for addr in addresses {
-			match nodes.nodes_to_state.entry(addr.clone()) {
+			match nodes.nodes_to_state.entry(addr.into()) {
 				hash_map::Entry::Vacant(e) => {
 					e.insert(Node {
 						state: AddressState::Untested,
@@ -323,7 +363,7 @@ impl Store {
 						last_update: cur_time,
 						last_good: cur_time,
 					});
-					nodes.state_next_scan[AddressState::Untested.to_num() as usize].push((cur_time, addr));
+					nodes.state_next_scan[AddressState::Untested.to_num() as usize].push((cur_time, addr.into()));
 					res += 1;
 				},
 				hash_map::Entry::Occupied(_) => {},
@@ -341,12 +381,14 @@ impl Store {
 		}));
 	}
 
-	pub fn set_node_state(&self, addr: SocketAddr, state: AddressState, services: u64) -> AddressState {
+	pub fn set_node_state(&self, sockaddr: SocketAddr, state: AddressState, services: u64) -> AddressState {
+		let addr: SockAddr = sockaddr.into();
+		let now = Instant::now();
+
 		let mut nodes_lock = self.nodes.write().unwrap();
 		let nodes = nodes_lock.borrow_mut();
-		let now = Instant::now();
 
-		let state_ref = nodes.nodes_to_state.entry(addr).or_insert(Node {
+		let state_ref = nodes.nodes_to_state.entry(addr.clone()).or_insert(Node {
 			state: AddressState::Untested,
 			last_services: 0,
 			last_update: now,
@@ -369,7 +411,7 @@ impl Store {
 			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[i].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[i].remove(&addr);
 					}
@@ -386,8 +428,7 @@ impl Store {
 	pub fn save_data(&'static self) -> impl Future<Item=(), Error=()> {
 		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),
@@ -529,21 +570,20 @@ impl Store {
 	}
 
 	pub fn get_next_scan_nodes(&self) -> Vec<SocketAddr> {
-		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);
+					res.push((&node).into());
 				}
 			}
 		}