trinity-1686a/netapp
1
0
Fork 0
forked from lx/netapp
Code Issues Pull requests 1 Projects Releases Wiki Activity

Move things around and fix error bit

Browse source
This commit is contained in:
Alex 2022-07-22 13:06:10 +02:00
parent 9cb28c21b4
commit 5da59ebec5
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/endpoint.rs
View file

@ -7,7 +7,6 @@ use async_trait::async_trait;
use crate::error::Error; use crate::error::Error;
use crate::message::*; use crate::message::*;
use crate::netapp::*; use crate::netapp::*;
use crate::util::*;
/// This trait should be implemented by an object of your application /// This trait should be implemented by an object of your application
/// that can handle a message of type `M`, if it wishes to handle /// that can handle a message of type `M`, if it wishes to handle

1
src/lib.rs
View file

@ -29,7 +29,6 @@ pub mod netapp;
pub mod peering; pub mod peering;
pub use crate::netapp::*; pub use crate::netapp::*;
pub use util::{NetworkKey, NodeID, NodeKey};
#[cfg(test)] #[cfg(test)]
mod test; mod test;

8
src/netapp.rs
View file

@ -22,7 +22,13 @@ use crate::endpoint::*;
use crate::error::*; use crate::error::*;
use crate::message::*; use crate::message::*;
use crate::server::*; use crate::server::*;
use crate::util::*;
/// A node's identifier, which is also its public cryptographic key
pub type NodeID = sodiumoxide::crypto::sign::ed25519::PublicKey;
/// A node's secret key
pub type NodeKey = sodiumoxide::crypto::sign::ed25519::SecretKey;
/// A network key
pub type NetworkKey = sodiumoxide::crypto::auth::Key;
/// Tag which is exchanged between client and server upon connection establishment /// Tag which is exchanged between client and server upon connection establishment
/// to check that they are running compatible versions of Netapp, /// to check that they are running compatible versions of Netapp,

2
src/recv.rs
View file

@ -75,7 +75,7 @@ pub(crate) trait RecvLoop: Sync + 'static {
let has_cont = (size & CHUNK_HAS_CONTINUATION) != 0; let has_cont = (size & CHUNK_HAS_CONTINUATION) != 0;
let is_error = (size & ERROR_MARKER) != 0; let is_error = (size & ERROR_MARKER) != 0;
let packet = if is_error { let packet = if is_error {
Err(size as u8) Err((size & !ERROR_MARKER) as u8)
} else { } else {
let size = size & !CHUNK_HAS_CONTINUATION; let size = size & !CHUNK_HAS_CONTINUATION;
let mut next_slice = vec![0; size as usize]; let mut next_slice = vec![0; size as usize];

7
src/util.rs
View file

@ -6,12 +6,7 @@ use serde::Serialize;
use tokio::sync::watch; use tokio::sync::watch;
/// A node's identifier, which is also its public cryptographic key use crate::netapp::*;
pub type NodeID = sodiumoxide::crypto::sign::ed25519::PublicKey;
/// A node's secret key
pub type NodeKey = sodiumoxide::crypto::sign::ed25519::SecretKey;
/// A network key
pub type NetworkKey = sodiumoxide::crypto::auth::Key;
/// Utility function: encodes any serializable value in MessagePack binary format /// Utility function: encodes any serializable value in MessagePack binary format
/// using the RMP library. /// using the RMP library.