Skip to content

Bus adapter changes #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

Merged
davidraker merged 3 commits into from
Nov 18, 2025
Merged

Bus adapter changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4751e96
Refine inbound parameters extraction to handle IPv6 socket tuples cor…
riley206-pnnl Nov 12, 2025
fbf255f
Fix formatting in pyproject.toml and update version to 2.0.0rc2
riley206-pnnl Nov 13, 2025
148f2cb
Refactor get_local_socket_params to handle IPv6 socket tuples correctly
riley206-pnnl Nov 13, 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
Expand Up @@ -6,7 +6,7 @@ build-backend = "poetry.core.masonry.api"
profile = "black"

[tool.mypy]
python_version = 3.10
python_version = "3.10"
show_error_context = true
pretty = true
show_column_numbers = true
Expand All @@ -29,7 +29,7 @@ ignore_missing_imports = true

[tool.poetry]
name = "protocol-proxy"
version = "2.0.0rc0"
version = "2.0.0rc2"
description = "A system for launching and communicating with a proxy application for network communication which runs in a separate process.."
authors = ["The VOLTTRON Development Team <volttron@pnnl.gov>"]
license = "Apache License 2.0"
Expand Down
5 changes: 4 additions & 1 deletion src/protocol_proxy/ipc/asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@ async def _setup_inbound_server(self, socket_params: SocketParams = None):
f' on any port in range: {self.min_port} - {self.max_port}.')
break
else:
self.inbound_params = SocketParams(*self.inbound_server.sockets[0].getsockname())
# Only take first 2 elements (host, port) from getsockname()
# IPv6 sockets return 4-tuple (host, port, flowinfo, scope_id)
sockname = self.inbound_server.sockets[0].getsockname()
self.inbound_params = SocketParams(sockname[0], sockname[1])
break

async def start(self, *_, **__):
Expand Down
5 changes: 4 additions & 1 deletion src/protocol_proxy/proxy/asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ def __init__(self, manager_address: str, manager_port: int, manager_id: UUID, ma
token=manager_token)

def get_local_socket_params(self) -> SocketParams:
return self.inbound_server.sockets[0].getsockname()
# Only take first 2 elements (host, port) from getsockname()
# IPv6 sockets return 4-tuple (host, port, flowinfo, scope_id)
sockname = self.inbound_server.sockets[0].getsockname()
return SocketParams(sockname[0], sockname[1])

async def send_registration(self, remote: AsyncioProtocolProxyPeer):
_log.debug(f"[send_registration] Attempting to register with manager at: {remote} (type={type(remote)})")
Expand Down