Noratrieb/haesli
1
0
Fork 0
mirror of https://github.com/Noratrieb/haesli.git synced 2026-01-16 12:45:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

parse the frame type

Browse source
This commit is contained in:
nora 2022-02-09 15:19:18 +01:00
parent ccee6c36f6
commit e5fa49a05a
2 changed files with 32 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
amqp_transport/src/connection.rs
View file

@ -1,6 +1,6 @@
use crate::error::{ProtocolError, TransError}; use crate::error::{ProtocolError, TransError};
use crate::frame; use crate::frame;
use anyhow::{ensure, Context}; use anyhow::Context;
use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tokio::net::TcpStream; use tokio::net::TcpStream;
use tracing::{debug, error}; use tracing::{debug, error};
@ -58,7 +58,7 @@ impl Connection {
Ok(()) Ok(())
} else { } else {
debug!(?version, expected_version = ?PROTOCOL_VERSION, "Version negotiation failed, unsupported version"); debug!(?version, expected_version = ?PROTOCOL_VERSION, "Version negotiation failed, unsupported version");
return Err(ProtocolError::OtherCloseConnection.into()); Err(ProtocolError::OtherCloseConnection.into())
} }
} }
} }

35
amqp_transport/src/frame.rs
View file

@ -13,9 +13,10 @@ mod frame_type {
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct Frame { pub struct Frame {
/// type /// The type of the frame including its parsed metadata.
kind: FrameType, kind: FrameType,
channel: u16, channel: u16,
/// Includes the whole payload, also including the metadata from each type.
payload: Vec<u8>, payload: Vec<u8>,
} }
@ -26,8 +27,6 @@ pub enum FrameType {
/// 2 /// 2
Header { Header {
class_id: u16, class_id: u16,
/// Unused, must always be 0
weight: u16,
body_size: u64, body_size: u64,
/// Ordered from high to low /// Ordered from high to low
property_flags: u16, property_flags: u16,
@ -59,7 +58,7 @@ where
return Err(ProtocolError::ConException(ConException::FrameError).into()); return Err(ProtocolError::ConException(ConException::FrameError).into());
} }
let kind = parse_frame_type(kind, &payload)?; let kind = parse_frame_type(kind, &payload, channel)?;
Ok(Frame { Ok(Frame {
kind, kind,
@ -70,7 +69,33 @@ where
fn parse_frame_type(kind: u8, payload: &[u8], channel: u16) -> Result<FrameType, TransError> { fn parse_frame_type(kind: u8, payload: &[u8], channel: u16) -> Result<FrameType, TransError> {
match kind { match kind {
frame_type::METHOD => todo!(), frame_type::METHOD => {
let class_id = u16::from_be_bytes(payload[0..2].try_into().unwrap());
let method_id = u16::from_be_bytes(payload[2..4].try_into().unwrap());
Ok(FrameType::Method {
class_id,
method_id,
})
}
frame_type::HEADER => {
let class_id = u16::from_be_bytes(payload[0..2].try_into().unwrap());
let weight = u16::from_be_bytes(payload[2..4].try_into().unwrap());
// weight is unused and must always be 0
if weight != 0 {
return Err(ProtocolError::ConException(ConException::FrameError).into());
}
let body_size = u64::from_be_bytes(payload[4..12].try_into().unwrap());
let property_flags = u16::from_be_bytes(payload[12..14].try_into().unwrap());
Ok(FrameType::Header {
class_id,
body_size,
property_flags,
})
}
frame_type::BODY => Ok(FrameType::Body),
frame_type::HEARTBEAT => { frame_type::HEARTBEAT => {
if channel != 0 { if channel != 0 {
Err(ProtocolError::ConException(ConException::FrameError).into()) Err(ProtocolError::ConException(ConException::FrameError).into())