X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain.rs;h=c86529e95295e9d8932d7e4acfbec59e8747bd0e;hb=820109e4f9b0b820a4c7c0f75670000548e6e760;hp=f72ba343a1972cbc1ddb03e06e2584ee7e25ded1;hpb=a264197c4fa7babe2ce2865f1b12e4db07ae687e;p=dnsseed-rust

diff --git a/src/main.rs b/src/main.rs
index f72ba34..c86529e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,7 @@
 mod printer;
 mod reader;
 mod peer;
+mod bgp_client;
 mod timeout_stream;
 mod datastore;
 
@@ -25,6 +26,7 @@ use peer::Peer;
 use datastore::{AddressState, Store, U64Setting, RegexSetting};
 use timeout_stream::TimeoutStream;
 use rand::Rng;
+use bgp_client::BGPClient;
 
 use tokio::prelude::*;
 use tokio::timer::Delay;
@@ -35,6 +37,7 @@ static mut HEADER_MAP: Option<Box<Mutex<HashMap<sha256d::Hash, u64>>>> = None;
 static mut HEIGHT_MAP: Option<Box<Mutex<HashMap<u64, sha256d::Hash>>>> = None;
 static mut DATA_STORE: Option<Box<Store>> = None;
 static mut PRINTER: Option<Box<Printer>> = None;
+static mut TOR_PROXY: Option<SocketAddr> = None;
 pub static START_SHUTDOWN: AtomicBool = AtomicBool::new(false);
 static SCANNING: AtomicBool = AtomicBool::new(false);
 
@@ -75,7 +78,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) {
 	let peer = Delay::new(scan_time).then(move |_| {
 		printer.set_stat(Stat::NewConnection);
 		let timeout = store.get_u64(U64Setting::RunTimeout);
-		Peer::new(node.clone(), Duration::from_secs(timeout), printer)
+		Peer::new(node.clone(), unsafe { TOR_PROXY.as_ref().unwrap() }, Duration::from_secs(timeout), printer)
 	});
 	tokio::spawn(peer.and_then(move |(mut write, read)| {
 		TimeoutStream::new_timeout(read, scan_time + Duration::from_secs(store.get_u64(U64Setting::RunTimeout))).map_err(move |err| {
@@ -245,7 +248,7 @@ pub fn scan_node(scan_time: Instant, node: SocketAddr, manual: bool) {
 	}));
 }
 
-fn poll_dnsseeds() {
+fn poll_dnsseeds(bgp_client: Arc<BGPClient>) {
 	tokio::spawn(future::lazy(|| {
 		let printer = unsafe { PRINTER.as_ref().unwrap() };
 		let store = unsafe { DATA_STORE.as_ref().unwrap() };
@@ -258,10 +261,12 @@ fn poll_dnsseeds() {
 		printer.add_line(format!("Added {} new addresses from other DNS seeds", new_addrs), false);
 		Delay::new(Instant::now() + Duration::from_secs(60)).then(|_| {
 			let store = unsafe { DATA_STORE.as_ref().unwrap() };
-			let dns_future = store.write_dns();
+			let dns_future = store.write_dns(Arc::clone(&bgp_client));
 			store.save_data().join(dns_future).then(|_| {
 				if !START_SHUTDOWN.load(Ordering::Relaxed) {
-					poll_dnsseeds();
+					poll_dnsseeds(bgp_client);
+				} else {
+					bgp_client.disconnect();
 				}
 				future::ok(())
 			})
@@ -284,7 +289,7 @@ fn scan_net() {
 			scan_node(iter_time, node, false);
 			iter_time += per_iter_time;
 		}
-		Delay::new(cmp::max(iter_time, start_time + Duration::from_secs(1))).then(|_| {
+		Delay::new(cmp::max(iter_time, start_time + Duration::from_secs(1))).then(move |_| {
 			if !START_SHUTDOWN.load(Ordering::Relaxed) {
 				scan_net();
 			}
@@ -293,9 +298,10 @@ fn scan_net() {
 	}));
 }
 
-fn make_trusted_conn(trusted_sockaddr: SocketAddr) {
+fn make_trusted_conn(trusted_sockaddr: SocketAddr, bgp_client: Arc<BGPClient>) {
 	let printer = unsafe { PRINTER.as_ref().unwrap() };
-	let trusted_peer = Peer::new(trusted_sockaddr.clone(), Duration::from_secs(600), printer);
+	let trusted_peer = Peer::new(trusted_sockaddr.clone(), unsafe { TOR_PROXY.as_ref().unwrap() }, Duration::from_secs(600), printer);
+	let bgp_reload = Arc::clone(&bgp_client);
 	tokio::spawn(trusted_peer.and_then(move |(mut trusted_write, trusted_read)| {
 		printer.add_line("Connected to local peer".to_string(), false);
 		let mut starting_height = 0;
@@ -378,7 +384,7 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) {
 						*unsafe { REQUEST_BLOCK.as_ref().unwrap() }.lock().unwrap() = Arc::new((height, hash, block));
 						if !SCANNING.swap(true, Ordering::SeqCst) {
 							scan_net();
-							poll_dnsseeds();
+							poll_dnsseeds(Arc::clone(&bgp_client));
 						}
 					}
 				},
@@ -396,15 +402,15 @@ fn make_trusted_conn(trusted_sockaddr: SocketAddr) {
 	}).then(move |_: Result<(), ()>| {
 		if !START_SHUTDOWN.load(Ordering::Relaxed) {
 			printer.add_line("Lost connection from trusted peer".to_string(), true);
-			make_trusted_conn(trusted_sockaddr);
+			make_trusted_conn(trusted_sockaddr, bgp_reload);
 		}
 		future::ok(())
 	}));
 }
 
 fn main() {
-	if env::args().len() != 3 {
-		println!("USAGE: dnsseed-rust datastore localPeerAddress");
+	if env::args().len() != 5 {
+		println!("USAGE: dnsseed-rust datastore localPeerAddress tor_proxy_addr bgp_peer");
 		return;
 	}
 
@@ -423,17 +429,22 @@ fn main() {
 		let mut args = env::args();
 		args.next();
 		let path = args.next().unwrap();
-		let addr = args.next().unwrap();
+		let trusted_sockaddr: SocketAddr = args.next().unwrap().parse().unwrap();
+
+		let tor_socks5_sockaddr: SocketAddr = args.next().unwrap().parse().unwrap();
+		unsafe { TOR_PROXY = Some(tor_socks5_sockaddr); }
+
+		let bgp_sockaddr: SocketAddr = args.next().unwrap().parse().unwrap();
 
 		Store::new(path).and_then(move |store| {
 			unsafe { DATA_STORE = Some(Box::new(store)) };
 			let store = unsafe { DATA_STORE.as_ref().unwrap() };
 			unsafe { PRINTER = Some(Box::new(Printer::new(store))) };
 
-			let trusted_sockaddr: SocketAddr = addr.parse().unwrap();
-			make_trusted_conn(trusted_sockaddr);
+			let bgp_client = BGPClient::new(bgp_sockaddr, Duration::from_secs(60), unsafe { PRINTER.as_ref().unwrap() });
+			make_trusted_conn(trusted_sockaddr, Arc::clone(&bgp_client));
 
-			reader::read(store, unsafe { PRINTER.as_ref().unwrap() });
+			reader::read(store, unsafe { PRINTER.as_ref().unwrap() }, bgp_client);
 
 			future::ok(())
 		}).or_else(|_| {