PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-16 08:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

juggling addresses again

Browse source
This commit is contained in:
Fate-JH 2024-07-01 18:29:33 -04:00
parent 1beff98880
commit 8429ca9831
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
server/src/main/scala/net/psforever/server/Server.scala
View file

@ -82,11 +82,6 @@ object Server {
case Some(address) => InetAddress.getByName(address) // address from first argument
case None => InetAddress.getByName(Config.app.bind) // address from config
}
val publicAddress: InetAddress =
args.bind match {
case Some(address) => InetAddress.getByName(address) // address from first argument
case None => InetAddress.getByName(Config.app.public) // address from config
}
if (Config.app.kamon.enable) {
logger.info("Starting Kamon")
@ -142,7 +137,7 @@ object Server {
system.spawn(
SocketPane(Seq(
SocketSetup("login", SocketSetupInfo(bindAddress, Seq(Config.app.login.port), loginPlan)),
SocketSetup("world", SocketSetupInfo(publicAddress, Config.app.world.port +: Config.app.world.ports, sessionPlan))
SocketSetup("world", SocketSetupInfo(bindAddress, Config.app.world.port +: Config.app.world.ports, sessionPlan))
)),
name = SocketPane.SocketPaneKey.id
)

9
src/main/scala/net/psforever/actors/net/LoginActor.scala
View file

@ -27,6 +27,8 @@ import scala.concurrent.duration._
import scala.util.matching.Regex
import scala.util.{Failure, Success}
object LoginActor {
sealed trait Command
@ -56,7 +58,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
var port: Int = 0
val serverName: String = Config.app.world.serverName
val publicAddress = new InetSocketAddress(InetAddress.getByName(Config.app.public), Config.app.world.port)
val gameTestServerAddress = new InetSocketAddress(InetAddress.getByName(Config.app.public), Config.app.world.port)
private val bcryptRounds = 12
@ -87,7 +89,8 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
case packet: PlanetSideGamePacket =>
handleGamePkt(packet)
case SocketPane.NextPort(_, address, portNum) =>
case SocketPane.NextPort(_, _, portNum) =>
val address = gameTestServerAddress.getAddress
log.info(s"Connecting to ${address.getHostAddress.toLowerCase}: $portNum ...")
val response = ConnectToWorldMessage(serverName, address.getHostAddress, portNum)
middlewareActor ! MiddlewareActor.Send(response)
@ -441,7 +444,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
serverName,
WorldStatus.Up,
Config.app.world.serverType,
Vector(WorldConnectionInfo(publicAddress)), //todo ideally, ask for info from SocketPane
Vector(WorldConnectionInfo(gameTestServerAddress)), //todo ideally, ask for info from SocketPane
PlanetSideEmpire.VS
)
)