From 607152a702fa688587c66e7b550f8e8e4de805b7 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 17 Jul 2020 22:56:32 -0400 Subject: [PATCH] proxy progress --- java_console/ui/src/test/java/com/rusefi/ServerTest.java | 2 +- .../src/main/java/com/rusefi/LocalApplicationProxy.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java_console/ui/src/test/java/com/rusefi/ServerTest.java b/java_console/ui/src/test/java/com/rusefi/ServerTest.java index 7c1ad3462d..61b8ed8649 100644 --- a/java_console/ui/src/test/java/com/rusefi/ServerTest.java +++ b/java_console/ui/src/test/java/com/rusefi/ServerTest.java @@ -203,7 +203,7 @@ public class ServerTest { // start authenticator int authenticatorPort = 7004; // local port on which authenticator accepts connections from Tuner Studio - LocalApplicationProxy.startAndRun(logger, controllerPort, applicationRequest, authenticatorPort); + LocalApplicationProxy.startAndRun(logger, serverPortForRemoteUsers, applicationRequest, authenticatorPort); CountDownLatch connectionEstablishedCountDownLatch = new CountDownLatch(1); diff --git a/java_tools/proxy_server/src/main/java/com/rusefi/LocalApplicationProxy.java b/java_tools/proxy_server/src/main/java/com/rusefi/LocalApplicationProxy.java index 625cf44720..1ca750481f 100644 --- a/java_tools/proxy_server/src/main/java/com/rusefi/LocalApplicationProxy.java +++ b/java_tools/proxy_server/src/main/java/com/rusefi/LocalApplicationProxy.java @@ -21,12 +21,12 @@ public class LocalApplicationProxy { } /** + * @param serverPortForRemoteUsers port on which rusEFI proxy accepts authenticator connections * @param applicationRequest remote session we want to connect to * @param authenticatorPort local port we would bind for TunerStudio to connect to - * @param authenticatorToProxyStream */ - static void startAndRun(Logger logger, int controllerPort, ApplicationRequest applicationRequest, int authenticatorPort) throws IOException { - IoStream authenticatorToProxyStream = new TcpIoStream(logger, SSLSocketFactory.getDefault().createSocket(NetworkConnector.RUSEFI_PROXY_HOSTNAME, controllerPort)); + static void startAndRun(Logger logger, int serverPortForRemoteUsers, ApplicationRequest applicationRequest, int authenticatorPort) throws IOException { + IoStream authenticatorToProxyStream = new TcpIoStream(logger, SSLSocketFactory.getDefault().createSocket(NetworkConnector.RUSEFI_PROXY_HOSTNAME, serverPortForRemoteUsers)); LocalApplicationProxy localApplicationProxy = new LocalApplicationProxy(logger, applicationRequest); localApplicationProxy.run(authenticatorToProxyStream);