milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Distinguish between network/decode errors in network message decode 

It is now visible that EOF (i.e. peer hung up) is interpreted
as a message decode error. Probably what we want to do is reset
the connection on any error. TODO
This commit is contained in:
Andrew Poelstra 2014-07-23 11:22:35 -07:00
parent 9cb86dd21b
commit b5c25ff768
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/socket.rs
View File

@ -28,6 +28,7 @@ use network::address::Address;
use network::message::{RawNetworkMessage, NetworkMessage, Version}; use network::message::{RawNetworkMessage, NetworkMessage, Version};
use network::serialize::Serializable; use network::serialize::Serializable;
use network::message_network::VersionMessage; use network::message_network::VersionMessage;
use util::misc::prepend_err;
/// Format an IP address in the 16-byte bitcoin protocol serialization /// Format an IP address in the 16-byte bitcoin protocol serialization
fn ipaddr_to_bitcoin_addr(ipaddr: &ip::IpAddr) -> [u8, ..16] { fn ipaddr_to_bitcoin_addr(ipaddr: &ip::IpAddr) -> [u8, ..16] {
@ -182,11 +183,11 @@ impl Socket {
// Return // Return
match read_err { match read_err {
// Network errors get priority since they are probably more meaningful // Network errors get priority since they are probably more meaningful
Some(e) => Err(e), Some(e) => prepend_err("network", Err(e)),
_ => { _ => {
match ret { match ret {
// Next come parse errors // Next come parse errors
Err(e) => Err(e), Err(e) => prepend_err("decode", Err(e)),
Ok(ret) => { Ok(ret) => {
// Finally magic (this should come before parse error, but we can't // Finally magic (this should come before parse error, but we can't
// get to it if the deserialization failed). TODO restructure this // get to it if the deserialization failed). TODO restructure this