From 8738a42ca0a1ba977ed7aafd3050e504ee44aa83 Mon Sep 17 00:00:00 2001
From: Resaec <resaecscript@googlemail.com>
Date: Mon, 29 Jul 2024 08:18:04 +0200
Subject: [PATCH] Rename and correct packet Unknown30 to ClientHotStart (#1217)

This packet contains the client and server nonce needed to restart a connection using old crypto data.
---
 .../psforever/actors/net/MiddlewareActor.scala |  8 ++++----
 .../psforever/packet/ControlPacketOpcode.scala |  4 ++--
 .../packet/control/ClientHotStart.scala        | 18 ++++++++++++++++++
 .../psforever/packet/control/Unknown30.scala   | 15 ---------------
 4 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 src/main/scala/net/psforever/packet/control/ClientHotStart.scala
 delete mode 100644 src/main/scala/net/psforever/packet/control/Unknown30.scala

diff --git a/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala b/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala
index 645e68ec6..4e5c594a8 100644
--- a/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala
+++ b/src/main/scala/net/psforever/actors/net/MiddlewareActor.scala
@@ -308,9 +308,9 @@ class MiddlewareActor(
                 send(ServerStart(nonce, serverNonce), None, None)
                 cryptoSetup()
 
-              case (Unknown30(_), _) =>
+              case (ClientHotStart(_, _), _) =>
                 /*
-                Unknown30 is used to reuse an existing crypto session when switching from login to world
+                ClientHotStart is used to reuse an existing crypto session when switching from login to world
                 When not handling it, it appears that the client will fall back to using ClientStart
                 Do we need to implement this?
                 */
@@ -586,9 +586,9 @@ class MiddlewareActor(
           case ClientStart(_) =>
             start()
 
-          case Unknown30(_) =>
+          case ClientHotStart(_, _) =>
             /*
-            Unknown30 is used to reuse an existing crypto session when switching from login to world
+            ClientHotStart is used to reuse an existing crypto session when switching from login to world
             When not handling it, it appears that the client will fall back to using ClientStart
             Do we need to implement this?
             */
diff --git a/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala b/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala
index 0fe9d1c56..3e8286dee 100644
--- a/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala
+++ b/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala
@@ -45,7 +45,7 @@ object ControlPacketOpcode extends Enumeration {
   Unknown27,       //
   Unknown28,       //
   ConnectionClose, //
-  Unknown30        // Probably a more lightweight variant of ClientStart, containing only the client nonce
+  ClientHotStart        // Probably a more lightweight variant of ClientStart, containing only the client nonce
   = Value
 
   private def noDecoder(opcode: ControlPacketOpcode.Type) =
@@ -90,7 +90,7 @@ object ControlPacketOpcode extends Enumeration {
       case 0x1b => noDecoder(Unknown27)
       case 0x1c => noDecoder(Unknown28)
       case 0x1d => control.ConnectionClose.decode
-      case 0x1e => control.Unknown30.decode
+      case 0x1e => control.ClientHotStart.decode
       case _    => noDecoder(opcode)
     }
 
diff --git a/src/main/scala/net/psforever/packet/control/ClientHotStart.scala b/src/main/scala/net/psforever/packet/control/ClientHotStart.scala
new file mode 100644
index 000000000..cf7697350
--- /dev/null
+++ b/src/main/scala/net/psforever/packet/control/ClientHotStart.scala
@@ -0,0 +1,18 @@
+package net.psforever.packet.control
+
+import net.psforever.packet.{ControlPacketOpcode, Marshallable, PlanetSideControlPacket}
+import scodec.Codec
+import scodec.codecs._
+
+final case class ClientHotStart(clientNonce: Long, ServerNonce: Long) extends PlanetSideControlPacket {
+  type Packet = ClientHotStart
+  def opcode = ControlPacketOpcode.ClientHotStart
+  def encode = ClientHotStart.encode(this)
+}
+
+object ClientHotStart extends Marshallable[ClientHotStart] {
+  implicit val codec: Codec[ClientHotStart] = (
+    ("client_nonce" | uint32L) ::
+      ("server_nonce" | uint32L)
+    ).as[ClientHotStart]
+}
diff --git a/src/main/scala/net/psforever/packet/control/Unknown30.scala b/src/main/scala/net/psforever/packet/control/Unknown30.scala
deleted file mode 100644
index 168391083..000000000
--- a/src/main/scala/net/psforever/packet/control/Unknown30.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-package net.psforever.packet.control
-
-import net.psforever.packet.{ControlPacketOpcode, Marshallable, PlanetSideControlPacket}
-import scodec.Codec
-import scodec.codecs._
-
-final case class Unknown30(clientNonce: Long) extends PlanetSideControlPacket {
-  type Packet = Unknown30
-  def opcode = ControlPacketOpcode.Unknown30
-  def encode = Unknown30.encode(this)
-}
-
-object Unknown30 extends Marshallable[Unknown30] {
-  implicit val codec: Codec[Unknown30] = ("client_nonce" | uint32L).as[Unknown30]
-}