From ff4ea792ce230a898f160a67cf954a3941e5da36 Mon Sep 17 00:00:00 2001 From: Chord Date: Tue, 3 May 2016 20:11:45 -0400 Subject: [PATCH] Organize packets in to their own packages Also remove legacy CryptoStateManager --- .../packet/ControlPacketOpcode.scala | 15 +++---- .../psforever/packet/CryptoPacketOpcode.scala | 10 ++--- .../psforever/packet/GamePacketOpcode.scala | 8 ++-- .../packet/{ => control}/ClientStart.scala | 5 ++- .../{ => control}/ConnectionClose.scala | 3 +- .../{ => control}/HandleGamePacket.scala | 5 ++- .../packet/{ => control}/MultiPacket.scala | 6 +-- .../packet/{ => control}/ServerStart.scala | 5 ++- .../{ => control}/SlottedMetaPacket.scala | 5 ++- .../{ => crypto}/ClientChallengeXchg.scala | 7 ++-- .../packet/{ => crypto}/ClientFinished.scala | 6 +-- .../{ => crypto}/ServerChallengeXchg.scala | 6 +-- .../packet/{ => crypto}/ServerFinished.scala | 6 +-- .../{ => game}/ConnectToWorldMessage.scala | 3 +- .../packet/{ => game}/LoginMessage.scala | 4 +- .../packet/{ => game}/LoginRespMessage.scala | 6 +-- .../{ => game}/VNLWorldStatusMessage.scala | 3 +- common/src/test/scala/CryptoPacketTest.scala | 2 + common/src/test/scala/GamePacketTest.scala | 1 + common/src/test/scala/PacketCodingTest.scala | 1 + .../src/main/scala/CryptoSessionActor.scala | 3 ++ .../src/main/scala/LoginSessionActor.scala | 4 +- .../psforever/crypto/CryptoStateManager.scala | 41 ------------------- 23 files changed, 65 insertions(+), 90 deletions(-) rename common/src/main/scala/net/psforever/packet/{ => control}/ClientStart.scala (82%) rename common/src/main/scala/net/psforever/packet/{ => control}/ConnectionClose.scala (86%) rename common/src/main/scala/net/psforever/packet/{ => control}/HandleGamePacket.scala (79%) rename common/src/main/scala/net/psforever/packet/{ => control}/MultiPacket.scala (80%) rename common/src/main/scala/net/psforever/packet/{ => control}/ServerStart.scala (82%) rename common/src/main/scala/net/psforever/packet/{ => control}/SlottedMetaPacket.scala (85%) rename common/src/main/scala/net/psforever/packet/{ => crypto}/ClientChallengeXchg.scala (87%) rename common/src/main/scala/net/psforever/packet/{ => crypto}/ClientFinished.scala (81%) rename common/src/main/scala/net/psforever/packet/{ => crypto}/ServerChallengeXchg.scala (86%) rename common/src/main/scala/net/psforever/packet/{ => crypto}/ServerFinished.scala (77%) rename common/src/main/scala/net/psforever/packet/{ => game}/ConnectToWorldMessage.scala (80%) rename common/src/main/scala/net/psforever/packet/{ => game}/LoginMessage.scala (95%) rename common/src/main/scala/net/psforever/packet/{ => game}/LoginRespMessage.scala (90%) rename common/src/main/scala/net/psforever/packet/{ => game}/VNLWorldStatusMessage.scala (96%) delete mode 100644 pslogin/src/main/scala/net/psforever/crypto/CryptoStateManager.scala diff --git a/common/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala b/common/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala index fa34ee95..e54397c8 100644 --- a/common/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala @@ -1,8 +1,9 @@ // Copyright (c) 2016 PSForever.net to present package net.psforever.packet +import net.psforever.packet.control.SlottedMetaPacket import scodec.bits.BitVector -import scodec.{Err, DecodeResult, Attempt, Codec} +import scodec.{Attempt, Codec, DecodeResult, Err} import scodec.codecs._ object ControlPacketOpcode extends Enumeration { @@ -54,12 +55,12 @@ object ControlPacketOpcode extends Enumeration { import net.psforever opcode match { - case HandleGamePacket => psforever.packet.HandleGamePacket.decode - case ServerStart => psforever.packet.ServerStart.decode - case ClientStart => psforever.packet.ClientStart.decode - case MultiPacket => psforever.packet.MultiPacket.decode - case SlottedMetaPacket0 => psforever.packet.SlottedMetaPacket.decode - case ConnectionClose => psforever.packet.ConnectionClose.decode + case HandleGamePacket => control.HandleGamePacket.decode + case ServerStart => control.ServerStart.decode + case ClientStart => control.ClientStart.decode + case MultiPacket => control.MultiPacket.decode + case SlottedMetaPacket0 => SlottedMetaPacket.decode + case ConnectionClose => control.ConnectionClose.decode case default => (a : BitVector) => Attempt.failure(Err(s"Could not find a marshaller for control packet ${opcode}")) } } diff --git a/common/src/main/scala/net/psforever/packet/CryptoPacketOpcode.scala b/common/src/main/scala/net/psforever/packet/CryptoPacketOpcode.scala index e0338065..4dd63948 100644 --- a/common/src/main/scala/net/psforever/packet/CryptoPacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/CryptoPacketOpcode.scala @@ -2,7 +2,7 @@ package net.psforever.packet import scodec.bits.BitVector -import scodec.{Err, DecodeResult, Attempt} +import scodec.{Attempt, DecodeResult, Err} // this isnt actually used as an opcode (i.e not serialized) object CryptoPacketOpcode extends Enumeration { @@ -14,10 +14,10 @@ object CryptoPacketOpcode extends Enumeration { import net.psforever opcode match { - case ClientChallengeXchg => psforever.packet.ClientChallengeXchg.decode - case ServerChallengeXchg => psforever.packet.ServerChallengeXchg.decode - case ServerFinished => psforever.packet.ServerFinished.decode - case ClientFinished => psforever.packet.ClientFinished.decode + case ClientChallengeXchg => crypto.ClientChallengeXchg.decode + case ServerChallengeXchg => crypto.ServerChallengeXchg.decode + case ServerFinished => crypto.ServerFinished.decode + case ClientFinished => crypto.ClientFinished.decode case default => (a : BitVector) => Attempt.failure(Err(s"Could not find a marshaller for crypto packet ${opcode}") .pushContext("get_marshaller")) } diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala index f1002b3f..ecf08ad5 100644 --- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala +++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala @@ -1,7 +1,7 @@ // Copyright (c) 2016 PSForever.net to present package net.psforever.packet -import scodec.{Err, DecodeResult, Attempt, Codec} +import scodec.{Attempt, Codec, DecodeResult, Err} import scodec.bits.BitVector import scodec.codecs._ @@ -35,9 +35,9 @@ object GamePacketOpcode extends Enumeration { import net.psforever opcode match { - case LoginMessage => psforever.packet.LoginMessage.decode - case LoginRespMessage => psforever.packet.LoginRespMessage.decode - case VNLWorldStatusMessage => psforever.packet.VNLWorldStatusMessage.decode + case LoginMessage => game.LoginMessage.decode + case LoginRespMessage => game.LoginRespMessage.decode + case VNLWorldStatusMessage => game.VNLWorldStatusMessage.decode case default => (a : BitVector) => Attempt.failure(Err(s"Could not find a marshaller for game packet ${opcode}")) } } diff --git a/common/src/main/scala/net/psforever/packet/ClientStart.scala b/common/src/main/scala/net/psforever/packet/control/ClientStart.scala similarity index 82% rename from common/src/main/scala/net/psforever/packet/ClientStart.scala rename to common/src/main/scala/net/psforever/packet/control/ClientStart.scala index 6491b8f0..772f7b47 100644 --- a/common/src/main/scala/net/psforever/packet/ClientStart.scala +++ b/common/src/main/scala/net/psforever/packet/control/ClientStart.scala @@ -1,9 +1,10 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.control +import net.psforever.packet.{ControlPacketOpcode, Marshallable, PlanetSideControlPacket} import scodec.Codec -import scodec.codecs._ import scodec.bits._ +import scodec.codecs._ final case class ClientStart(clientNonce : Long) extends PlanetSideControlPacket { diff --git a/common/src/main/scala/net/psforever/packet/ConnectionClose.scala b/common/src/main/scala/net/psforever/packet/control/ConnectionClose.scala similarity index 86% rename from common/src/main/scala/net/psforever/packet/ConnectionClose.scala rename to common/src/main/scala/net/psforever/packet/control/ConnectionClose.scala index 9277a80d..b6d87bd3 100644 --- a/common/src/main/scala/net/psforever/packet/ConnectionClose.scala +++ b/common/src/main/scala/net/psforever/packet/control/ConnectionClose.scala @@ -1,6 +1,7 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.control +import net.psforever.packet._ import scodec.Codec final case class ConnectionClose() diff --git a/common/src/main/scala/net/psforever/packet/HandleGamePacket.scala b/common/src/main/scala/net/psforever/packet/control/HandleGamePacket.scala similarity index 79% rename from common/src/main/scala/net/psforever/packet/HandleGamePacket.scala rename to common/src/main/scala/net/psforever/packet/control/HandleGamePacket.scala index e665001d..561536ca 100644 --- a/common/src/main/scala/net/psforever/packet/HandleGamePacket.scala +++ b/common/src/main/scala/net/psforever/packet/control/HandleGamePacket.scala @@ -1,8 +1,9 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.control -import scodec.bits.ByteVector +import net.psforever.packet.{ControlPacketOpcode, Marshallable, PlanetSideControlPacket} import scodec.Codec +import scodec.bits.ByteVector import scodec.codecs._ final case class HandleGamePacket(packet : ByteVector) diff --git a/common/src/main/scala/net/psforever/packet/MultiPacket.scala b/common/src/main/scala/net/psforever/packet/control/MultiPacket.scala similarity index 80% rename from common/src/main/scala/net/psforever/packet/MultiPacket.scala rename to common/src/main/scala/net/psforever/packet/control/MultiPacket.scala index 68a5dfd7..1588f84f 100644 --- a/common/src/main/scala/net/psforever/packet/MultiPacket.scala +++ b/common/src/main/scala/net/psforever/packet/control/MultiPacket.scala @@ -1,10 +1,10 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.control -import scodec.bits.ByteVector +import net.psforever.packet.{ControlPacketOpcode, Marshallable, PlanetSideControlPacket} import scodec.Codec +import scodec.bits.ByteVector import scodec.codecs._ -import scodec.bits._ final case class MultiPacket(packets : Vector[ByteVector]) extends PlanetSideControlPacket { diff --git a/common/src/main/scala/net/psforever/packet/ServerStart.scala b/common/src/main/scala/net/psforever/packet/control/ServerStart.scala similarity index 82% rename from common/src/main/scala/net/psforever/packet/ServerStart.scala rename to common/src/main/scala/net/psforever/packet/control/ServerStart.scala index 57290a16..71c500d1 100644 --- a/common/src/main/scala/net/psforever/packet/ServerStart.scala +++ b/common/src/main/scala/net/psforever/packet/control/ServerStart.scala @@ -1,9 +1,10 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.control +import net.psforever.packet.{ControlPacketOpcode, Marshallable, PlanetSideControlPacket} import scodec.Codec -import scodec.codecs._ import scodec.bits._ +import scodec.codecs._ final case class ServerStart(clientNonce : Long, serverNonce : Long) extends PlanetSideControlPacket { diff --git a/common/src/main/scala/net/psforever/packet/SlottedMetaPacket.scala b/common/src/main/scala/net/psforever/packet/control/SlottedMetaPacket.scala similarity index 85% rename from common/src/main/scala/net/psforever/packet/SlottedMetaPacket.scala rename to common/src/main/scala/net/psforever/packet/control/SlottedMetaPacket.scala index 93822c40..ea763067 100644 --- a/common/src/main/scala/net/psforever/packet/SlottedMetaPacket.scala +++ b/common/src/main/scala/net/psforever/packet/control/SlottedMetaPacket.scala @@ -1,8 +1,9 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.control -import scodec.bits.ByteVector +import net.psforever.packet.{ControlPacketOpcode, Marshallable, PlanetSideControlPacket} import scodec.Codec +import scodec.bits.ByteVector import scodec.codecs._ final case class SlottedMetaPacket(/*slot : Int,*/ packet : ByteVector) diff --git a/common/src/main/scala/net/psforever/packet/ClientChallengeXchg.scala b/common/src/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala similarity index 87% rename from common/src/main/scala/net/psforever/packet/ClientChallengeXchg.scala rename to common/src/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala index 3ee490eb..b096d61d 100644 --- a/common/src/main/scala/net/psforever/packet/ClientChallengeXchg.scala +++ b/common/src/main/scala/net/psforever/packet/crypto/ClientChallengeXchg.scala @@ -1,11 +1,10 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet - -import scodec.bits.ByteVector +package net.psforever.packet.crypto +import net.psforever.packet.{CryptoPacketOpcode, Marshallable, PlanetSideCryptoPacket} import scodec.Codec +import scodec.bits.{ByteVector, _} import scodec.codecs._ -import scodec.bits._ final case class ClientChallengeXchg(time : Long, challenge : ByteVector, p : ByteVector, g : ByteVector) extends PlanetSideCryptoPacket { diff --git a/common/src/main/scala/net/psforever/packet/ClientFinished.scala b/common/src/main/scala/net/psforever/packet/crypto/ClientFinished.scala similarity index 81% rename from common/src/main/scala/net/psforever/packet/ClientFinished.scala rename to common/src/main/scala/net/psforever/packet/crypto/ClientFinished.scala index 324331ef..bff66cdb 100644 --- a/common/src/main/scala/net/psforever/packet/ClientFinished.scala +++ b/common/src/main/scala/net/psforever/packet/crypto/ClientFinished.scala @@ -1,10 +1,10 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.crypto -import scodec.bits.ByteVector +import net.psforever.packet.{CryptoPacketOpcode, Marshallable, PlanetSideCryptoPacket} import scodec.Codec +import scodec.bits.{ByteVector, _} import scodec.codecs._ -import scodec.bits._ final case class ClientFinished(pubKey : ByteVector, challengeResult: ByteVector) extends PlanetSideCryptoPacket { diff --git a/common/src/main/scala/net/psforever/packet/ServerChallengeXchg.scala b/common/src/main/scala/net/psforever/packet/crypto/ServerChallengeXchg.scala similarity index 86% rename from common/src/main/scala/net/psforever/packet/ServerChallengeXchg.scala rename to common/src/main/scala/net/psforever/packet/crypto/ServerChallengeXchg.scala index 14953ada..d1af324d 100644 --- a/common/src/main/scala/net/psforever/packet/ServerChallengeXchg.scala +++ b/common/src/main/scala/net/psforever/packet/crypto/ServerChallengeXchg.scala @@ -1,10 +1,10 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.crypto -import scodec.bits.ByteVector +import net.psforever.packet.{CryptoPacketOpcode, Marshallable, PlanetSideCryptoPacket} import scodec.Codec +import scodec.bits.{ByteVector, _} import scodec.codecs._ -import scodec.bits._ final case class ServerChallengeXchg(time : Long, challenge : ByteVector, pubKey : ByteVector) extends PlanetSideCryptoPacket { diff --git a/common/src/main/scala/net/psforever/packet/ServerFinished.scala b/common/src/main/scala/net/psforever/packet/crypto/ServerFinished.scala similarity index 77% rename from common/src/main/scala/net/psforever/packet/ServerFinished.scala rename to common/src/main/scala/net/psforever/packet/crypto/ServerFinished.scala index fe836367..919d422c 100644 --- a/common/src/main/scala/net/psforever/packet/ServerFinished.scala +++ b/common/src/main/scala/net/psforever/packet/crypto/ServerFinished.scala @@ -1,10 +1,10 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.crypto -import scodec.bits.ByteVector +import net.psforever.packet.{CryptoPacketOpcode, Marshallable, PlanetSideCryptoPacket} import scodec.Codec +import scodec.bits.{ByteVector, _} import scodec.codecs._ -import scodec.bits._ final case class ServerFinished(challengeResult : ByteVector) extends PlanetSideCryptoPacket { diff --git a/common/src/main/scala/net/psforever/packet/ConnectToWorldMessage.scala b/common/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala similarity index 80% rename from common/src/main/scala/net/psforever/packet/ConnectToWorldMessage.scala rename to common/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala index 2999633b..14675920 100644 --- a/common/src/main/scala/net/psforever/packet/ConnectToWorldMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ConnectToWorldMessage.scala @@ -1,6 +1,7 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.game +import net.psforever.packet.{GamePacketOpcode, Marshallable, PlanetSideGamePacket} import scodec.Codec import scodec.codecs._ diff --git a/common/src/main/scala/net/psforever/packet/LoginMessage.scala b/common/src/main/scala/net/psforever/packet/game/LoginMessage.scala similarity index 95% rename from common/src/main/scala/net/psforever/packet/LoginMessage.scala rename to common/src/main/scala/net/psforever/packet/game/LoginMessage.scala index 403d8df0..d1c0a9c0 100644 --- a/common/src/main/scala/net/psforever/packet/LoginMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/LoginMessage.scala @@ -1,9 +1,9 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.game +import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} import scodec.Codec import scodec.codecs._ -import scodec.bits._ import shapeless._ final case class LoginMessage(majorVersion : Long, diff --git a/common/src/main/scala/net/psforever/packet/LoginRespMessage.scala b/common/src/main/scala/net/psforever/packet/game/LoginRespMessage.scala similarity index 90% rename from common/src/main/scala/net/psforever/packet/LoginRespMessage.scala rename to common/src/main/scala/net/psforever/packet/game/LoginRespMessage.scala index 401d59ad..bbc9ea4d 100644 --- a/common/src/main/scala/net/psforever/packet/LoginRespMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/LoginRespMessage.scala @@ -1,10 +1,10 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.game -import scodec.bits.ByteVector +import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} import scodec.Codec +import scodec.bits.ByteVector import scodec.codecs._ -import scodec.bits._ final case class LoginRespMessage(token : String, // printable ascii for 16 unknown : ByteVector, // hex"00000000 18FABE0C 00000000 00000000" diff --git a/common/src/main/scala/net/psforever/packet/VNLWorldStatusMessage.scala b/common/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala similarity index 96% rename from common/src/main/scala/net/psforever/packet/VNLWorldStatusMessage.scala rename to common/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala index 5b43bdd1..62833859 100644 --- a/common/src/main/scala/net/psforever/packet/VNLWorldStatusMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala @@ -1,8 +1,9 @@ // Copyright (c) 2016 PSForever.net to present -package net.psforever.packet +package net.psforever.packet.game import java.net.{InetAddress, InetSocketAddress} +import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket} import scodec._ import scodec.bits._ import scodec.codecs._ diff --git a/common/src/test/scala/CryptoPacketTest.scala b/common/src/test/scala/CryptoPacketTest.scala index 5e5bcd2c..d889a124 100644 --- a/common/src/test/scala/CryptoPacketTest.scala +++ b/common/src/test/scala/CryptoPacketTest.scala @@ -1,6 +1,8 @@ // Copyright (c) 2016 PSForever.net to present import org.specs2.mutable._ import net.psforever.packet._ +import net.psforever.packet.control.{ClientStart, ServerStart} +import net.psforever.packet.crypto.{ClientChallengeXchg, ClientFinished, ServerChallengeXchg, ServerFinished} import scodec.Codec import scodec.bits._ diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index 2036a55d..aa619e04 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -3,6 +3,7 @@ import java.net.{InetAddress, InetSocketAddress} import org.specs2.mutable._ import net.psforever.packet._ +import net.psforever.packet.game._ import scodec.bits._ class GamePacketTest extends Specification { diff --git a/common/src/test/scala/PacketCodingTest.scala b/common/src/test/scala/PacketCodingTest.scala index a4c9036f..58292f98 100644 --- a/common/src/test/scala/PacketCodingTest.scala +++ b/common/src/test/scala/PacketCodingTest.scala @@ -1,6 +1,7 @@ // Copyright (c) 2016 PSForever.net to present import org.specs2.mutable._ import net.psforever.packet._ +import net.psforever.packet.control.{ClientStart, ServerStart} import scodec.bits._ class PacketCodingTest extends Specification { diff --git a/pslogin/src/main/scala/CryptoSessionActor.scala b/pslogin/src/main/scala/CryptoSessionActor.scala index a07a4572..2f165d3d 100644 --- a/pslogin/src/main/scala/CryptoSessionActor.scala +++ b/pslogin/src/main/scala/CryptoSessionActor.scala @@ -11,6 +11,9 @@ import scodec.{Attempt, Codec, Err} import scodec.codecs.{bytes, uint16L, uint8L} import java.security.SecureRandom +import net.psforever.packet.control.{ClientStart, ServerStart} +import net.psforever.packet.crypto._ + /** * Actor that stores crypto state for a connection and filters away any packet metadata. */ diff --git a/pslogin/src/main/scala/LoginSessionActor.scala b/pslogin/src/main/scala/LoginSessionActor.scala index e0c71851..f21c0ad7 100644 --- a/pslogin/src/main/scala/LoginSessionActor.scala +++ b/pslogin/src/main/scala/LoginSessionActor.scala @@ -3,6 +3,8 @@ import java.net.{InetAddress, InetSocketAddress} import akka.actor.{Actor, ActorLogging, ActorRef, Identify, MDCContextAware} import net.psforever.packet._ +import net.psforever.packet.control.{ConnectionClose, SlottedMetaPacket} +import net.psforever.packet.game._ import scodec.Attempt.{Failure, Successful} import scodec.bits._ @@ -61,7 +63,7 @@ class LoginSessionActor extends Actor with MDCContextAware { } def handleGamePkt(pkt : PlanetSideGamePacket) = { - + log.debug(s"Unhandled GamePacket ${pkt}") } def failWithError(error : String) = { diff --git a/pslogin/src/main/scala/net/psforever/crypto/CryptoStateManager.scala b/pslogin/src/main/scala/net/psforever/crypto/CryptoStateManager.scala deleted file mode 100644 index ee2f045e..00000000 --- a/pslogin/src/main/scala/net/psforever/crypto/CryptoStateManager.scala +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) 2016 PSForever.net to present -package net.psforever.crypto - -import akka.actor.{Actor, ActorLogging, FSM} -import akka.util.ByteString -import scodec.Codec -import scodec.bits.ByteVector - -sealed trait CryptoState -final case class ClientStart() extends CryptoState -final case class ServerStart() extends CryptoState -final case class ClientChallengeXchg() extends CryptoState -final case class ServerChallengeXchg() extends CryptoState -final case class ClientFinished() extends CryptoState -final case class ServerFinished() extends CryptoState - -sealed trait CryptoData -final case class Uninitialized() extends CryptoData - -class CryptoStateManager extends Actor with ActorLogging with FSM[CryptoState, CryptoData] { - startWith(ClientStart(), Uninitialized()) - - when(ClientStart()) { - /*case Event(RawPacket(msg), _) => { - val decoded = Codec.decode[net.psforever.net.ClientStart](msg.bits) - try { - val packet = decoded.require.value - println("Got cNonce: " + packet.clientNonce) - } - catch { - case e : Exception => - println("Invalid packet: " + e.getMessage) - } - - stay - }*/ - case _ => stay - } - - initialize() -}