X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=c8ef0e0aed812f52599ac6d1ca47dcde0692e48b;hb=ecd6d703b476c659c343d0e2c034c5b094645ce5;hp=26ed96bcb4feff30017a9942933d4c7c36485cee;hpb=b161100d1919c1d4c678d91a1f49ecca1747327e;p=dnsseed-rust diff --git a/src/datastore.rs b/src/datastore.rs index 26ed96b..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, @@ -27,8 +29,12 @@ pub enum AddressState { ProtocolViolation, Timeout, TimeoutDuringRequest, + TimeoutAwaitingPong, + TimeoutAwaitingAddr, + TimeoutAwaitingBlock, Good, WasGood, + EvilNode, } impl AddressState { @@ -43,8 +49,12 @@ impl AddressState { 0x6 => Some(AddressState::ProtocolViolation), 0x7 => Some(AddressState::Timeout), 0x8 => Some(AddressState::TimeoutDuringRequest), - 0x9 => Some(AddressState::Good), - 0xa => Some(AddressState::WasGood), + 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, } } @@ -60,8 +70,12 @@ impl AddressState { AddressState::ProtocolViolation => 6, AddressState::Timeout => 7, AddressState::TimeoutDuringRequest => 8, - AddressState::Good => 9, - AddressState::WasGood => 10, + AddressState::TimeoutAwaitingPong => 9, + AddressState::TimeoutAwaitingAddr => 10, + AddressState::TimeoutAwaitingBlock => 11, + AddressState::Good => 12, + AddressState::WasGood => 13, + AddressState::EvilNode => 14, } } @@ -76,13 +90,17 @@ impl AddressState { 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 fn get_count() -> u8 { - 11 + pub const fn get_count() -> u8 { + 15 } } @@ -108,14 +126,14 @@ struct Node { } struct Nodes { - good_node_services: HashMap>, + good_node_services: Vec>, nodes_to_state: HashMap, - state_next_scan: HashMap>, + state_next_scan: Vec>, } struct NodesMutRef<'a> { - good_node_services: &'a mut HashMap>, + good_node_services: &'a mut Vec>, nodes_to_state: &'a mut HashMap, - state_next_scan: &'a mut HashMap>, + state_next_scan: &'a mut Vec>, } impl Nodes { @@ -153,7 +171,7 @@ impl Store { } } } } - let mut u64s = HashMap::with_capacity(15); + 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)); @@ -167,8 +185,12 @@ 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); @@ -184,29 +206,25 @@ 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 mut state_vecs = Vec::with_capacity(AddressState::get_count() as usize); + 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()); } Nodes { good_node_services, @@ -251,11 +269,11 @@ impl Store { 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); } } } - res.state_next_scan.get_mut(&node.state).unwrap().push((Instant::now(), sockaddr)); + res.state_next_scan[node.state.to_num() as usize].push((Instant::now(), sockaddr)); res.nodes_to_state.insert(sockaddr, node); } future::ok(res) @@ -281,7 +299,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 { @@ -303,9 +321,9 @@ impl Store { state: AddressState::Untested, last_services: 0, last_update: cur_time, - last_good: Instant::now(), + last_good: cur_time, }); - nodes.state_next_scan.get_mut(&AddressState::Untested).unwrap().push((cur_time, addr)); + nodes.state_next_scan[AddressState::Untested.to_num() as usize].push((cur_time, addr)); res += 1; }, hash_map::Entry::Occupied(_) => {}, @@ -326,34 +344,40 @@ impl Store { pub fn set_node_state(&self, addr: SocketAddr, state: AddressState, services: u64) -> AddressState { 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(); - let ret = state_ref.state; let now = Instant::now(); + + let state_ref = nodes.nodes_to_state.entry(addr).or_insert(Node { + state: AddressState::Untested, + last_services: 0, + last_update: now, + last_good: now, + }); + 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((now, addr)); + nodes.state_next_scan[AddressState::WasGood.to_num() as usize].push((now, addr)); } 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); } 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; } - nodes.state_next_scan.get_mut(&state).unwrap().push((now, addr)); + nodes.state_next_scan[state.to_num() as usize].push((now, addr)); } state_ref.last_update = now; ret @@ -362,7 +386,7 @@ impl Store { 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{}", + 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), self.get_u64(U64Setting::RunTimeout), self.get_u64(U64Setting::WasGoodTimeout), @@ -376,8 +400,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() @@ -408,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.get(&j).unwrap(); - 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.get(&j).unwrap()); - } else { - second_set = Some(nodes.good_node_services.get(&j).unwrap()); + 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.get(&j).unwrap()); - } else { - let new_intersection = intersection_set_ref.unwrap() - .intersection(nodes.good_node_services.get(&j).unwrap()).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); } } @@ -483,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 { @@ -494,15 +522,17 @@ impl Store { let mut res = Vec::with_capacity(results); let cur_time = Instant::now(); - let mut nodes = self.nodes.write().unwrap(); - for (idx, (state, state_nodes)) in nodes.state_next_scan.iter_mut().enumerate() { - let cmp_time = cur_time - Duration::from_secs(self.get_u64(U64Setting::RescanInterval(*state))); - let split_point = cmp::min(cmp::min(results - res.len(), results - (per_bucket_results * (AddressState::get_count() as usize - idx))), - 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 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); + mem::swap(&mut new_nodes, state_nodes); + for (_, node) in new_nodes.drain(..) { + res.push(node); + } } } res.shuffle(&mut thread_rng());