X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=18aa0e68d067509a71ed992ca791b7b533c656db;hb=b2521170a57b654f8df69aacf8ccdfdb744d5172;hp=c8638181163e612eae57ff7f04bcc1f589af9ef6;hpb=770f7c805140bf6ae074ee0b3854d990ea61b67d;p=dnsseed-rust diff --git a/src/datastore.rs b/src/datastore.rs index c863818..18aa0e6 100644 --- a/src/datastore.rs +++ b/src/datastore.rs @@ -31,6 +31,61 @@ pub enum AddressState { WasGood, } +impl AddressState { + pub fn from_num(num: u8) -> Option { + match num { + 0x0 => Some(AddressState::Untested), + 0x1 => Some(AddressState::LowBlockCount), + 0x2 => Some(AddressState::HighBlockCount), + 0x3 => Some(AddressState::LowVersion), + 0x4 => Some(AddressState::BadVersion), + 0x5 => Some(AddressState::NotFullNode), + 0x6 => Some(AddressState::ProtocolViolation), + 0x7 => Some(AddressState::Timeout), + 0x8 => Some(AddressState::TimeoutDuringRequest), + 0x9 => Some(AddressState::Good), + 0xa => Some(AddressState::WasGood), + _ => None, + } + } + + pub fn to_num(&self) -> u8 { + match *self { + AddressState::Untested => 0, + AddressState::LowBlockCount => 1, + AddressState::HighBlockCount => 2, + AddressState::LowVersion => 3, + AddressState::BadVersion => 4, + AddressState::NotFullNode => 5, + AddressState::ProtocolViolation => 6, + AddressState::Timeout => 7, + AddressState::TimeoutDuringRequest => 8, + AddressState::Good => 9, + AddressState::WasGood => 10, + } + } + + pub fn to_str(&self) -> &'static str { + match *self { + AddressState::Untested => "Untested", + AddressState::LowBlockCount => "Low Block Count", + AddressState::HighBlockCount => "High Block Count", + AddressState::LowVersion => "Low Version", + AddressState::BadVersion => "Bad Version", + AddressState::NotFullNode => "Not Full Node", + AddressState::ProtocolViolation => "Protocol Violation", + AddressState::Timeout => "Timeout", + AddressState::TimeoutDuringRequest => "Timeout During Request", + AddressState::Good => "Good", + AddressState::WasGood => "Was Good", + } + } + + pub fn get_count() -> u8 { + 11 + } +} + #[derive(Hash, PartialEq, Eq)] pub enum U64Setting { ConnsPerSec, @@ -46,9 +101,10 @@ pub enum RegexSetting { } struct Node { - state: AddressState, - last_services: u64, last_update: Instant, + last_good: Instant, // Ignored unless state is Good or WasGood + last_services: u64, + state: AddressState, } struct Nodes { @@ -184,22 +240,13 @@ impl Store { let state = try_read!(line_iter, u8); let last_services = try_read!(line_iter, u64); let node = Node { - state: match state { - 0x0 => AddressState::Untested, - 0x1 => AddressState::LowBlockCount, - 0x2 => AddressState::HighBlockCount, - 0x3 => AddressState::LowVersion, - 0x4 => AddressState::BadVersion, - 0x5 => AddressState::NotFullNode, - 0x6 => AddressState::ProtocolViolation, - 0x7 => AddressState::Timeout, - 0x8 => AddressState::TimeoutDuringRequest, - 0x9 => AddressState::Good, - 0xa => AddressState::WasGood, - _ => return future::ok(res), + state: match AddressState::from_num(state) { + Some(v) => v, + None => return future::ok(res), }, last_services, last_update: Instant::now(), + last_good: Instant::now(), }; if node.state == AddressState::Good { for i in 0..64 { @@ -256,6 +303,7 @@ impl Store { state: AddressState::Untested, last_services: 0, last_update: cur_time, + last_good: Instant::now(), }); nodes.state_next_scan.get_mut(&AddressState::Untested).unwrap().push((cur_time, socketaddr)); }, @@ -267,12 +315,15 @@ impl Store { } } - pub fn set_node_state(&self, addr: SocketAddr, state: AddressState, services: u64) { + 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(); - state_ref.last_update = Instant::now(); - if state_ref.state == AddressState::Good && state != AddressState::Good { + let ret = state_ref.state; + let now = Instant::now(); + 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 { @@ -280,7 +331,7 @@ impl Store { } } state_ref.last_services = 0; - nodes.state_next_scan.get_mut(&AddressState::WasGood).unwrap().push((state_ref.last_update, addr)); + nodes.state_next_scan.get_mut(&AddressState::WasGood).unwrap().push((now, addr)); } else { state_ref.state = state; if state == AddressState::Good { @@ -291,9 +342,13 @@ impl Store { nodes.good_node_services.get_mut(&i).unwrap().remove(&addr); } } + state_ref.last_services = services; + state_ref.last_good = now; } - nodes.state_next_scan.get_mut(&state).unwrap().push((state_ref.last_update, addr)); + nodes.state_next_scan.get_mut(&state).unwrap().push((now, addr)); } + state_ref.last_update = now; + ret } pub fn save_data(&'static self) -> impl Future { @@ -332,19 +387,7 @@ impl Store { for (ref sockaddr, ref node) in nodes.nodes_to_state.iter() { nodes_buff += &sockaddr.to_string(); nodes_buff += ","; - nodes_buff += &match node.state { - AddressState::Untested => 0u8, - AddressState::LowBlockCount => 1u8, - AddressState::HighBlockCount => 2u8, - AddressState::LowVersion => 3u8, - AddressState::BadVersion => 4u8, - AddressState::NotFullNode => 5u8, - AddressState::ProtocolViolation => 6u8, - AddressState::Timeout => 7u8, - AddressState::TimeoutDuringRequest => 8u8, - AddressState::Good => 9u8, - AddressState::WasGood => 10u8, - }.to_string(); + nodes_buff += &node.state.to_num().to_string(); nodes_buff += ","; nodes_buff += &node.last_services.to_string(); nodes_buff += "\n"; @@ -363,15 +406,17 @@ impl Store { { let nodes = self.nodes.read().unwrap(); let mut rng = thread_rng(); - for i in 1u64..10u64 { + 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()).choose_multiple(&mut rng, 21).iter().map(|e| (*e).clone()).collect(); - v6_set = set_ref.iter().filter(|e| e.is_ipv6()).choose_multiple(&mut rng, 12).iter().map(|e| (*e).clone()).collect(); + 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; } } @@ -388,8 +433,12 @@ impl Store { } } } - v4_set = first_set.unwrap().intersection(second_set.unwrap()).filter(|e| e.is_ipv4()).choose_multiple(&mut rng, 21).iter().map(|e| (*e).clone()).collect(); - v6_set = first_set.unwrap().intersection(second_set.unwrap()).filter(|e| e.is_ipv6()).choose_multiple(&mut rng, 12).iter().map(|e| (*e).clone()).collect(); + 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; @@ -399,20 +448,25 @@ impl Store { 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(); + 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()); } } } - v4_set = intersection_set_ref.unwrap().iter().filter(|e| e.is_ipv4()).choose_multiple(&mut rng, 21).iter().map(|e| (*e).clone()).collect(); - v6_set = intersection_set_ref.unwrap().iter().filter(|e| e.is_ipv6()).choose_multiple(&mut rng, 12).iter().map(|e| (*e).clone()).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 { - dns_buff += &format!("x{:x}.dnsseed.bluematt.me\tIN\tA\t{}\n", i, a); + dns_buff += &format!("x{:x}.dnsseed\tIN\tA\t{}\n", i, a); } for a in v6_set { - dns_buff += &format!("x{:x}.dnsseed.bluematt.me\tIN\tAAAA\t{}\n", i, a); + dns_buff += &format!("x{:x}.dnsseed\tIN\tAAAA\t{}\n", i, a); } } } @@ -427,12 +481,15 @@ impl Store { } pub fn get_next_scan_nodes(&self) -> Vec { - let mut res = Vec::with_capacity(600); + 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 cur_time = Instant::now(); + let mut nodes = self.nodes.write().unwrap(); - for (state, state_nodes) in nodes.state_next_scan.iter_mut() { + 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(600 - res.len(), 60), + 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);