Issue #87: [RCON] Add support for rust's undocumented packet type

Signed-off-by: Rafael Ibasco <[email protected]>

Author: ribasco

CHANGELOG.md

@@ -1,5 +1,9 @@
 Changelog
 -------------
+1.0.5 - Bug fixes/enhancements
+
+- Fixed #87: Fixed invalid packet type exception thrown when executing commands on a Rust server
+
 1.0.4 - Bug fixes/enhancements
 
 - Enhancement #80: Use daemon threads for the default executor

README.md

@@ -241,7 +241,7 @@ Just add the following dependencies to your maven pom.xml. Only include the modu
 <dependency>
     <groupId>com.ibasco.agql</groupId>
   <artifactId>agql</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 </dependency>
 ```
 
@@ -251,7 +251,7 @@ Just add the following dependencies to your maven pom.xml. Only include the modu
 <dependency>
     <groupId>com.ibasco.agql</groupId>
   <artifactId>agql-steam-master</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 </dependency>
 ```
 
@@ -261,7 +261,7 @@ Just add the following dependencies to your maven pom.xml. Only include the modu
 <dependency>
   <groupId>com.ibasco.agql</groupId>
   <artifactId>agql-source-query</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 </dependency>
 ```
 
@@ -272,7 +272,7 @@ Just add the following dependencies to your maven pom.xml. Only include the modu
 <dependency>
   <groupId>com.ibasco.agql</groupId>
   <artifactId>agql-source-log</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 </dependency>
 ```
 
@@ -282,7 +282,7 @@ Just add the following dependencies to your maven pom.xml. Only include the modu
 <dependency>
   <groupId>com.ibasco.agql</groupId>
   <artifactId>agql-source-rcon</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 </dependency>
 ```
 
@@ -292,7 +292,7 @@ Just add the following dependencies to your maven pom.xml. Only include the modu
 <dependency>
   <groupId>com.ibasco.agql</groupId>
   <artifactId>agql-steam-webapi</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 </dependency>
 ```
 
@@ -302,7 +302,7 @@ Just add the following dependencies to your maven pom.xml. Only include the modu
 <dependency>
     <groupId>com.ibasco.agql</groupId>
   <artifactId>agql-dota2-webapi</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 </dependency>
 ```
 
@@ -312,7 +312,7 @@ Just add the following dependencies to your maven pom.xml. Only include the modu
 <dependency>
     <groupId>com.ibasco.agql</groupId>
   <artifactId>agql-csgo-webapi</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 </dependency>
 ```
 
@@ -324,7 +324,7 @@ Just add the following dependencies to your maven pom.xml. Only include the modu
 <dependency>
     <groupId>com.ibasco.agql</groupId>
   <artifactId>agql-coc-webapi</artifactId>
-  <version>1.0.4</version>
+  <version>1.0.5</version>
 </dependency>
 ```
 

pom.xml

@@ -30,7 +30,7 @@
 
     <!-- Properties -->
     <properties>
-        <revision>1.0.4</revision>
+        <revision>1.0.5</revision>
         <changelist>-SNAPSHOT</changelist>
         <sha1/>
         <maven.compiler.source>1.8</maven.compiler.source>

protocols/valve/source/rcon/src/main/java/com/ibasco/agql/protocols/valve/source/query/rcon/SourceRcon.java

@@ -35,7 +35,7 @@
 public final class SourceRcon {
 
     /** Constant <code>DEFAULT_THREAD_GROUP</code> */
-    public static final ThreadGroup DEFAULT_THREAD_GROUP = Platform.creeateThreadGroup(SourceRcon.class);
+    public static final ThreadGroup DEFAULT_THREAD_GROUP = Platform.createThreadGroup(SourceRcon.class);
 
     /**
      * RCON Auth Request Header
@@ -57,6 +57,11 @@ public final class SourceRcon {
      */
     public static final int RCON_TYPE_RESPONSE_VALUE = 0;
 
+    /**
+     * RCON Response Value Header (Rust)
+     */
+    public static final int RCON_TYPE_RESPONSE_VALUE_RUST = 0x4;
+
     /**
      * A reserved request id representing a special rcon terminator packet
      */
@@ -129,7 +134,7 @@ public static boolean isTerminatorId(int requestId) {
      */
     public static boolean isResponseValuePacket(SourceRconPacket packet) {
         Objects.requireNonNull(packet, "Packet argument must not be null");
-        return RCON_TYPE_RESPONSE_VALUE == packet.getType();
+        return RCON_TYPE_RESPONSE_VALUE == packet.getType() || RCON_TYPE_RESPONSE_VALUE_RUST == packet.getType();
     }
 
     /**
@@ -267,6 +272,9 @@ public static String getPacketTypeName(int type) {
             case RCON_TYPE_RESPONSE_VALUE: {
                 return "SERVERDATA_RESPONSE_VALUE";
             }
+            case RCON_TYPE_RESPONSE_VALUE_RUST: {
+                return "SERVERDATA_RESPONSE_VALUE_RUST";
+            }
             default: {
                 return "Unknown";
             }

protocols/valve/source/rcon/src/main/java/com/ibasco/agql/protocols/valve/source/query/rcon/SourceRconMessenger.java

@@ -85,7 +85,7 @@
  *
  * @author Rafael Luis Ibasco
  */
-@SuppressWarnings("FieldCanBeLocal")
+@SuppressWarnings({"FieldCanBeLocal", "rawtypes"})
 @MessengerProperties(optionClass = SourceRconOptions.class)
 public final class SourceRconMessenger extends NettyMessenger<SourceRconRequest, SourceRconResponse> {
 

protocols/valve/source/rcon/src/main/java/com/ibasco/agql/protocols/valve/source/query/rcon/packets/SourceRconPacketDecoder.java

@@ -98,7 +98,7 @@ public SourceRconPacket decode(ByteBuf in) throws PacketDecodeException {
             //Read and verify request type
             desc = StringUtils.rightPad("Valid packet type?", PAD_SIZE);
             int packetType = in.readIntLE();
-            if (packetType != SourceRcon.RCON_TYPE_RESPONSE_AUTH && packetType != SourceRcon.RCON_TYPE_RESPONSE_VALUE) {
+            if (packetType != SourceRcon.RCON_TYPE_RESPONSE_AUTH && packetType != SourceRcon.RCON_TYPE_RESPONSE_VALUE && packetType != SourceRcon.RCON_TYPE_RESPONSE_VALUE_RUST) {
                 debug(ctx, " [ ] {} = NO (Actual: {})", desc, packetType);
                 throw new PacketDecodeException("Invalid packet type: " + packetType);
             }