feat[rust]: compatible protocol

zfoo-project · Jul 21, 2024 · 2a3ba99 · 2a3ba99
1 parent f252aec
commit 2a3ba99
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/rust/CodeGenerateRust.java b/protocol/src/main/java/com/zfoo/protocol/serializer/rust/CodeGenerateRust.java
@@ -353,7 +353,7 @@ private String protocol_read_deserialization(ProtocolRegistration registration)
             var field = fields[i];
             var fieldRegistration = fieldRegistrations[i];
             if (field.isAnnotationPresent(Compatible.class)) {
-                rustBuilder.append("if (buffer.compatibleRead(beforeReadIndex, length)) {").append(LS);
+                rustBuilder.append("if buffer.compatibleRead(beforeReadIndex, length) {").append(LS);
                 var compatibleReadObject = rustSerializer(fieldRegistration.serializer()).readObject(rustBuilder, 1, field, fieldRegistration);
                 rustBuilder.append(TAB).append(StringUtils.format("packet.{} = {};", field.getName(), compatibleReadObject)).append(LS);
                 rustBuilder.append("}").append(LS);

diff --git a/protocol/src/main/resources/rust/byte_buffer.rs b/protocol/src/main/resources/rust/byte_buffer.rs
@@ -51,6 +51,10 @@ impl IByteBuffer for ByteBuffer {
         }
     }
 
+    fn compatibleRead(&mut self, beforeReadIndex: i32, length: i32) -> bool{
+        return length != -1 && self.getReadOffset() < length + beforeReadIndex;
+    }
+
     fn getBuffer(&self) -> &Vec<i8> {
         return &self.buffer;
     }

diff --git a/protocol/src/main/resources/rust/i_byte_buffer.rs b/protocol/src/main/resources/rust/i_byte_buffer.rs
@@ -13,6 +13,7 @@ pub trait IPacket {
 #[allow(unused_parens)]
 pub trait IByteBuffer {
     fn adjustPadding(&mut self, predictionLength: i32, beforeWriteIndex: i32);
+    fn compatibleRead(&mut self, beforeReadIndex: i32, length: i32) -> bool;
     fn getBuffer(&self) -> &Vec<i8>;
     fn getWriteOffset(&self) -> i32;
     fn setWriteOffset(&mut self, writeIndex: i32);