blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

asserts that socket addresses set in new_with_external_ip are valid (#32860) 

new_with_external_ip silently ignores errors when setting socket
addresses which makes it harder to catch bugs:
https://github.com/solana-labs/solana/blob/7beeb8310/gossip/src/cluster_info.rs#L3054-L3063
This commit is contained in:
behzad nouri 2023-08-16 20:41:40 +00:00 committed by GitHub
parent 7beeb83104
commit a9ecdc0ae5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gossip/src/cluster_info.rs
View File

@ -3051,16 +3051,19 @@ impl Node {
0u16, // shred_version 0u16, // shred_version
); );
let addr = gossip_addr.ip(); let addr = gossip_addr.ip();
let _ = info.set_gossip((addr, gossip_port)); info.set_gossip((addr, gossip_port)).unwrap();
let _ = info.set_tvu((addr, tvu_port)); info.set_tvu((addr, tvu_port)).unwrap();
let _ = info.set_tvu_quic((addr, tvu_quic_port)); info.set_tvu_quic((addr, tvu_quic_port)).unwrap();
let _ = info.set_tpu(public_tpu_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_port))); info.set_tpu(public_tpu_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_port)))
let _ = info.set_tpu_forwards( .unwrap();
info.set_tpu_forwards(
public_tpu_forwards_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_forwards_port)), public_tpu_forwards_addr.unwrap_or_else(|| SocketAddr::new(addr, tpu_forwards_port)),
); )
let _ = info.set_tpu_vote((addr, tpu_vote_port)); .unwrap();
let _ = info.set_serve_repair((addr, serve_repair_port)); info.set_tpu_vote((addr, tpu_vote_port)).unwrap();
let _ = info.set_serve_repair_quic((addr, serve_repair_quic_port)); info.set_serve_repair((addr, serve_repair_port)).unwrap();
info.set_serve_repair_quic((addr, serve_repair_quic_port))
.unwrap();
trace!("new ContactInfo: {:?}", info); trace!("new ContactInfo: {:?}", info);
Node { Node {