PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-12 15:04:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix failure to connect to world on routers that lack Hairpin NAT support when connecting from the same network.

Browse source
This commit is contained in:
Subsonic154 2026-03-10 05:03:53 -04:00
parent 697547da25
commit 568c968c4e
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/resources/application.conf
View file

@ -4,6 +4,9 @@ bind = 127.0.0.1
# The public host name or IP address. Used to forward clients from the login # The public host name or IP address. Used to forward clients from the login
# server to the world server. The default value will only allow local connections. # server to the world server. The default value will only allow local connections.
# If you encounter issues trying to connect to the world from machines on the same network (or the same machine when this is not the default value)
# when hosting a public server with a router that lacks Hairpin NAT support, make sure the hosts file on this system
# has the host name of the system set to resolve to it's local IP address on the network.
public = 127.0.0.1 public = 127.0.0.1
# Login server configuration # Login server configuration

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

@ -97,6 +97,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
private val serverName: String = Config.app.world.serverName private val serverName: String = Config.app.world.serverName
private val gameTestServerAddress = new InetSocketAddress(InetAddress.getByName(Config.app.public), Config.app.world.port) private val gameTestServerAddress = new InetSocketAddress(InetAddress.getByName(Config.app.public), Config.app.world.port)
private val localHost: InetAddress = InetAddress.getLocalHost
private val bcryptRounds = 12 private val bcryptRounds = 12
@ -152,7 +153,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
updateServerList() updateServerList()
case SocketPane.NextPort(_, _, portNum) => case SocketPane.NextPort(_, _, portNum) =>
val address = gameTestServerAddress.getAddress.getHostAddress val address = if (ipAddress == "127.0.0.1") ipAddress else if (ipAddress.startsWith("192.168")) localHost.getHostAddress else gameTestServerAddress.getAddress.getHostAddress
log.info(s"Connecting to ${address.toLowerCase}: $portNum ...") log.info(s"Connecting to ${address.toLowerCase}: $portNum ...")
val response = ConnectToWorldMessage(serverName, address, portNum) val response = ConnectToWorldMessage(serverName, address, portNum)
context.become(idlingBehavior) context.become(idlingBehavior)
@ -165,7 +166,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
private def waitingForServerTransferBehavior: Receive = persistentSetupMixinBehavior.orElse { private def waitingForServerTransferBehavior: Receive = persistentSetupMixinBehavior.orElse {
case SocketPane.NextPort(_, _, portNum) => case SocketPane.NextPort(_, _, portNum) =>
val address = gameTestServerAddress.getAddress.getHostAddress val address = if (ipAddress == "127.0.0.1") ipAddress else if (ipAddress.startsWith("192.168")) localHost.getHostAddress else gameTestServerAddress.getAddress.getHostAddress
log.info(s"Connecting to ${address.toLowerCase}: $portNum ...") log.info(s"Connecting to ${address.toLowerCase}: $portNum ...")
val response = ConnectToWorldMessage(serverName, address, portNum) val response = ConnectToWorldMessage(serverName, address, portNum)
context.become(idlingBehavior) context.become(idlingBehavior)