andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

proxy progress - getting REALLY close?!

This commit is contained in:
rusefi 2020-07-24 00:10:06 -04:00
parent a39998d668
commit fdf7281261
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java
View File

@ -26,15 +26,15 @@ public class BinaryProtocolProxy {
Function<Socket, Runnable> clientSocketRunnableFactory = clientSocket -> () -> {
try {
TcpIoStream clientStream = new TcpIoStream("[[proxy]] ", logger, clientSocket);
runProxy(targetEcuSocket, clientStream);
runProxy(logger, targetEcuSocket, clientStream);
} catch (IOException e) {
logger.error("BinaryProtocolProxy::run" + e);
logger.error("BinaryProtocolProxy::run " + e);
}
};
return BinaryProtocolServer.tcpServerSocket(serverProxyPort, "proxy", clientSocketRunnableFactory, Logger.CONSOLE, null);
}
public static void runProxy(IoStream targetEcu, IoStream clientStream) throws IOException {
public static void runProxy(Logger logger, IoStream targetEcu, IoStream clientStream) throws IOException {
/*
* Each client socket is running on it's own thread
*/
@ -45,7 +45,7 @@ public class BinaryProtocolProxy {
clientStream.write(TS_PROTOCOL.getBytes());
continue;
}
proxyClientRequestToController(clientStream.getDataBuffer(), firstByte, targetEcu);
proxyClientRequestToController(logger, clientStream.getDataBuffer(), firstByte, targetEcu);
proxyControllerResponseToClient(targetEcu, clientStream);
}
@ -58,7 +58,7 @@ public class BinaryProtocolProxy {
clientOutputStream.sendPacket(packet);
}
private static void proxyClientRequestToController(IncomingDataBuffer in, byte firstByte, IoStream targetOutputStream) throws IOException {
private static void proxyClientRequestToController(Logger logger, IncomingDataBuffer in, byte firstByte, IoStream targetOutputStream) throws IOException {
byte secondByte = in.readByte();
int length = firstByte * 256 + secondByte;
@ -67,7 +67,7 @@ public class BinaryProtocolProxy {
DataInputStream dis = new DataInputStream(new ByteArrayInputStream(packet.getPacket()));
byte command = (byte) dis.read();
System.out.println("Relaying client command " + BinaryProtocol.findCommand(command));
logger.info("Relaying client command " + BinaryProtocol.findCommand(command));
// sending proxied packet to controller
targetOutputStream.sendPacket(packet);
}

2
java_tools/proxy_server/src/main/java/com/rusefi/server/Backend.java
View File

@ -183,7 +183,7 @@ public class Backend implements Closeable {
applications.add(applicationConnectionState);
}
BinaryProtocolProxy.runProxy(state.getStream(), applicationClientStream);
BinaryProtocolProxy.runProxy(logger, state.getStream(), applicationClientStream);
} catch (Throwable e) {
logger.info("Application Connector: Got error " + e);