mirrors/electrs
1
0
Fork 0
mirror of https://github.com/romanz/electrs.git synced 2024-11-19 01:43:29 +01:00
Code Issues Projects Releases Wiki Activity

Improve error logging in case of p2p parsing error

Browse Source 
Following https://github.com/rootzoll/raspiblitz/issues/3447
This commit is contained in:
Roman Zeyde 2022-11-19 21:03:40 +02:00
parent 83dd3dd509
commit 3cdff3dcb2
No known key found for this signature in database
GPG Key ID: 87CAE5FA46917CBB
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/p2p.rs
View File

@ -4,7 +4,7 @@ use bitcoin::{
encode::{self, ReadExt, VarInt},
Decodable,
},
hashes::Hash,
hashes::{hex::ToHex, Hash},
network::{
address, constants,
message::{self, CommandString, NetworkMessage},
@ -248,8 +248,10 @@ impl Connection {
};
let label = format!("parse_{}", raw_msg.cmd.as_ref());
let msg = parse_duration
.observe_duration(&label, || raw_msg.parse().expect("invalid message"));
let msg = match parse_duration.observe_duration(&label, || raw_msg.parse()) {
Ok(msg) => msg,
Err(err) => bail!("failed to parse '{}({})': {}", raw_msg.cmd, raw_msg.raw.to_hex(), err),
};
trace!("recv: {:?}", msg);
match msg {
@ -338,7 +340,7 @@ struct RawNetworkMessage {
}
impl RawNetworkMessage {
fn parse(self) -> Result<NetworkMessage, encode::Error> {
fn parse(&self) -> Result<NetworkMessage> {
let mut raw: &[u8] = &self.raw;
let payload = match self.cmd.as_ref() {
"version" => NetworkMessage::Version(Decodable::consensus_decode(&mut raw)?),
@ -359,10 +361,11 @@ impl RawNetworkMessage {
"reject" => NetworkMessage::Reject(Decodable::consensus_decode(&mut raw)?),
"alert" => NetworkMessage::Alert(Decodable::consensus_decode(&mut raw)?),
"addr" => NetworkMessage::Addr(Decodable::consensus_decode(&mut raw)?),
_ => NetworkMessage::Unknown {
command: self.cmd,
payload: self.raw,
},
_ => bail!(
"unsupported message: command={}, payload={}",
self.cmd,
self.raw.to_hex()
),
};
Ok(payload)
}