add support for configuring max frame size
- Adds `max_frame_size` to client and server builders - Pushes max_frame_size into Codec - Detects when the Codec triggers an error from a frame too big - Sends a GOAWAY when FRAME_SIZE_ERROR is encountered reading a frame
This commit is contained in:
@@ -146,6 +146,10 @@ impl Mock<frame::GoAway> {
|
||||
pub fn flow_control(self) -> Self {
|
||||
Mock(frame::GoAway::new(self.0.last_stream_id(), frame::Reason::FlowControlError))
|
||||
}
|
||||
|
||||
pub fn frame_size(self) -> Self {
|
||||
Mock(frame::GoAway::new(self.0.last_stream_id(), frame::Reason::FrameSizeError))
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Mock<frame::GoAway>> for SendFrame {
|
||||
|
||||
@@ -12,6 +12,18 @@ pub trait FutureExt: Future {
|
||||
Unwrap { inner: self }
|
||||
}
|
||||
|
||||
/// Panic on error, with a message.
|
||||
fn expect<T>(self, msg: T) -> Expect<Self>
|
||||
where Self: Sized,
|
||||
Self::Error: fmt::Debug,
|
||||
T: fmt::Display,
|
||||
{
|
||||
Expect {
|
||||
inner: self,
|
||||
msg: msg.to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Drive `other` by polling `self`.
|
||||
///
|
||||
/// `self` must not resolve before `other` does.
|
||||
@@ -51,6 +63,28 @@ impl<T> Future for Unwrap<T>
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ===== Expect ======
|
||||
|
||||
/// Panic on error
|
||||
pub struct Expect<T> {
|
||||
inner: T,
|
||||
msg: String,
|
||||
}
|
||||
|
||||
impl<T> Future for Expect<T>
|
||||
where T: Future,
|
||||
T::Item: fmt::Debug,
|
||||
T::Error: fmt::Debug,
|
||||
{
|
||||
type Item = T::Item;
|
||||
type Error = ();
|
||||
|
||||
fn poll(&mut self) -> Poll<T::Item, ()> {
|
||||
Ok(self.inner.poll().expect(&self.msg))
|
||||
}
|
||||
}
|
||||
|
||||
// ===== Drive ======
|
||||
|
||||
/// Drive a future to completion while also polling the driver
|
||||
|
||||
@@ -26,7 +26,7 @@ pub struct Handle {
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Pipe {
|
||||
pub struct Pipe {
|
||||
inner: Arc<Mutex<Inner>>,
|
||||
}
|
||||
|
||||
@@ -67,6 +67,11 @@ pub fn new() -> (Mock, Handle) {
|
||||
// ===== impl Handle =====
|
||||
|
||||
impl Handle {
|
||||
/// Get a mutable reference to inner Codec.
|
||||
pub fn codec_mut(&mut self) -> &mut ::Codec<Pipe> {
|
||||
&mut self.codec
|
||||
}
|
||||
|
||||
/// Send a frame
|
||||
pub fn send(&mut self, item: SendFrame) -> Result<(), SendError> {
|
||||
// Queue the frame
|
||||
@@ -237,7 +242,7 @@ impl io::Write for Mock {
|
||||
let mut me = self.pipe.inner.lock().unwrap();
|
||||
|
||||
if me.closed {
|
||||
return Err(io::ErrorKind::BrokenPipe.into());
|
||||
return Err(io::Error::new(io::ErrorKind::BrokenPipe, "mock closed"));
|
||||
}
|
||||
|
||||
me.tx.extend(buf);
|
||||
|
||||
@@ -44,3 +44,9 @@ impl<'a> Chunk for &'a str {
|
||||
dst.extend(self.as_bytes())
|
||||
}
|
||||
}
|
||||
|
||||
impl Chunk for Vec<u8> {
|
||||
fn push(&self, dst: &mut Vec<u8>) {
|
||||
dst.extend(self.iter())
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user