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

propagates errors out of Packet::from_data (#13445)

Browse Source 
Packet::from_data is ignoring serialization errors:
https://github.com/solana-labs/solana/blob/d08c3232e/sdk/src/packet.rs#L42-L48
This is likely never useful as the packet will be sent over the wire
taking bandwidth but at the receiving end will either fail to
deserialize or it will be invalid.
This commit will propagate the errors out of the function to the
call-site, allowing the call-site to handle the error.
This commit is contained in:
behzad nouri
2020-11-08 15:10:03 +00:00
committed by GitHub
parent 737d3e376d
commit 73ac104df2
2 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/src/cluster_info.rs
View File

@ -1978,8 +1978,10 @@ impl ClusterInfo {
let (check, ping) = ping_cache.check(now, node, &mut pingf);
if let Some(ping) = ping {
let ping = Protocol::PingMessage(ping);
let ping = Packet::from_data(&node.1, ping);
packets.packets.push(ping);
match Packet::from_data(&node.1, ping) {
Ok(packet) => packets.packets.push(packet),
Err(err) => error!("failed to write ping packet: {:?}", err),
};
}
if !check {
self.stats
@ -2083,14 +2085,18 @@ impl ClusterInfo {
let from_addr = pull_responses[stat.to].1;
let response = pull_responses[stat.to].0[stat.responses_index].clone();
let protocol = Protocol::PullResponse(self_id, vec![response]);
let new_packet = Packet::from_data(&from_addr, protocol);
if self.outbound_budget.take(new_packet.meta.size) {
sent.insert(index);
total_bytes += new_packet.meta.size;
packets.packets.push(new_packet)
} else {
inc_new_counter_info!("gossip_pull_request-no_budget", 1);
break;
match Packet::from_data(&from_addr, protocol) {
Err(err) => error!("failed to write pull-response packet: {:?}", err),
Ok(packet) => {
if self.outbound_budget.take(packet.meta.size) {
sent.insert(index);
total_bytes += packet.meta.size;
packets.packets.push(packet)
} else {
inc_new_counter_info!("gossip_pull_request-no_budget", 1);
break;
}
}
}
}
time.stop();
@ -2281,8 +2287,13 @@ impl ClusterInfo {
.filter_map(|(addr, ping)| {
let pong = Pong::new(&ping, &self.keypair).ok()?;
let pong = Protocol::PongMessage(pong);
let packet = Packet::from_data(&addr, pong);
Some(packet)
match Packet::from_data(&addr, pong) {
Ok(packet) => Some(packet),
Err(err) => {
error!("failed to write pong packet: {:?}", err);
None
}
}
})
.collect();
if packets.is_empty() {
@ -2413,8 +2424,10 @@ impl ClusterInfo {
inc_new_counter_debug!("cluster_info-push_message-pushes", new_push_requests.len());
for (address, request) in new_push_requests {
if ContactInfo::is_valid_address(&address) {
let packet = Packet::from_data(&address, &request);
packets.packets.push(packet);
match Packet::from_data(&address, &request) {
Ok(packet) => packets.packets.push(packet),
Err(err) => error!("failed to write push-request packet: {:?}", err),
}
} else {
trace!("Dropping Gossip push response, as destination is unknown");
}