diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java index cdcaae1d0f..719ad130e3 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java @@ -34,7 +34,7 @@ public class BinaryProtocolProxy { TcpIoStream clientStream = null; try { clientStream = new TcpIoStream("[[proxy]] ", clientSocket); - runProxy(targetEcuSocket, clientStream, relayCommandCounter); + runProxy(targetEcuSocket, clientStream, relayCommandCounter, USER_IO_TIMEOUT); } catch (IOException e) { log.error("BinaryProtocolProxy::run " + e); close(clientStream); @@ -43,12 +43,12 @@ public class BinaryProtocolProxy { return BinaryProtocolServer.tcpServerSocket(serverProxyPort, "proxy", clientSocketRunnableFactory, Listener.empty()); } - public static void runProxy(IoStream targetEcu, IoStream clientStream, AtomicInteger relayCommandCounter) throws IOException { + public static void runProxy(IoStream targetEcu, IoStream clientStream, AtomicInteger relayCommandCounter, int timeoutMs) throws IOException { /* * Each client socket is running on it's own thread */ while (!targetEcu.isClosed()) { - byte firstByte = clientStream.getDataBuffer().readByte(USER_IO_TIMEOUT); + byte firstByte = clientStream.getDataBuffer().readByte(timeoutMs); if (firstByte == COMMAND_PROTOCOL) { clientStream.write(TS_PROTOCOL.getBytes()); continue; diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java index b97f804815..058440defc 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java @@ -63,6 +63,7 @@ public class TcpIoStream extends AbstractIoStream { @Override public void write(byte[] bytes) throws IOException { + super.write(bytes); output.write(bytes); } diff --git a/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java b/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java index cd83b16067..642cc2d264 100644 --- a/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java +++ b/java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java @@ -204,7 +204,7 @@ public class Backend implements Closeable { applications.add(applicationConnectionState); } - BinaryProtocolProxy.runProxy(state.getStream(), applicationClientStream, new AtomicInteger()); + BinaryProtocolProxy.runProxy(state.getStream(), applicationClientStream, new AtomicInteger(), BinaryProtocolProxy.USER_IO_TIMEOUT); } catch (Throwable e) { log.info("Application Connector: Got error " + e); diff --git a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java index 74252b6dd5..dc72f0ca29 100644 --- a/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java +++ b/java_tools/ts_plugin/src/main/java/com/rusefi/ts_plugin/RemoteTab.java @@ -153,7 +153,7 @@ public class RemoteTab { bottomPanel.add(new JLabel(" Used by " + publicSession.getOwnerName())); } else { JButton connect = new JButton("Connect to " + publicSession.getUserDetails().getUserName()); - connect.addActionListener(event -> connecToToProxy(publicSession, controllerInfo)); + connect.addActionListener(event -> connectToProxy(publicSession, controllerInfo)); bottomPanel.add(connect); } @@ -168,7 +168,7 @@ public class RemoteTab { return userPanel; } - private void connecToToProxy(PublicSession publicSession, ControllerInfo controllerInfo) { + private void connectToProxy(PublicSession publicSession, ControllerInfo controllerInfo) { RemoteTabController.INSTANCE.setState(RemoteTabController.State.CONNECTING); setStatus("Connecting to " + publicSession.getUserDetails().getUserName());