From 0bf0e79132ea4a05ff249e7423031c18eff96071 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Wed, 9 Aug 2017 11:43:55 -0700 Subject: [PATCH] Tweaks --- examples/server.rs | 4 +++- src/proto/connection.rs | 10 +++------- src/proto/framed_read.rs | 9 +++++++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/examples/server.rs b/examples/server.rs index a88a4be..f1fcff1 100644 --- a/examples/server.rs +++ b/examples/server.rs @@ -42,7 +42,9 @@ pub fn main() { .status(status::OK) .body(()).unwrap(); - stream.send_response(response, true).unwrap(); + if let Err(e) = stream.send_response(response, true) { + println!(" error responding; err={:?}", e); + } Ok(()) }) diff --git a/src/proto/connection.rs b/src/proto/connection.rs index 9c2541e..de4c65e 100644 --- a/src/proto/connection.rs +++ b/src/proto/connection.rs @@ -94,6 +94,7 @@ impl Connection pub fn poll(&mut self) -> Poll<(), ConnectionError> { match self.poll2() { Err(e) => { + debug!("Connection::poll; err={:?}", e); self.streams.recv_err(&e); Err(e) } @@ -143,18 +144,13 @@ impl Connection // TODO: ACK must be sent THEN settings applied. } Some(Ping(frame)) => { - unimplemented!(); - /* trace!("recv PING; frame={:?}", frame); self.ping_pong.recv_ping(frame); - */ } Some(WindowUpdate(frame)) => { - unimplemented!(); - /* trace!("recv WINDOW_UPDATE; frame={:?}", frame); - try!(self.streams.recv_window_update(frame)); - */ + // TODO: implement + // try!(self.streams.recv_window_update(frame)); } None => { // TODO: Is this correct? diff --git a/src/proto/framed_read.rs b/src/proto/framed_read.rs index 412b154..5397b7c 100644 --- a/src/proto/framed_read.rs +++ b/src/proto/framed_read.rs @@ -95,8 +95,13 @@ impl FramedRead { Kind::PushPromise => { frame::PushPromise::load(head, &bytes[frame::HEADER_LEN..])?.into() } - Kind::Priority | - Kind::Continuation | + Kind::Priority => { + // TODO: implement + return Ok(None); + } + Kind::Continuation => { + unimplemented!(); + } Kind::Unknown => { unimplemented!() }