core - move stream frames into the connection for send

Author: ThetaSinner

src/http2/core/mod.rs

@@ -15,6 +15,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Osmium. If not, see <http://www.gnu.org/licenses/>.
 
+// TODO rename this module to connection or similar.
+
 mod connection_frame_state;
 
 // std
@@ -150,6 +152,11 @@ impl<'a, 'b> Connection<'a, 'b> {
                 if let Some(err) = stream_response {
                     error!("Error on stream {}. The error was {:?}", frame.header.stream_id, err);
                 }
+
+                // TODO does the stream build its error or does the error frame get built and sent here.
+
+                // Fetch any send frames which have been generated on the stream.
+                self.send_frames.extend(stream.fetch_send_frames());
             },
             _ => {
                 panic!("can't handle that frame type yet");
@@ -173,6 +180,7 @@ impl<'a, 'b> Connection<'a, 'b> {
         self.push_send_frame(Box::new(go_away), 0x0);
     }
 
+    // TODO do a fetch all like in stream?
     pub fn pull_frame(&mut self) -> Option<Vec<u8>> {
         self.send_frames.pop_front()
     }

src/http2/net/mod.rs

@@ -76,6 +76,9 @@ impl<T, R, S> Server<T, R, S>
 
         let server_instance = Arc::new(Box::new(self));
 
+        // TODO the code below means that all streams run on the same thread. Probably
+        // not the way it should be.
+
         // get a stream (infinite iterator) of incoming connections
         let server = listener.incoming().zip(stream::repeat(server_instance.clone())).for_each(|((socket, _remote_addr), server_instance)| {
             debug!("Starting connection on {}", _remote_addr);

src/http2/stream/mod.rs

@@ -546,7 +546,7 @@ impl Stream {
         opt_err
     }
 
-    pub fn send(&mut self, frames: Vec<Box<framing::CompressibleHttpFrame>>) {
+    fn send(&mut self, frames: Vec<Box<framing::CompressibleHttpFrame>>) {
         let mut temp_send_frames = Vec::new();
 
         let mut frame_iter = frames.into_iter();
@@ -724,6 +724,10 @@ impl Stream {
         self.send_frames.extend(temp_send_frames);
     }
 
+    pub fn fetch_send_frames(&mut self) -> Vec<Vec<u8>> {
+        self.send_frames.drain(1..).collect()
+    }
+
     fn should_headers_frame_end_stream(&self) -> bool {
         // If the request headers have already been received, but another headers frame is
         // being processed then is must end the stream.