forked/h2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stream-id double-accounting bug (#112)

Browse Source 
Both Recv::open and Rev::recv_headers check new stream ids against the
previously stream id. The second such check fails.

Now, only Recv::open performs stream id checks.

Fixes #110
This commit is contained in:
Oliver Gould
2017-09-26 10:42:12 -07:00
committed by Carl Lerche
parent 8911ee2a4b
commit 0b289fd55d
4 changed files with 95 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/proto/streams/recv.rs
View File

@@ -137,13 +137,6 @@ where
let is_initial = stream.state.recv_open(frame.is_end_stream())?;
if is_initial {
let next_id = self.next_stream_id()?;
if frame.stream_id() >= next_id {
self.next_stream_id = frame.stream_id().next_id();
} else {
return Err(RecvError::Connection(ProtocolError));
}
// TODO: be smarter about this logic
if frame.stream_id() > self.last_processed_id {
self.last_processed_id = frame.stream_id();

5
src/proto/streams/state.rs
View File

@@ -116,10 +116,9 @@ impl State {
return Ok(());
}
/// Open the receive have of the stream, this action is taken when a HEADERS
/// frame is received.
/// Opens the receive-half of the stream when a HEADERS frame is received.
///
/// Returns true if this transitions the state to Open
/// Returns true if this transitions the state to Open.
pub fn recv_open(&mut self, eos: bool) -> Result<bool, RecvError> {
let remote = Peer::Streaming;
let mut initial = false;