ProtocolViolation,
Timeout,
TimeoutDuringRequest,
+ TimeoutAwaitingAddr,
+ TimeoutAwaitingBlock,
Good,
WasGood,
}
0x6 => Some(AddressState::ProtocolViolation),
0x7 => Some(AddressState::Timeout),
0x8 => Some(AddressState::TimeoutDuringRequest),
- 0x9 => Some(AddressState::Good),
- 0xa => Some(AddressState::WasGood),
+ 0x9 => Some(AddressState::TimeoutAwaitingAddr),
+ 0xa => Some(AddressState::TimeoutAwaitingBlock),
+ 0xb => Some(AddressState::Good),
+ 0xc => Some(AddressState::WasGood),
_ => None,
}
}
AddressState::ProtocolViolation => 6,
AddressState::Timeout => 7,
AddressState::TimeoutDuringRequest => 8,
- AddressState::Good => 9,
- AddressState::WasGood => 10,
+ AddressState::TimeoutAwaitingAddr => 9,
+ AddressState::TimeoutAwaitingBlock => 10,
+ AddressState::Good => 11,
+ AddressState::WasGood => 12,
}
}
AddressState::ProtocolViolation => "Protocol Violation",
AddressState::Timeout => "Timeout",
AddressState::TimeoutDuringRequest => "Timeout During Request",
+ AddressState::TimeoutAwaitingAddr => "Timeout Awaiting Addr",
+ AddressState::TimeoutAwaitingBlock => "Timeout Awaiting Block",
AddressState::Good => "Good",
AddressState::WasGood => "Was Good",
}
}
- pub fn get_count() -> u8 {
- 11
+ pub const fn get_count() -> u8 {
+ 13
}
}
}
} }
}
- 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));
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::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));
future::ok((u64s, try_read!(l, Regex)))
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::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::MinProtocolVersion, 70002);
future::ok((u64s, Regex::new(".*").unwrap()))
});
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{}",
+ let settings_string = format!("{}\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),
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::TimeoutAwaitingAddr)),
+ self.get_u64(U64Setting::RescanInterval(AddressState::TimeoutAwaitingBlock)),
self.get_u64(U64Setting::RescanInterval(AddressState::Good)),
self.get_u64(U64Setting::RescanInterval(AddressState::WasGood)),
self.get_regex(RegexSetting::SubverRegex).as_str());