Skip to content

Add support for dynamic link MTU discovery #29

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

Merged
acehoss merged 2 commits into from
Jan 20, 2025
Merged

Add support for dynamic link MTU discovery #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6567c3a
Added support for dynamic link MTU discovery
markqvist Jan 12, 2025
a9632d2
Updated version and RNS dependency version
markqvist Jan 12, 2025
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
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[tool.poetry]
name = "rnsh"
version = "0.1.4"
version = "0.1.5"
description = "Shell over Reticulum"
authors = ["acehoss <acehoss@acehoss.net>"]
license = "MIT"
readme = "README.md"

[tool.poetry.dependencies]
python = "^3.7"
rns = ">=0.7.4"
rns = ">=0.9.0"

[tool.poetry.scripts]
rnsh = 'rnsh.rnsh:rnsh_cli'
Expand Down
6 changes: 4 additions & 2 deletions rnsh/initiator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,21 +448,23 @@ def compress_adaptive(buf: bytes):
chunk_segment = None

chunk_segment = None
max_data_len = channel.mdu - protocol.StreamDataMessage.OVERHEAD
while chunk_len > 32 and comp_try < comp_tries:
chunk_segment_length = int(chunk_len/comp_try)
compressed_chunk = bz2.compress(buf[:chunk_segment_length])
compressed_length = len(compressed_chunk)
if compressed_length < protocol.StreamDataMessage.MAX_DATA_LEN and compressed_length < chunk_segment_length:
if compressed_length < max_data_len and compressed_length < chunk_segment_length:
comp_success = True
break
else:
comp_try += 1

if comp_success:
diff = max_data_len - len(compressed_chunk)
chunk = compressed_chunk
processed_length = chunk_segment_length
else:
chunk = bytes(buf[:protocol.StreamDataMessage.MAX_DATA_LEN])
chunk = bytes(buf[:max_data_len])
processed_length = len(chunk)

return comp_success, processed_length, chunk
Expand Down
6 changes: 4 additions & 2 deletions rnsh/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,21 +218,23 @@ def compress_adaptive(buf: bytes):
chunk_segment = None

chunk_segment = None
max_data_len = self.channel.mdu - protocol.StreamDataMessage.OVERHEAD
while chunk_len > 32 and comp_try < comp_tries:
chunk_segment_length = int(chunk_len/comp_try)
compressed_chunk = bz2.compress(buf[:chunk_segment_length])
compressed_length = len(compressed_chunk)
if compressed_length < protocol.StreamDataMessage.MAX_DATA_LEN and compressed_length < chunk_segment_length:
if compressed_length < max_data_len and compressed_length < chunk_segment_length:
comp_success = True
break
else:
comp_try += 1

if comp_success:
diff = max_data_len - len(compressed_chunk)
chunk = compressed_chunk
processed_length = chunk_segment_length
else:
chunk = bytes(buf[:protocol.StreamDataMessage.MAX_DATA_LEN])
chunk = bytes(buf[:max_data_len])
processed_length = len(chunk)

return comp_success, processed_length, chunk
Expand Down
Loading