gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always bind to 0.0.0.0 regardless of what's being advertised to other nodes

Browse Source
This commit is contained in:
Michael Vines
2018-06-28 16:39:51 -07:00
committed by Grimes
parent a4c49af859
commit 47917d00d1
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/bin/fullnode.rs
View File

@ -126,12 +126,27 @@ fn main() {
} }
} }
let mut local_gossip_addr = bind_addr.clone();
local_gossip_addr.set_port(repl_data.gossip_addr.port());
let mut local_replicate_addr = bind_addr.clone();
local_replicate_addr.set_port(repl_data.replicate_addr.port());
let mut local_requests_addr = bind_addr.clone();
local_requests_addr.set_port(repl_data.requests_addr.port());
let mut local_transactions_addr = bind_addr.clone();
local_transactions_addr.set_port(repl_data.transactions_addr.port());
let mut local_repair_addr = bind_addr.clone();
local_repair_addr.set_port(repl_data.repair_addr.port());
let exit = Arc::new(AtomicBool::new(false)); let exit = Arc::new(AtomicBool::new(false));
let threads = if matches.opt_present("t") { let threads = if matches.opt_present("t") {
let testnet_address_string = matches.opt_str("t").unwrap(); let testnet_address_string = matches.opt_str("t").unwrap();
eprintln!( eprintln!(
"starting validator... {} connecting to {}", "starting validator... {} (advertising {}) connecting to {}",
repl_data.requests_addr, testnet_address_string local_requests_addr, repl_data.requests_addr, testnet_address_string
); );
let testnet_addr = testnet_address_string.parse().unwrap(); let testnet_addr = testnet_address_string.parse().unwrap();
let newtwork_entry_point = ReplicatedData::new_entry_point(testnet_addr); let newtwork_entry_point = ReplicatedData::new_entry_point(testnet_addr);
@ -139,17 +154,20 @@ fn main() {
bank, bank,
entry_height, entry_height,
repl_data.clone(), repl_data.clone(),
UdpSocket::bind(repl_data.requests_addr).unwrap(), UdpSocket::bind(local_requests_addr).unwrap(),
UdpSocket::bind("0.0.0.0:0").unwrap(), UdpSocket::bind("0.0.0.0:0").unwrap(),
UdpSocket::bind(repl_data.replicate_addr).unwrap(), UdpSocket::bind(local_replicate_addr).unwrap(),
UdpSocket::bind(repl_data.gossip_addr).unwrap(), UdpSocket::bind(local_gossip_addr).unwrap(),
UdpSocket::bind(repl_data.repair_addr).unwrap(), UdpSocket::bind(local_repair_addr).unwrap(),
newtwork_entry_point, newtwork_entry_point,
exit.clone(), exit.clone(),
); );
s.thread_hdls s.thread_hdls
} else { } else {
eprintln!("starting leader... {}", repl_data.requests_addr); eprintln!(
"starting leader... {} (advertising {})",
local_requests_addr, repl_data.requests_addr
);
repl_data.current_leader_id = repl_data.id.clone(); repl_data.current_leader_id = repl_data.id.clone();
let outfile: Box<Write + Send + 'static> = if matches.opt_present("o") { let outfile: Box<Write + Send + 'static> = if matches.opt_present("o") {
@ -167,17 +185,20 @@ fn main() {
//Some(Duration::from_millis(1000)), //Some(Duration::from_millis(1000)),
None, None,
repl_data.clone(), repl_data.clone(),
UdpSocket::bind(repl_data.requests_addr).unwrap(), UdpSocket::bind(local_requests_addr).unwrap(),
UdpSocket::bind(repl_data.transactions_addr).unwrap(), UdpSocket::bind(local_transactions_addr).unwrap(),
UdpSocket::bind("0.0.0.0:0").unwrap(), UdpSocket::bind("0.0.0.0:0").unwrap(),
UdpSocket::bind("0.0.0.0:0").unwrap(), UdpSocket::bind("0.0.0.0:0").unwrap(),
UdpSocket::bind(repl_data.gossip_addr).unwrap(), UdpSocket::bind(local_gossip_addr).unwrap(),
exit.clone(), exit.clone(),
outfile, outfile,
); );
server.thread_hdls server.thread_hdls
}; };
eprintln!("Ready. Listening on {}", repl_data.transactions_addr); eprintln!(
"Ready. Listening on {} (advertising {})",
local_transactions_addr, repl_data.transactions_addr
);
for t in threads { for t in threads {
t.join().expect("join"); t.join().expect("join");