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

auto-sync

This commit is contained in:
rusEfi 2015-11-25 22:01:30 -05:00
parent 50449a276f
commit 1aff292d86
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/io/src/com/rusefi/binaryprotocol/BinaryProtocol.java
View File

@ -49,6 +49,8 @@ public class BinaryProtocol {
private static final String SWITCH_TO_BINARY_COMMAND = "~"; private static final String SWITCH_TO_BINARY_COMMAND = "~";
public static final char COMMAND_OUTPUTS = 'O'; public static final char COMMAND_OUTPUTS = 'O';
public static final char COMMAND_HELLO = 'S'; public static final char COMMAND_HELLO = 'S';
public static final char COMMAND_PROTOCOL = 'F';
public static final char COMMAND_CRC_CHECK_COMMAND = 'k';
private final Logger logger; private final Logger logger;
private final IoStream stream; private final IoStream stream;

37
java_console/io/src/com/rusefi/io/tcp/BinaryProtocolServer.java
View File

@ -4,8 +4,10 @@ import com.rusefi.FileLog;
import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.IoHelper; import com.rusefi.binaryprotocol.IoHelper;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
@ -19,7 +21,10 @@ import java.net.Socket;
public class BinaryProtocolServer { public class BinaryProtocolServer {
private static final int PROXY_PORT = 2390; private static final int PROXY_PORT = 2390;
private static final String TS_SIGNATURE = "\0MShift v0.01"; private static final String TS_OK = "\0";
private static final String TS_SIGNATURE = "MShift v0.01";
private static final String TS_PROTOCOL = "001";
public static void start() { public static void start() {
FileLog.MAIN.logLine("BinaryProtocolServer on " + PROXY_PORT); FileLog.MAIN.logLine("BinaryProtocolServer on " + PROXY_PORT);
@ -56,7 +61,17 @@ public class BinaryProtocolServer {
DataInputStream in = new DataInputStream(clientSocket.getInputStream()); DataInputStream in = new DataInputStream(clientSocket.getInputStream());
while (true) { while (true) {
short length = in.readShort(); byte first = in.readByte();
if (first == BinaryProtocol.COMMAND_PROTOCOL) {
//System.out.println("Ignoring plain F command");
System.out.println("Got plain F command");
OutputStream outputStream = clientSocket.getOutputStream();
outputStream.write(TS_PROTOCOL.getBytes());
outputStream.flush();
continue;
}
int length = first * 256 + in.readByte();
System.out.println("Got [" + length + "] length promise"); System.out.println("Got [" + length + "] length promise");
@ -66,16 +81,26 @@ public class BinaryProtocolServer {
byte[] packet = new byte[length]; byte[] packet = new byte[length];
in.read(packet); in.read(packet);
byte command = packet[0]; DataInputStream dis = new DataInputStream(new ByteArrayInputStream(packet));
System.out.println("Got [" + (char) command + "] command"); byte command = (byte) dis.read();
System.out.println("Got [" + (char) command + "/" + command + "] command");
int crc = in.readInt(); int crc = in.readInt();
if (crc != IoHelper.crc32(packet)) if (crc != IoHelper.crc32(packet))
throw new IllegalStateException("CRC mismatch"); throw new IllegalStateException("CRC mismatch");
TcpIoStream stream = new TcpIoStream(clientSocket.getOutputStream(), null);
if (command == BinaryProtocol.COMMAND_HELLO) { if (command == BinaryProtocol.COMMAND_HELLO) {
TcpIoStream stream = new TcpIoStream(clientSocket.getOutputStream(), null); BinaryProtocol.sendCrcPacket((TS_OK + TS_SIGNATURE).getBytes(), FileLog.LOGGER, stream);
BinaryProtocol.sendCrcPacket(TS_SIGNATURE.getBytes(), FileLog.LOGGER, stream); } else if (command == BinaryProtocol.COMMAND_PROTOCOL) {
// System.out.println("Ignoring crc F command");
BinaryProtocol.sendCrcPacket((TS_OK + TS_PROTOCOL).getBytes(), FileLog.LOGGER, stream);
} else if (command == BinaryProtocol.COMMAND_CRC_CHECK_COMMAND) {
short page = dis.readShort();
short offset = dis.readShort();
short count = dis.readShort();
System.out.println("CRC check " + page + "/" + offset + "/" + count);
} }