mod printer;
mod reader;
mod peer;
+mod bgp_client;
mod timeout_stream;
mod datastore;
use datastore::{AddressState, Store, U64Setting, RegexSetting};
use timeout_stream::TimeoutStream;
use rand::Rng;
+use bgp_client::BGPClient;
use tokio::prelude::*;
use tokio::timer::Delay;
msg: (String::new(), false),
request: Arc::clone(&unsafe { REQUEST_BLOCK.as_ref().unwrap() }.lock().unwrap()),
}));
+ let err_peer_state = Arc::clone(&peer_state);
let final_peer_state = Arc::clone(&peer_state);
let peer = Delay::new(scan_time).then(move |_| {
Peer::new(node.clone(), 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(|_| { () }).for_each(move |msg| {
+ TimeoutStream::new_timeout(read, scan_time + Duration::from_secs(store.get_u64(U64Setting::RunTimeout))).map_err(move |err| {
+ match err {
+ bitcoin::consensus::encode::Error::UnrecognizedNetworkCommand(ref msg) => {
+ // If we got here, we hit one of the explicitly disallowed messages indicating
+ // a bogus "node".
+ let mut state_lock = err_peer_state.lock().unwrap();
+ state_lock.msg = (format!("(bad msg type {})", msg), true);
+ state_lock.fail_reason = AddressState::EvilNode;
+ },
+ _ => {},
+ }
+ ()
+ }).for_each(move |msg| {
let mut state_lock = peer_state.lock().unwrap();
macro_rules! check_set_flag {
($recvd_flag: ident, $msg: expr) => { {
check_set_flag!(recvd_block, "block");
return future::err(());
},
+ NetworkMessage::Inv(invs) => {
+ for inv in invs {
+ if inv.inv_type == InvType::Transaction {
+ state_lock.fail_reason = AddressState::EvilNode;
+ state_lock.msg = ("due to unrequested inv tx".to_string(), true);
+ return future::err(());
+ }
+ }
+ },
NetworkMessage::Tx(_) => {
- state_lock.fail_reason = AddressState::ProtocolViolation;
+ state_lock.fail_reason = AddressState::EvilNode;
state_lock.msg = ("due to unrequested transaction".to_string(), true);
return future::err(());
},
} else {
assert!(state_lock.fail_reason != AddressState::Good);
if state_lock.fail_reason == AddressState::TimeoutDuringRequest && state_lock.recvd_version && state_lock.recvd_verack {
- if !state_lock.recvd_addrs {
+ if !state_lock.recvd_pong {
+ state_lock.fail_reason = AddressState::TimeoutAwaitingPong;
+ } else if !state_lock.recvd_addrs {
state_lock.fail_reason = AddressState::TimeoutAwaitingAddr;
} else if !state_lock.recvd_block {
state_lock.fail_reason = AddressState::TimeoutAwaitingBlock;
}));
}
-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() };
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() };
- store.save_data().then(|_| {
+ 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(())
})
}));
}
-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 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;
*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));
}
}
},
}).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() != 4 {
+ println!("USAGE: dnsseed-rust datastore localPeerAddress bgp_peer");
return;
}
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 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(600), 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(|_| {