X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Freader.rs;h=fda65ba6f1426f9dda1bb4b45b8d3c1d71261f86;hb=21edf2b35ff92adc201314535c0f71fadcad0d77;hp=8250aaed871c44b49d794b3be394ec36c213c95d;hpb=1ad3d257518100cc938b4dabfff8636414131ce0;p=dnsseed-rust

diff --git a/src/reader.rs b/src/reader.rs
index 8250aae..fda65ba 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -43,22 +43,20 @@ pub fn read(store: &'static Store, printer: &'static Printer) {
 			"t" => store.set_u64(U64Setting::RunTimeout, try_parse_next_chunk!(u64)),
 			"v" => store.set_u64(U64Setting::MinProtocolVersion, try_parse_next_chunk!(u64)),
 			"w" => store.set_u64(U64Setting::WasGoodTimeout, try_parse_next_chunk!(u64)),
-			"s" => store.set_regex(RegexSetting::SubverRegex, try_parse_next_chunk!(Regex)),
-			"a" => scan_node(Instant::now(), try_parse_next_chunk!(SocketAddr)),
+			"s" => {
+				if line.len() < 3 || !line.starts_with("s ") {
+					err!();
+				}
+				store.set_regex(RegexSetting::SubverRegex, match line[2..].parse::<Regex>() {
+					Ok(res) => res,
+					Err(_) => err!(),
+				});
+			},
+			"a" => scan_node(Instant::now(), try_parse_next_chunk!(SocketAddr), true),
 			"r" => {
-				match try_parse_next_chunk!(u8) {
-					0 => store.set_u64(U64Setting::RescanInterval(AddressState::Untested), try_parse_next_chunk!(u64)),
-					1 => store.set_u64(U64Setting::RescanInterval(AddressState::LowBlockCount), try_parse_next_chunk!(u64)),
-					2 => store.set_u64(U64Setting::RescanInterval(AddressState::HighBlockCount), try_parse_next_chunk!(u64)),
-					3 => store.set_u64(U64Setting::RescanInterval(AddressState::LowVersion), try_parse_next_chunk!(u64)),
-					4 => store.set_u64(U64Setting::RescanInterval(AddressState::BadVersion), try_parse_next_chunk!(u64)),
-					5 => store.set_u64(U64Setting::RescanInterval(AddressState::NotFullNode), try_parse_next_chunk!(u64)),
-					6 => store.set_u64(U64Setting::RescanInterval(AddressState::ProtocolViolation), try_parse_next_chunk!(u64)),
-					7 => store.set_u64(U64Setting::RescanInterval(AddressState::Timeout), try_parse_next_chunk!(u64)),
-					8 => store.set_u64(U64Setting::RescanInterval(AddressState::TimeoutDuringRequest), try_parse_next_chunk!(u64)),
-					9 => store.set_u64(U64Setting::RescanInterval(AddressState::Good), try_parse_next_chunk!(u64)),
-					10 => store.set_u64(U64Setting::RescanInterval(AddressState::WasGood), try_parse_next_chunk!(u64)),
-					_ => err!(),
+				match AddressState::from_num(try_parse_next_chunk!(u8)) {
+					Some(state) => store.set_u64(U64Setting::RescanInterval(state), try_parse_next_chunk!(u64)),
+					None => err!(),
 				}
 			},
 			"q" => {