Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

nicer processing of message types

Browse source
This commit is contained in:
Garrick Ollivander 2016-10-29 15:51:24 +02:00
parent ee6fcab8db
commit d7dcd6d3ae
No known key found for this signature in database
GPG key ID: C6A92846C2C60645
3 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
p2p/Cargo.toml
View file

@ -10,6 +10,8 @@ log = "^0.3"
rand = "^0.3" rand = "^0.3"
mioco = "^0.8" mioco = "^0.8"
time = "^0.1" time = "^0.1"
enum_primitive = "^0.1.0"
num = "^0.1.36"
grin_core = { path = "../core" } grin_core = { path = "../core" }

3
p2p/src/lib.rs
View file

@ -24,6 +24,8 @@
#[macro_use] #[macro_use]
extern crate bitflags; extern crate bitflags;
#[macro_use] #[macro_use]
extern crate enum_primitive;
#[macro_use]
extern crate grin_core as core; extern crate grin_core as core;
#[macro_use] #[macro_use]
extern crate log; extern crate log;
@ -31,6 +33,7 @@ extern crate log;
extern crate mioco; extern crate mioco;
extern crate rand; extern crate rand;
extern crate time; extern crate time;
extern crate num;
mod types; mod types;
mod msg; mod msg;

27
p2p/src/msg.rs
View file

@ -16,6 +16,8 @@
use std::net::*; use std::net::*;
use num::FromPrimitive;
use core::ser::{self, Writeable, Readable, Writer, Reader, Error}; use core::ser::{self, Writeable, Readable, Writer, Reader, Error};
use types::*; use types::*;
@ -34,6 +36,7 @@ pub enum ErrCodes {
} }
/// Types of messages /// Types of messages
enum_from_primitive! {
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub enum Type { pub enum Type {
Error, Error,
@ -43,8 +46,7 @@ pub enum Type {
Pong, Pong,
GetPeerAddrs, GetPeerAddrs,
PeerAddrs, PeerAddrs,
/// Never used over the network but to detect unrecognized types. }
MaxMsgType,
} }
/// Header of any protocol message, used to identify incoming messages. /// Header of any protocol message, used to identify incoming messages.
@ -62,7 +64,7 @@ impl MsgHeader {
} }
pub fn acceptable(&self) -> bool { pub fn acceptable(&self) -> bool {
(self.msg_type as u8) < (Type::MaxMsgType as u8) Type::from_u8(self.msg_type as u8).is_some()
} }
} }
@ -81,23 +83,10 @@ impl Readable<MsgHeader> for MsgHeader {
try!(reader.expect_u8(MAGIC[0])); try!(reader.expect_u8(MAGIC[0]));
try!(reader.expect_u8(MAGIC[1])); try!(reader.expect_u8(MAGIC[1]));
let t = try!(reader.read_u8()); let t = try!(reader.read_u8());
if t >= (Type::MaxMsgType as u8) { match Type::from_u8(t) {
return Err(ser::Error::CorruptedData); Some(ty) => Ok(MsgHeader {magic: MAGIC, msg_type: ty}),
None => Err(ser::Error::CorruptedData)
} }
Ok(MsgHeader {
magic: MAGIC,
msg_type: match t {
// TODO this is rather ugly, think of a better way
0 => Type::Error,
1 => Type::Hand,
2 => Type::Shake,
3 => Type::Ping,
4 => Type::Pong,
5 => Type::GetPeerAddrs,
6 => Type::PeerAddrs,
_ => panic!(),
},
})
} }
} }