Skip to content

Closed WS infinite loop fix #2

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
ramlab-jose wants to merge 2 commits into
base: ros2
Choose a base branch
from
Open

Closed WS infinite loop fix #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b40ae5a
Fix to protocol.incoming buffer handling. Prevents hanging clients fr…
ramlab-jose Mar 13, 2024
e4b5019
Merge branch 'ros2' into closed_ws_fix
ramlab-jose Oct 8, 2024
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
17 changes: 8 additions & 9 deletions rosbridge_library/src/rosbridge_library/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,9 @@ def incoming(self, message_string=""):
message_string -- the wire-level message sent by the client

"""
if len(self.buffer) > 0:
self.buffer = self.buffer + message_string
else:
self.buffer = message_string
self.buffer = self.old_buffer + message_string
if self.buffer == self.old_buffer:
return
msg = None

# take care of having multiple JSON-objects in receiving buffer
Expand Down Expand Up @@ -217,13 +216,13 @@ def incoming(self, message_string=""):
except Exception as exc:
self.log("error", f"{op}: {str(exc)}", mid)

# if anything left in buffer .. re-call self.incoming
# TODO: check what happens if we have "garbage" on tcp-stack --> infinite loop might be triggered! .. might get out of it when next valid JSON arrives since only data after last 'valid' closing bracket is kept
if len(self.buffer) > 0:
# try to avoid infinite loop..
if self.old_buffer != self.buffer:
try:
if len(self.buffer) > 0:
self.old_buffer = self.buffer
self.buffer = ""
self.incoming()
except Exception as exc:
self.log("error", f"{self.client_id}: {str(exc)}")

def outgoing(self, message, compression="none"):
"""Pass an outgoing message to the client. This method should be
Expand Down