test response to dummy request

some small bug fixes added as well as logging

Author: ThetaSinner

scripts/header_only.py

@@ -12,3 +12,7 @@
 my_socket = socket.socket()
 my_socket.connect(("127.0.0.1", 8080))
 my_socket.send(frame)
+
+response = my_socket.recv(1024)
+
+print(response)

src/http2/core/mod.rs

@@ -157,6 +157,7 @@ impl<'a, 'b> Connection<'a, 'b> {
 
                 // Fetch any send frames which have been generated on the stream.
                 self.send_frames.extend(stream.fetch_send_frames());
+                trace!("Finished processing headers on stream [{}]. Frames ready for send [{:?}]", frame.header.stream_id, self.send_frames);
             },
             _ => {
                 panic!("can't handle that frame type yet");

src/http2/frame/continuation.rs

@@ -24,6 +24,7 @@ use super::FrameType;
 
 const FLAG_END_HEADERS: u8 = 0x4;
 
+#[derive(Debug)]
 pub struct ContinuationFrameCompressModel {
     flags: u8,
     header_block_fragment: Vec<u8>

src/http2/frame/data.rs

@@ -25,6 +25,7 @@ use super::FrameType;
 const FLAG_END_STREAM: u8 = 0x1;
 const FLAG_PADDED: u8 = 0x8;
 
+#[derive(Debug)]
 pub struct DataFrameCompressModel {
     flags: u8,
     pad_length: u8,

src/http2/frame/go_away.rs

@@ -25,6 +25,7 @@ use super::FrameType;
 
 const LAST_STREAM_IDENTIFIER_BIT_MASK: u8 = 0x80;
 
+#[derive(Debug)]
 pub struct GoAwayFrameCompressModel {
     last_stream_identifier: u32,
     error_code: error::ErrorCode,

src/http2/frame/headers.rs

@@ -29,6 +29,7 @@ const FLAG_PRIORITY: u8 = 0x20;
 
 const STREAM_DEPENDENCY_EXCLUSIVE_BIT_MASK: u8 = 0x80;
 
+#[derive(Debug)]
 pub struct HeadersFrameCompressModel {
     flags: u8,
     pad_length: u8,

src/http2/frame/mod.rs

@@ -31,10 +31,13 @@ pub const FRAME_HEADER_SIZE: usize = 9;
 // Denoted 'R' in http2 Section 4.1
 const STREAM_IDENTIFIER_RESERVED_BIT_MASK: u8 = !0x80;
 
+// std
+use std::fmt;
+
 // osmium
 pub use self::data::DataFrame;
 
-pub trait CompressibleHttpFrame {
+pub trait CompressibleHttpFrame: fmt::Debug {
     fn get_length(&self) -> i32;
 
     fn get_frame_type(&self) -> FrameType;

src/http2/frame/ping.rs

@@ -28,6 +28,7 @@ const FLAG_ACK: u8 = 0x1;
 // the spec says '8 octets of opaque data', which can be anything? or should it be random
 const DEFAULT_PING_PAYLOAD: [u8; 8] = [0x9, 0x2, 0xa, 0x3, 0x2, 0xe, 0x1, 0xf];
 
+#[derive(Debug)]
 pub struct PingFrameCompressModel {
     flags: u8,
     payload: [u8; 8]

src/http2/frame/priority.rs

@@ -24,6 +24,7 @@ use super::FrameType;
 
 const STREAM_DEPENDENCY_EXCLUSIVE_BIT_MASK: u8 = 0x80;
 
+#[derive(Debug)]
 pub struct PriorityFrameCompressModel {
     stream_dependency: u32,
     stream_dependency_exclusive: bool,

src/http2/frame/push_promise.rs

@@ -27,6 +27,7 @@ const FLAG_PADDED: u8 = 0x8;
 
 const PROMISED_STREAM_IDENTIFIER_RESERVED_BIT_MASK: u8 = 0x80;
 
+#[derive(Debug)]
 pub struct PushPromiseFrameCompressModel {
     flags: u8,
     pad_length: u8,

src/http2/frame/reset_stream.rs

@@ -22,6 +22,7 @@ use std::vec::IntoIter;
 use super::CompressibleHttpFrame;
 use super::FrameType;
 
+#[derive(Debug)]
 pub struct ResetStreamFrameCompressModel {
     error_code: u32
 }

src/http2/frame/settings.rs

@@ -25,11 +25,13 @@ use super::FrameType;
 
 const FLAG_ACK: u8 = 0x1;
 
+#[derive(Debug)]
 pub struct SettingsParameter {
     name: settings::SettingName,
     value: u32
 }
 
+#[derive(Debug)]
 pub struct SettingsFrameCompressModel {
     flags: u8,
     parameters: Vec<SettingsParameter>

src/http2/frame/window_update.rs

@@ -24,6 +24,7 @@ use super::FrameType;
 
 const WINDOW_SIZE_INCREMENT_BIT_MASK: u8 = 0x80;
 
+#[derive(Debug)]
 pub struct WindowUpdateFrameCompressModel {
     window_size_increment: u32
 }

src/http2/net/mod.rs

@@ -216,8 +216,12 @@ mod tests {
 
         fn process(&self, request: Self::Request) -> Self::Response {
             println!("Got request {:?}", request);
+
+            let mut headers = header::Headers::new();
+            headers.push(header::HeaderName::ContentLength, header::HeaderValue::Num(0));
+
             HttpResponse {
-                headers: header::Headers::new(),
+                headers: headers,
                 body: None
             }
         }

src/http2/settings.rs

@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Osmium. If not, see <http://www.gnu.org/licenses/>.
 
+#[derive(Debug)]
 pub enum SettingName {
     SettingsHeaderTableSize,
     SettingsEnablePush,

src/http2/stream/mod.rs

@@ -77,6 +77,8 @@ impl StreamRequest {
 impl StreamResponse {
     pub fn to_frames(self, hpack_context: &mut hpack_context::Context) -> Vec<Box<framing::CompressibleHttpFrame>>
     {
+        trace!("Starting to convert stream response to frames [{:?}]", self);
+
         let mut frames: Vec<Box<framing::CompressibleHttpFrame>> = Vec::new();
 
         for informational_header in &self.informational_headers {
@@ -102,6 +104,8 @@ impl StreamResponse {
             frames.extend(trailer_headers_frame);
         }
 
+        trace!("Converted to frames [{:?}]", frames);
+
         frames
     }
 
@@ -722,10 +726,12 @@ impl Stream {
         }
 
         self.send_frames.extend(temp_send_frames);
+
+        trace!("Finished sending frames on stream [{:?}]", self.send_frames);
     }
 
     pub fn fetch_send_frames(&mut self) -> Vec<Vec<u8>> {
-        self.send_frames.drain(1..).collect()
+        self.send_frames.drain(0..).collect()
     }
 
     fn should_headers_frame_end_stream(&self) -> bool {
@@ -755,8 +761,10 @@ impl Stream {
                 let mut new_request = StreamRequest::new();
                 mem::swap(&mut self.request, &mut new_request);
 
+                trace!("Passing request to the application [{:?}]", new_request);
                 // TODO should the application be allowed to error?
                 let response: StreamResponse = app.process(new_request.into()).into();
+                trace!("Got response from the application [{:?}]", response);
 
                 self.send(response.to_frames(hpack_send_context));
             },