From b9a7efa3aca9af6a0d2437ca5605cddfd4d5aadf Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 8 Jul 2020 16:43:46 -0400 Subject: [PATCH] proxy progress --- .../io/src/main/java/com/rusefi/io/LinkManager.java | 2 +- .../java/com/rusefi/io/tcp/BinaryProtocolServer.java | 2 +- .../io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java index 5697e6793f..c69bb64b47 100644 --- a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java +++ b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java @@ -187,7 +187,7 @@ public class LinkManager { int portPart = TcpConnector.getTcpPort(port); String hostname = TcpConnector.getHostname(port); socket = new Socket(hostname, portPart); - return new TcpIoStream(logger, LinkManager.this, socket); + return new TcpIoStream(logger, socket); } catch (Throwable e) { stateListener.onConnectionFailed(); return null; diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java index 3384665865..411a285401 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java @@ -109,7 +109,7 @@ public class BinaryProtocolServer implements BinaryProtocolCommands { byte command = (byte) dis.read(); System.out.println("Got [" + (char) command + "/" + command + "] command"); - TcpIoStream stream = new TcpIoStream(logger, linkManager, clientSocket); + TcpIoStream stream = new TcpIoStream(logger, clientSocket); if (command == COMMAND_HELLO) { stream.sendPacket((TS_OK + Fields.TS_SIGNATURE).getBytes(), logger); } else if (command == COMMAND_PROTOCOL) { 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 87d7fb95b3..c43af15fe5 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 @@ -4,7 +4,6 @@ import com.opensr5.Logger; import com.opensr5.io.DataListener; import com.rusefi.io.ByteReader; import com.rusefi.io.IoStream; -import com.rusefi.io.LinkManager; import java.io.BufferedInputStream; import java.io.IOException; @@ -20,16 +19,14 @@ public class TcpIoStream implements IoStream { private final InputStream input; private final OutputStream output; private final Logger logger; - private final LinkManager linkManager; private boolean isClosed; - public TcpIoStream(Logger logger, LinkManager linkManager, Socket socket) throws IOException { - this(logger, linkManager, new BufferedInputStream(socket.getInputStream()), socket.getOutputStream()); + public TcpIoStream(Logger logger, Socket socket) throws IOException { + this(logger, new BufferedInputStream(socket.getInputStream()), socket.getOutputStream()); } - private TcpIoStream(Logger logger, LinkManager linkManager, InputStream input, OutputStream output) { + private TcpIoStream(Logger logger, InputStream input, OutputStream output) { this.logger = logger; - this.linkManager = linkManager; if (input == null) throw new NullPointerException("input"); if (output == null)