Skip to content

Respect FLAG_FIN & FLAG_RST in TYPE_WINDOW_UPDATE frames #932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Respect FLAG_FIN & FLAG_RST in TYPE_WINDOW_UPDATE frames #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions libp2p/stream_muxer/yamux/yamux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ async def handle_incoming(self) -> None:
0,
)
await self.secured_conn.write(rst_header)
elif typ == TYPE_DATA and flags & FLAG_RST:
elif (typ == TYPE_DATA or typ == TYPE_WINDOW_UPDATE) and flags & FLAG_RST:
async with self.streams_lock:
if stream_id in self.streams:
logger.debug(
Expand Down Expand Up @@ -661,13 +661,23 @@ async def handle_incoming(self) -> None:
async with self.streams_lock:
if stream_id in self.streams:
stream = self.streams[stream_id]
async with stream.window_lock:
if flags & FLAG_FIN:
logger.debug(
f"Received window update for stream"
f"{self.peer_id}:{stream_id},"
f" increment: {increment}"
f"Received FIN for stream {self.peer_id}:"
f"{stream_id}, marking recv_closed"
)
stream.send_window += increment
self.streams[stream_id].recv_closed = True
if self.streams[stream_id].send_closed:
self.streams[stream_id].closed = True
self.stream_events[stream_id].set()
else:
async with stream.window_lock:
logger.debug(
f"Received window update for stream"
f"{self.peer_id}:{stream_id},"
f" increment: {increment}"
)
stream.send_window += increment
except Exception as e:
# Special handling for expected IncompleteReadError on stream close
if isinstance(e, IncompleteReadError):
Expand Down
1 change: 1 addition & 0 deletions newsfragments/931.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Handle FLAG_FIN & FLAG_RST in TYPE_WINDOW_UPDATE frames