rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remote proxy bugfix: the magic of signed bytes

This commit is contained in:
rusefillc 2020-10-08 00:35:40 -04:00
parent 09c5d28f7f
commit 2cbcbe5697
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java_console/io/src/main/java/com/rusefi/binaryprotocol/IoHelper.java
View File

@ -65,4 +65,8 @@ public class IoHelper {
public static boolean checkResponseCode(byte[] response, byte code) { public static boolean checkResponseCode(byte[] response, byte code) {
return response != null && response.length > 0 && response[0] == code; return response != null && response.length > 0 && response[0] == code;
} }
public static int getInt(byte firstByte, byte secondByte) {
return firstByte * 256 + (secondByte & 0xFF);
}
} }

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

@ -6,6 +6,7 @@ import com.rusefi.Listener;
import com.rusefi.Timeouts; import com.rusefi.Timeouts;
import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocol;
import com.rusefi.binaryprotocol.IncomingDataBuffer; import com.rusefi.binaryprotocol.IncomingDataBuffer;
import com.rusefi.binaryprotocol.IoHelper;
import com.rusefi.config.generated.Fields; import com.rusefi.config.generated.Fields;
import com.rusefi.io.IoStream; import com.rusefi.io.IoStream;
import com.rusefi.proxy.NetworkConnector; import com.rusefi.proxy.NetworkConnector;
@ -80,7 +81,7 @@ public class BinaryProtocolProxy {
@NotNull @NotNull
private static BinaryProtocolServer.Packet readClientRequest(IncomingDataBuffer in, byte firstByte) throws IOException { private static BinaryProtocolServer.Packet readClientRequest(IncomingDataBuffer in, byte firstByte) throws IOException {
byte secondByte = in.readByte(); byte secondByte = in.readByte();
int length = firstByte * 256 + secondByte; int length = IoHelper.getInt(firstByte, secondByte);
return BinaryProtocolServer.readPromisedBytes(in, length); return BinaryProtocolServer.readPromisedBytes(in, length);
} }

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

@ -367,7 +367,8 @@ public class BinaryProtocolServer {
protocolCommandHandler.handle(); protocolCommandHandler.handle();
return 0; return 0;
} }
return first * 256 + in.readByte(ioTimeout); byte secondByte = in.readByte(ioTimeout);
return IoHelper.getInt(first, secondByte);
} }
public static Packet readPromisedBytes(DataInputStream in, int length) throws IOException { public static Packet readPromisedBytes(DataInputStream in, int length) throws IOException {

5
java_console/io/src/test/java/com/rusefi/binaryprotocol/test/IoHelperTest.java
View File

@ -10,6 +10,11 @@ import java.io.IOException;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
public class IoHelperTest { public class IoHelperTest {
@Test
public void test255() {
assertEquals(255, IoHelper.getInt((byte) 0, (byte) -1));
}
@Test @Test
public void testSwap16() throws IOException { public void testSwap16() throws IOException {
byte packet[] = {-12, 0}; byte packet[] = {-12, 0};