From 30a94a072518c02364afe5b0da2cc1fb43cdcb64 Mon Sep 17 00:00:00 2001 From: Chord Date: Sun, 24 Apr 2016 20:36:36 -0400 Subject: [PATCH] Remove extra logging and discord bot test --- .../main/scala/psforever/net/PSPacket.scala | 2 +- .../src/main/scala/CryptoSessionActor.scala | 39 +++---------------- .../src/main/scala/LoginSessionActor.scala | 2 +- pslogin/src/main/scala/UdpListener.scala | 2 +- 4 files changed, 9 insertions(+), 36 deletions(-) diff --git a/common/src/main/scala/psforever/net/PSPacket.scala b/common/src/main/scala/psforever/net/PSPacket.scala index f6e6d620..ba2ab2a3 100644 --- a/common/src/main/scala/psforever/net/PSPacket.scala +++ b/common/src/main/scala/psforever/net/PSPacket.scala @@ -141,7 +141,7 @@ final case class LoginMessage(majorVersion : Long, object LoginMessage extends Marshallable[LoginMessage] { private def username = PacketHelpers.encodedStringAligned(7) private def password = PacketHelpers.encodedString - private def tokenPath = fixedSizeBytes(32, ascii) :: username + private def tokenPath = fixedSizeBytes(32, bytes) :: username private def passwordPath = username :: password type Struct = String :: Option[String] :: Option[String] :: HNil diff --git a/pslogin/src/main/scala/CryptoSessionActor.scala b/pslogin/src/main/scala/CryptoSessionActor.scala index 78080b3a..ea5d9de5 100644 --- a/pslogin/src/main/scala/CryptoSessionActor.scala +++ b/pslogin/src/main/scala/CryptoSessionActor.scala @@ -53,7 +53,7 @@ class CryptoSessionActor extends Actor with ActorLogging { PacketCoding.UnmarshalPacket(msg) match { case Failure(e) => log.error("Could not decode packet: " + e) case Successful(p) => - println("RECV: " + p) + //println("RECV: " + p) p match { case ControlPacket(_, ClientStart(nonce)) => @@ -72,7 +72,7 @@ class CryptoSessionActor extends Actor with ActorLogging { PacketCoding.UnmarshalPacket(msg, CryptoPacketOpcode.ClientChallengeXchg) match { case Failure(e) => log.error("Could not decode packet: " + e) case Successful(p) => - println("RECV: " + p) + //println("RECV: " + p) p match { case CryptoPacket(seq, ClientChallengeXchg(time, challenge, p, g)) => @@ -111,7 +111,7 @@ class CryptoSessionActor extends Actor with ActorLogging { PacketCoding.UnmarshalPacket(msg, CryptoPacketOpcode.ClientFinished) match { case Failure(e) => log.error("Could not decode packet: " + e) case Successful(p) => - println("RECV: " + p) + //println("RECV: " + p) p match { case CryptoPacket(seq, ClientFinished(clientPubKey, clientChalResult)) => @@ -196,10 +196,10 @@ class CryptoSessionActor extends Actor with ActorLogging { case Successful(p) => p match { case encPacket @ EncryptedPacket(seq, _) => - println("Decrypting packet..." + encPacket) + //println("Decrypting packet..." + encPacket) PacketCoding.decryptPacket(cryptoState.get, encPacket) match { case Successful(packet) => - println("RECV[E]: " + packet) + //println("RECV[E]: " + packet) self ! packet case Failure(e) => @@ -218,38 +218,11 @@ class CryptoSessionActor extends Actor with ActorLogging { val from = sender() handleEstablishedPacket(from, game) - /* case SlottedMetaPacket(innerPacket) => - PacketCoding.DecodePacket(innerPacket) match { - case Successful(p) => - println("RECV[INNER]: " + p) - - val packet = PacketCoding.encryptPacket(cryptoState.get, PacketCoding.CreateGamePacket(3, - LoginRespMessage("AAAABBBBCCCCDDDD", - hex"00000000 18FABE0C 00000000 00000000", - 0, 1, 2, 685276011, - "AAAAAAAA", 0, false - ))).require - - sendResponse(packet) - - val msg = VNLWorldStatusMessage("Welcome to PlanetSide! ", - Vector( - WorldInformation("PSForever", WorldStatus.Up, ServerType.Development, - Vector(WorldConnectionInfo(new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 51001))), EmpireNeed.TR) - )) - - sendResponse(PacketCoding.encryptPacket(cryptoState.get, PacketCoding.CreateGamePacket(4, - msg - )).require) - case Failure(e) => println("Failed to decode inner packet " + e) - } - */ case default => failWithError(s"Invalid message received ${default}") } def failWithError(error : String) = { log.error(error) - sendResponse(PacketCoding.CreateControlPacket(ConnectionClose())) } def resetState() : Unit = { @@ -285,7 +258,7 @@ class CryptoSessionActor extends Actor with ActorLogging { } def sendResponse(cont : PlanetSidePacketContainer) : ByteVector = { - println("CRYPTO SEND: " + cont) + //println("CRYPTO SEND: " + cont) val pkt = PacketCoding.MarshalPacket(cont).require val bytes = pkt.toByteVector diff --git a/pslogin/src/main/scala/LoginSessionActor.scala b/pslogin/src/main/scala/LoginSessionActor.scala index 062f5972..6c73e2be 100644 --- a/pslogin/src/main/scala/LoginSessionActor.scala +++ b/pslogin/src/main/scala/LoginSessionActor.scala @@ -68,7 +68,7 @@ class LoginSessionActor extends Actor with ActorLogging { } def sendResponse(cont : PlanetSidePacketContainer) = { - log.info("LOGIN SEND: " + cont) + println("LOGIN SEND: " + cont) rightRef ! cont } } diff --git a/pslogin/src/main/scala/UdpListener.scala b/pslogin/src/main/scala/UdpListener.scala index 7c85abdd..7d888281 100644 --- a/pslogin/src/main/scala/UdpListener.scala +++ b/pslogin/src/main/scala/UdpListener.scala @@ -13,7 +13,7 @@ final case class HelloFriend(next: ActorRef) class UdpListener(nextActor: ActorRef) extends Actor with ActorLogging { import context.system - IO(Udp) ! Udp.Bind(self, new InetSocketAddress("0.0.0.0", 51000)) + IO(Udp) ! Udp.Bind(self, new InetSocketAddress("127.0.0.1", 51000)) var bytesRecevied = 0L var bytesSent = 0L