X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fdatastore.rs;h=9032b09c056b86d127ac29e7e31c543ca9099981;hb=2cf23b8a5638990cbf244e7aaf0b9b8b47f24f2e;hp=1a3d7c94024ce75dd1cd78dabe13dc29eadcf942;hpb=af2cd26873a4ca90fd5c44a3b8d19ac6cfbbaf34;p=dnsseed-rust

diff --git a/src/datastore.rs b/src/datastore.rs
index 1a3d7c9..9032b09 100644
--- a/src/datastore.rs
+++ b/src/datastore.rs
@@ -27,8 +27,12 @@ pub enum AddressState {
 	ProtocolViolation,
 	Timeout,
 	TimeoutDuringRequest,
+	TimeoutAwaitingPong,
+	TimeoutAwaitingAddr,
+	TimeoutAwaitingBlock,
 	Good,
 	WasGood,
+	EvilNode,
 }
 
 impl AddressState {
@@ -43,8 +47,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 +68,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 +88,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
 	}
 }
 
@@ -153,7 +169,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 +183,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<U64Setting, u64>, Regex), ()> {
 			let mut u64s = HashMap::with_capacity(15);
@@ -184,9 +204,13 @@ 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()))
 		});
 
@@ -360,7 +384,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{}",
+			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),
@@ -374,8 +398,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()