Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support \r as message separator

Browse Source
This commit is contained in:
logan
2025-01-27 22:04:29 -08:00
parent c304fcccc9
commit c2d4108523
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/li/cil/oc2/common/bus/RPCDeviceBusAdapter.java
View File

@@ -28,6 +28,7 @@ import java.util.concurrent.locks.ReentrantLock;
public final class RPCDeviceBusAdapter implements Steppable, IEventSink {
private static final int DEFAULT_MAX_MESSAGE_SIZE = 4 * Constants.KILOBYTE;
private static final byte[] MESSAGE_DELIMITER = "\0".getBytes();
private static final byte[] MESSAGE_DELIMITER2 = "\r".getBytes();
public static final String ERROR_MESSAGE_TOO_LARGE = "message too large";
public static final String ERROR_UNKNOWN_MESSAGE_TYPE = "unknown message type: ";
@@ -46,6 +47,7 @@ public final class RPCDeviceBusAdapter implements Steppable, IEventSink {
private final Set<RPCDeviceList> mountedDevices = new HashSet<>();
private final Lock pauseLock = new ReentrantLock();
private boolean isPaused;
private boolean crmode = false;
private final ArrayList<RPCEventSource> subscriptions = new ArrayList<>();
///////////////////////////////////////////////////////////////////
@@ -246,7 +248,8 @@ public final class RPCDeviceBusAdapter implements Steppable, IEventSink {
// the most simple and easy to maintain one I could think of.
int value;
while (receiveBuffer == null && synchronizedInvocation == null && (value = serialDevice.read()) >= 0) {
if (value == 0) {
if (value == 0 || value == 13) {
this.crmode = value == 13;
if (transmitBuffer.limit() > 0) {
transmitBuffer.flip();
if (transmitBuffer.hasRemaining()) {
@@ -463,14 +466,24 @@ public final class RPCDeviceBusAdapter implements Steppable, IEventSink {
// In case we went through a reset and the VM was in the middle of reading
// a message we inject a delimiter up front to cause the truncated message
// to be discarded.
receiveBuffer.put(MESSAGE_DELIMITER);
if (this.crmode) {
receiveBuffer.put(MESSAGE_DELIMITER2);
}
else {
receiveBuffer.put(MESSAGE_DELIMITER);
}
receiveBuffer.put(bytes);
// We follow up each message with a delimiter, too, so the VM knows when the
// message has been completed. This will lead to two delimiters between most
// messages. The VM is expected to ignore such "empty" messages.
receiveBuffer.put(MESSAGE_DELIMITER);
if (this.crmode) {
receiveBuffer.put(MESSAGE_DELIMITER2);
}
else {
receiveBuffer.put(MESSAGE_DELIMITER);
}
receiveBuffer.flip();
this.receiveBuffer = receiveBuffer;