WIP

src/frame/mod.rs

@@ -32,7 +32,7 @@ mod util;
 
 pub use self::data::Data;
 pub use self::head::{Head, Kind, StreamId};
-pub use self::settings::Settings;
+pub use self::settings::{Settings, SettingSet};
 pub use self::unknown::Unknown;
 
 const FRAME_HEADER_LEN: usize = 9;

src/frame/settings.rs

@@ -1,12 +1,17 @@
-use frame::{Error, Head, Kind};
+use frame::{Frame, Error, Head, Kind};
 use bytes::{Bytes, BytesMut, BufMut, BigEndian};
 
 #[derive(Debug, Clone, Default, Eq, PartialEq)]
 pub struct Settings {
     flag: SettingsFlag,
     // Fields
+    values: SettingSet,
+}
+
+#[derive(Debug, Clone, Default, Eq, PartialEq)]
+pub struct SettingSet {
     header_table_size: Option<u32>,
-    enable_push: Option<bool>,
+    enable_push: Option<u32>,
     max_concurrent_streams: Option<u32>,
     initial_window_size: Option<u32>,
     max_frame_size: Option<u32>,
@@ -35,6 +40,20 @@ const ALL: u8 = ACK;
 // ===== impl Settings =====
 
 impl Settings {
+    pub fn ack() -> Settings {
+        Settings {
+            flag: SettingsFlag::ack(),
+            .. Settings::default()
+        }
+    }
+
+    pub fn new(values: SettingSet) -> Settings {
+        Settings {
+            flag: SettingsFlag::empty(),
+            values: values,
+        }
+    }
+
     pub fn load(head: Head, payload: Bytes) -> Result<Settings, Error> {
         use self::Setting::*;
 
@@ -54,10 +73,7 @@ impl Settings {
             }
 
             // Return the ACK frame
-            return Ok(Settings {
+            return Ok(Settings::ack());
-                flag: flag,
-                .. Settings::default()
-            });
         }
 
         // Ensure the payload length is correct, each setting is 6 bytes long.
@@ -71,22 +87,22 @@ impl Settings {
         for raw in payload.chunks(6) {
             match Setting::load(raw) {
                 Some(HeaderTableSize(val)) => {
-                    settings.header_table_size = Some(val);
+                    settings.values.header_table_size = Some(val);
                 }
                 Some(EnablePush(val)) => {
-                    settings.enable_push = Some(val == 1);
+                    settings.values.enable_push = Some(val);
                 }
                 Some(MaxConcurrentStreams(val)) => {
-                    settings.max_concurrent_streams = Some(val);
+                    settings.values.max_concurrent_streams = Some(val);
                 }
                 Some(InitialWindowSize(val)) => {
-                    settings.initial_window_size = Some(val);
+                    settings.values.initial_window_size = Some(val);
                 }
                 Some(MaxFrameSize(val)) => {
-                    settings.max_frame_size = Some(val);
+                    settings.values.max_frame_size = Some(val);
                 }
                 Some(MaxHeaderListSize(val)) => {
-                    settings.max_header_list_size = Some(val);
+                    settings.values.max_header_list_size = Some(val);
                 }
                 None => {}
             }
@@ -121,32 +137,38 @@ impl Settings {
     fn for_each<F: FnMut(Setting)>(&self, mut f: F) {
         use self::Setting::*;
 
-        if let Some(v) = self.header_table_size {
+        if let Some(v) = self.values.header_table_size {
             f(HeaderTableSize(v));
         }
 
-        if let Some(v) = self.enable_push {
+        if let Some(v) = self.values.enable_push {
-            f(EnablePush(if v { 1 } else { 0 }));
+            f(EnablePush(v));
         }
 
-        if let Some(v) = self.max_concurrent_streams {
+        if let Some(v) = self.values.max_concurrent_streams {
             f(MaxConcurrentStreams(v));
         }
 
-        if let Some(v) = self.initial_window_size {
+        if let Some(v) = self.values.initial_window_size {
             f(InitialWindowSize(v));
         }
 
-        if let Some(v) = self.max_frame_size {
+        if let Some(v) = self.values.max_frame_size {
             f(MaxFrameSize(v));
         }
 
-        if let Some(v) = self.max_header_list_size {
+        if let Some(v) = self.values.max_header_list_size {
             f(MaxHeaderListSize(v));
         }
     }
 }
 
+impl From<Settings> for Frame {
+    fn from(src: Settings) -> Frame {
+        Frame::Settings(src)
+    }
+}
+
 // ===== impl Setting =====
 
 impl Setting {
@@ -204,6 +226,10 @@ impl Setting {
 // ===== impl SettingsFlag =====
 
 impl SettingsFlag {
+    pub fn empty() -> SettingsFlag {
+        SettingsFlag(0)
+    }
+
     pub fn load(bits: u8) -> SettingsFlag {
         SettingsFlag(bits & ALL)
     }

src/proto/mod.rs

@@ -1,5 +1,6 @@
 mod framed_read;
 mod framed_write;
+mod settings;
 
 use {frame, ConnectionError};
 use self::framed_read::FramedRead;

src/proto/settings.rs

@@ -0,0 +1,108 @@
+use ConnectionError;
+use frame::{self, Frame};
+
+use futures::*;
+
+pub struct Settings<T> {
+    inner: T,
+    // Our settings
+    local: frame::SettingSet,
+    // Peer settings
+    remote: frame::SettingSet,
+    // Number of acks remaining to send to the peer
+    remaining_acks: usize,
+    // True when the local settings must be flushed to the remote
+    is_dirty: bool,
+}
+
+impl<T> Settings<T>
+    where T: Stream<Item = Frame, Error = ConnectionError>,
+          T: Sink<SinkItem = Frame, SinkError = ConnectionError>,
+{
+    pub fn new(inner: T) -> Settings<T> {
+        Settings {
+            inner: inner,
+            local: frame::SettingSet::default(),
+            remote: frame::SettingSet::default(),
+            remaining_acks: 0,
+            // Always start in the dirty state as sending the settings frame is
+            // part of the connection handshake
+            is_dirty: true,
+        }
+    }
+
+    fn has_pending_sends(&self) -> bool {
+        self.is_dirty || self.remaining_acks > 0
+    }
+
+    fn try_send_pending(&mut self) -> Poll<(), ConnectionError> {
+        if self.is_dirty {
+            // Create the new frame
+            let frame = frame::Settings::new(self.local.clone()).into();
+            try_ready!(self.try_send(frame));
+
+            self.is_dirty = false;
+        }
+
+        unimplemented!();
+    }
+
+    fn try_send(&mut self, item: frame::Frame) -> Poll<(), ConnectionError> {
+        if let AsyncSink::NotReady(_) = try!(self.inner.start_send(item)) {
+            // Ensure that call to `poll_complete` guarantee is called to satisfied
+            try!(self.inner.poll_complete());
+
+            return Ok(Async::NotReady);
+        }
+
+        Ok(Async::Ready(()))
+    }
+}
+
+impl<T> Stream for Settings<T>
+    where T: Stream<Item = Frame, Error = ConnectionError>,
+          T: Sink<SinkItem = Frame, SinkError = ConnectionError>,
+{
+    type Item = Frame;
+    type Error = ConnectionError;
+
+    fn poll(&mut self) -> Poll<Option<Frame>, ConnectionError> {
+        self.inner.poll()
+    }
+}
+
+impl<T> Sink for Settings<T>
+    where T: Stream<Item = Frame, Error = ConnectionError>,
+          T: Sink<SinkItem = Frame, SinkError = ConnectionError>,
+{
+    type SinkItem = Frame;
+    type SinkError = ConnectionError;
+
+    fn start_send(&mut self, item: Frame) -> StartSend<Frame, ConnectionError> {
+        // Settings frames take priority, so `item` cannot be sent if there are
+        // any pending acks OR the local settings have been changed w/o sending
+        // an associated frame.
+        if self.has_pending_sends() {
+            // Try to flush them
+            try!(self.poll_complete());
+
+            if self.has_pending_sends() {
+                return Ok(AsyncSink::NotReady(item));
+            }
+        }
+
+        self.inner.start_send(item)
+    }
+
+    fn poll_complete(&mut self) -> Poll<(), ConnectionError> {
+        self.inner.poll_complete()
+    }
+
+    fn close(&mut self) -> Poll<(), ConnectionError> {
+        if self.has_pending_sends() {
+            try_ready!(self.poll_complete());
+        }
+
+        self.inner.close()
+    }
+}