Skip to content

Fix search response port preservation for name-server (gateway) replies #3781

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
kasemir merged 1 commit into from
Apr 15, 2026
+6 −7
Merged

Fix search response port preservation for name-server (gateway) replies #3781

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
13 changes: 6 additions & 7 deletions core/pva/src/main/java/org/epics/pva/client/SearchResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,14 @@ public void handleCommand(final ClientTCPHandler tcp, final ByteBuffer buffer) t
throw new Exception("PVA Server " + tcp + " sent invalid search reply", ex);
}

// If reply is "*:port", then use this TCP connection's address.
// Client will find existing TCP connection via that address and re-use it.
// This is the expected case when directly connecting to a PVA server via
// its TCP port.
// Otherwise, in case we queried a name server which then points to the actual PVA server,
// use address as provided, and connect to it or re-use in case we already have a TCP connection to that address:port.
// If reply is "*:port", then use this TCP connection's address
// but preserve the port from the response.
// The port matters because the server may advertise a TLS port (e.g. 5075)
// that differs from the name server's TCP port (e.g. 5175).
// This matches the UDP handler behavior in ClientUDPHandler.handleSearchReply.
InetSocketAddress server = response.server;
if (server.getAddress().isAnyLocalAddress())
server = tcp.getRemoteAddress();
server = new InetSocketAddress(tcp.getRemoteAddress().getAddress(), server.getPort());

if (response.found)
{
Expand Down