WasGood,
}
+impl AddressState {
+ pub fn from_num(num: u8) -> Option<AddressState> {
+ 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,
}
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 {
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 {
*self.subver_regex.write().unwrap() = Arc::new(value);
}
- pub fn add_fresh_nodes(&self, addresses: &Vec<(u32, Address)>) {
+ pub fn add_fresh_addrs<I: Iterator<Item=SocketAddr>>(&self, addresses: I) -> u64 {
+ let mut res = 0;
let mut nodes = self.nodes.write().unwrap();
let cur_time = Instant::now();
- for &(_, ref addr) in addresses {
- if let Ok(socketaddr) = addr.socket_addr() {
- match nodes.nodes_to_state.entry(socketaddr.clone()) {
- hash_map::Entry::Vacant(e) => {
- e.insert(Node {
- state: AddressState::Untested,
- last_services: 0,
- last_update: cur_time,
- });
- nodes.state_next_scan.get_mut(&AddressState::Untested).unwrap().push((cur_time, socketaddr));
- },
- hash_map::Entry::Occupied(_) => {},
- }
- } else {
- //TODO: Handle onions
+ for addr in addresses {
+ match nodes.nodes_to_state.entry(addr.clone()) {
+ hash_map::Entry::Vacant(e) => {
+ e.insert(Node {
+ 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, addr));
+ res += 1;
+ },
+ hash_map::Entry::Occupied(_) => {},
}
}
+ res
+ }
+
+ pub fn add_fresh_nodes(&self, addresses: &Vec<(u32, Address)>) {
+ self.add_fresh_addrs(addresses.iter().filter_map(|(_, addr)| {
+ match addr.socket_addr() {
+ Ok(socketaddr) => Some(socketaddr),
+ Err(_) => None, // TODO: Handle onions
+ }
+ }));
}
- 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 {
}
}
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 {
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<Item=(), Error=()> {
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";
{
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 {
.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);
}
}
}
}
pub fn get_next_scan_nodes(&self) -> Vec<SocketAddr> {
- 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);
projects / dnsseed-rust / blobdiff