Refactor package naming scheme and line endings (CRLF)

build.sbt

@@ -1,5 +1,5 @@
 lazy val commonSettings = Seq(
-  organization := "net.psforever",
+  organization := "net.net.psforever",
   version := "1.0",
   scalaVersion := "2.11.7",
   scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8"),

common/src/main/scala/net/psforever/IFinalizable.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever
+package net.psforever
 
 class ObjectFinalizedException(msg : String) extends Exception(msg)
 

common/src/main/scala/net/psforever/crypto/CryptoInterface.scala

@@ -1,7 +1,7 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.crypto
+package net.psforever.crypto
 
-import psforever.IFinalizable
+import net.psforever.IFinalizable
 import sna.Library
 import com.sun.jna.Pointer
 import scodec.bits.ByteVector
@@ -63,6 +63,7 @@ object CryptoInterface {
 
   /**
     * Checks if two MAC values are the same in constant time, preventing a timing attack for MAC forgery
+ *
     * @param mac1
     * @param mac2
     */
@@ -218,6 +219,7 @@ object CryptoInterface {
                            val encryptionMACKey : ByteVector) extends CryptoState(decryptionKey, encryptionKey) {
     /**
       * Performs a MAC operation over the message. Used when encrypting packets
+ *
       * @param message
       * @return ByteVector
       */
@@ -227,6 +229,7 @@ object CryptoInterface {
 
     /**
       * Performs a MAC operation over the message. Used when verifying decrypted packets
+ *
       * @param message
       * @return ByteVector
       */
@@ -237,6 +240,7 @@ object CryptoInterface {
     /**
       * MACs the plaintext message, encrypts it, and then returns the encrypted message with the
       * MAC appended to the end.
+ *
       * @param message Arbitrary set of bytes
       * @return ByteVector
       */

common/src/main/scala/net/psforever/packet/ClientChallengeXchg.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.bits.ByteVector
 

common/src/main/scala/net/psforever/packet/ClientFinished.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.bits.ByteVector
 import scodec.Codec

common/src/main/scala/net/psforever/packet/ClientStart.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.Codec
 import scodec.codecs._

common/src/main/scala/net/psforever/packet/ConnectToWorldMessage.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.Codec
 import scodec.codecs._

common/src/main/scala/net/psforever/packet/ConnectionClose.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.Codec
 

common/src/main/scala/net/psforever/packet/ControlPacketOpcode.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.bits.BitVector
 import scodec.{Err, DecodeResult, Attempt, Codec}
@@ -50,14 +50,18 @@ object ControlPacketOpcode extends Enumeration {
   Unknown30
   = Value
 
-  def getPacketDecoder(opcode : ControlPacketOpcode.Type) : (BitVector) => Attempt[DecodeResult[PlanetSideControlPacket]] = opcode match {
+  def getPacketDecoder(opcode : ControlPacketOpcode.Type) : (BitVector) => Attempt[DecodeResult[PlanetSideControlPacket]] = {
-    case HandleGamePacket => psforever.net.HandleGamePacket.decode
+    import net.psforever
-    case ServerStart => psforever.net.ServerStart.decode
+
-    case ClientStart => psforever.net.ClientStart.decode
+    opcode match {
-    case MultiPacket => psforever.net.MultiPacket.decode
+      case HandleGamePacket => psforever.packet.HandleGamePacket.decode
-    case SlottedMetaPacket0 => psforever.net.SlottedMetaPacket.decode
+      case ServerStart => psforever.packet.ServerStart.decode
-    case ConnectionClose => psforever.net.ConnectionClose.decode
+      case ClientStart => psforever.packet.ClientStart.decode
-    case default => (a : BitVector) => Attempt.failure(Err(s"Could not find a marshaller for control packet ${opcode}"))
+      case MultiPacket => psforever.packet.MultiPacket.decode
+      case SlottedMetaPacket0 => psforever.packet.SlottedMetaPacket.decode
+      case ConnectionClose => psforever.packet.ConnectionClose.decode
+      case default => (a : BitVector) => Attempt.failure(Err(s"Could not find a marshaller for control packet ${opcode}"))
+    }
   }
 
   implicit val codec: Codec[this.Value] = PacketHelpers.createEnumerationCodec(this, uint8L)

common/src/main/scala/net/psforever/packet/CryptoPacketOpcode.scala

@@ -0,0 +1,25 @@
+// Copyright (c) 2016 PSForever.net to present
+package net.psforever.packet
+
+import scodec.bits.BitVector
+import scodec.{Err, DecodeResult, Attempt}
+
+// this isnt actually used as an opcode (i.e not serialized)
+object CryptoPacketOpcode extends Enumeration {
+  type Type = Value
+  val Ignore, ClientChallengeXchg, ServerChallengeXchg,
+    ClientFinished, ServerFinished = Value
+
+  def getPacketDecoder(opcode : CryptoPacketOpcode.Type) : (BitVector) => Attempt[DecodeResult[PlanetSideCryptoPacket]] = {
+    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 default => (a : BitVector) => Attempt.failure(Err(s"Could not find a marshaller for crypto packet ${opcode}")
+        .pushContext("get_marshaller"))
+    }
+  }
+}

common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.{Err, DecodeResult, Attempt, Codec}
 import scodec.bits.BitVector
@@ -31,11 +31,15 @@ object GamePacketOpcode extends Enumeration {
   DismountVehicleMsg
   = Value
 
-  def getPacketDecoder(opcode : GamePacketOpcode.Type) : (BitVector) => Attempt[DecodeResult[PlanetSideGamePacket]] = opcode match {
+  def getPacketDecoder(opcode : GamePacketOpcode.Type) : (BitVector) => Attempt[DecodeResult[PlanetSideGamePacket]] = {
-    case LoginMessage => psforever.net.LoginMessage.decode
+    import net.psforever
-    case LoginRespMessage => psforever.net.LoginRespMessage.decode
+
-    case VNLWorldStatusMessage => psforever.net.VNLWorldStatusMessage.decode
+    opcode match {
-    case default => (a : BitVector) => Attempt.failure(Err(s"Could not find a marshaller for game packet ${opcode}"))
+      case LoginMessage => psforever.packet.LoginMessage.decode
+      case LoginRespMessage => psforever.packet.LoginRespMessage.decode
+      case VNLWorldStatusMessage => psforever.packet.VNLWorldStatusMessage.decode
+      case default => (a : BitVector) => Attempt.failure(Err(s"Could not find a marshaller for game packet ${opcode}"))
+    }
   }
 
   implicit val codec: Codec[this.Value] = PacketHelpers.createEnumerationCodec(this, uint8L)

common/src/main/scala/net/psforever/packet/HandleGamePacket.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.bits.ByteVector
 import scodec.Codec

common/src/main/scala/net/psforever/packet/LoginMessage.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.Codec
 import scodec.codecs._

common/src/main/scala/net/psforever/packet/LoginRespMessage.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.bits.ByteVector
 import scodec.Codec

common/src/main/scala/net/psforever/packet/MultiPacket.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.bits.ByteVector
 import scodec.Codec

common/src/main/scala/net/psforever/packet/PSPacket.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import java.nio.charset.Charset
 

common/src/main/scala/net/psforever/packet/PacketCoding.scala

@@ -1,8 +1,8 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
-import psforever.crypto.CryptoInterface
+import net.psforever.crypto.CryptoInterface
-import psforever.crypto.CryptoInterface._
+import net.psforever.crypto.CryptoInterface._
 import scodec.Attempt.{Successful, Failure}
 import scodec.bits._
 import scodec.{DecodeResult, Err, Attempt, Codec}
@@ -38,6 +38,7 @@ object PacketCoding {
     * decode it given an optional header and required payload. This function does all of the
     * hard work of making decisions along the way in order to decode a planetside packet to
     * completion.
+    *
     * @param msg the raw packet
     * @param cryptoState the current state of the connection's crypto. This is only used when decoding
     *                    crypto packets as they do not have opcodes
@@ -60,6 +61,7 @@ object PacketCoding {
   /**
     * Helper function to decode a packet without specifying a crypto packet state.
     * Mostly used when there is no crypto state available, such as tests.
+    *
     * @param msg packet data bytes
     * @return PlanetSidePacketContainer
     */
@@ -70,6 +72,7 @@ object PacketCoding {
   /**
     * Similar to UnmarshalPacket, but does not process any packet header and does not support
     * decoding of crypto packets. Mostly used in tests.
+    *
     * @param msg raw, unencrypted packet
     * @return PlanetSidePacket
     */

common/src/main/scala/net/psforever/packet/ServerChallengeXchg.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.bits.ByteVector
 import scodec.Codec

common/src/main/scala/net/psforever/packet/ServerFinished.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.bits.ByteVector
 import scodec.Codec

common/src/main/scala/net/psforever/packet/ServerStart.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.Codec
 import scodec.codecs._

common/src/main/scala/net/psforever/packet/SlottedMetaPacket.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import scodec.bits.ByteVector
 import scodec.Codec

common/src/main/scala/net/psforever/packet/VNLWorldStatusMessage.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.net
+package net.psforever.packet
 
 import java.net.{InetAddress, InetSocketAddress}
 

common/src/main/scala/psforever/net/CryptoPacketOpcode.scala

@@ -1,21 +0,0 @@
-// Copyright (c) 2016 PSForever.net to present
-package psforever.net
-
-import scodec.bits.BitVector
-import scodec.{Err, DecodeResult, Attempt}
-
-// this isnt actually used as an opcode (i.e not serialized)
-object CryptoPacketOpcode extends Enumeration {
-  type Type = Value
-  val Ignore, ClientChallengeXchg, ServerChallengeXchg,
-    ClientFinished, ServerFinished = Value
-
-  def getPacketDecoder(opcode : CryptoPacketOpcode.Type) : (BitVector) => Attempt[DecodeResult[PlanetSideCryptoPacket]] = opcode match {
-    case ClientChallengeXchg => psforever.net.ClientChallengeXchg.decode
-    case ServerChallengeXchg => psforever.net.ServerChallengeXchg.decode
-    case ServerFinished => psforever.net.ServerFinished.decode
-    case ClientFinished => psforever.net.ClientFinished.decode
-    case default => (a : BitVector) => Attempt.failure(Err(s"Could not find a marshaller for crypto packet ${opcode}")
-      .pushContext("get_marshaller"))
-  }
-}

common/src/test/scala/CryptoInterfaceTest.scala

@@ -1,8 +1,8 @@
 // Copyright (c) 2016 PSForever.net to present
 
 import org.specs2.mutable._
-import psforever.crypto.CryptoInterface
+import net.psforever.crypto.CryptoInterface
-import psforever.crypto.CryptoInterface.CryptoDHState
+import net.psforever.crypto.CryptoInterface.CryptoDHState
 import scodec.bits._
 
 class CryptoInterfaceTest extends Specification {

common/src/test/scala/CryptoPacketTest.scala

@@ -1,6 +1,6 @@
 // Copyright (c) 2016 PSForever.net to present
 import org.specs2.mutable._
-import psforever.net._
+import net.psforever.packet._
 import scodec.Codec
 import scodec.bits._
 

common/src/test/scala/GamePacketTest.scala

@@ -2,7 +2,7 @@
 import java.net.{InetAddress, InetSocketAddress}
 
 import org.specs2.mutable._
-import psforever.net._
+import net.psforever.packet._
 import scodec.bits._
 
 class GamePacketTest extends Specification {

common/src/test/scala/PacketCodingTest.scala

@@ -1,6 +1,6 @@
 // Copyright (c) 2016 PSForever.net to present
 import org.specs2.mutable._
-import psforever.net._
+import net.psforever.packet._
 import scodec.bits._
 
 class PacketCodingTest extends Specification {

pslogin/src/main/scala/CryptoSessionActor.scala

@@ -2,9 +2,9 @@
 import java.net.{InetAddress, InetSocketAddress}
 
 import akka.actor.{Actor, ActorLogging, ActorRef, DiagnosticActorLogging, Identify, MDCContextAware}
-import psforever.crypto.CryptoInterface.{CryptoState, CryptoStateWithMAC}
+import net.psforever.crypto.CryptoInterface.{CryptoState, CryptoStateWithMAC}
-import psforever.crypto.CryptoInterface
+import net.psforever.crypto.CryptoInterface
-import psforever.net._
+import net.psforever.packet._
 import scodec.Attempt.{Failure, Successful}
 import scodec.bits._
 import scodec.{Attempt, Codec, Err}

pslogin/src/main/scala/LoginSessionActor.scala

@@ -2,7 +2,7 @@
 import java.net.{InetAddress, InetSocketAddress}
 
 import akka.actor.{Actor, ActorLogging, ActorRef, Identify, MDCContextAware}
-import psforever.net._
+import net.psforever.packet._
 import scodec.Attempt.{Failure, Successful}
 import scodec.bits._
 

pslogin/src/main/scala/PsLogin.scala

@@ -4,7 +4,7 @@ import ch.qos.logback.classic.LoggerContext
 import ch.qos.logback.core.status._
 import ch.qos.logback.core.util.StatusPrinter
 import com.typesafe.config.ConfigFactory
-import psforever.crypto.CryptoInterface
+import net.psforever.crypto.CryptoInterface
 import org.slf4j
 import org.fusesource.jansi.Ansi._
 import org.fusesource.jansi.Ansi.Color._

pslogin/src/main/scala/net/psforever/crypto/CryptoStateManager.scala

@@ -1,5 +1,5 @@
 // Copyright (c) 2016 PSForever.net to present
-package psforever.crypto
+package net.psforever.crypto
 
 import akka.actor.{Actor, ActorLogging, FSM}
 import akka.util.ByteString
@@ -22,7 +22,7 @@ class CryptoStateManager extends Actor with ActorLogging with FSM[CryptoState, C
 
   when(ClientStart()) {
     /*case Event(RawPacket(msg), _) => {
-      val decoded = Codec.decode[psforever.net.ClientStart](msg.bits)
+      val decoded = Codec.decode[net.psforever.net.ClientStart](msg.bits)
       try {
         val packet = decoded.require.value
         println("Got cNonce: " + packet.clientNonce)