diff --git a/Source.Common/Networking/IConnectionlessPacketHandler.cs b/Source.Common/Networking/IConnectionlessPacketHandler.cs index 65773c4d..73386527 100644 --- a/Source.Common/Networking/IConnectionlessPacketHandler.cs +++ b/Source.Common/Networking/IConnectionlessPacketHandler.cs @@ -105,7 +105,7 @@ public class NetAddress public NetAddress Copy() => new() { Type = Type, - Endpoint = Endpoint + Endpoint = Endpoint == null ? null : new IPEndPoint(Endpoint.Address, Endpoint.Port) }; static char[][] renderBuffers; static int curRenderBuffer; @@ -236,10 +236,10 @@ public bool CompareAdr(NetAddress? a, bool onlyBase = false) { } public void SetIP(uint v) { - IP = new(v); + IP = new(System.Buffers.Binary.BinaryPrimitives.ReverseEndianness(v)); } public void SetIP(uint v, ushort port) { - IP = new(v); + SetIP(v); Port = port; } } diff --git a/Source.Engine/GarrysMod/Get.cs b/Source.Engine/GarrysMod/Get.cs index 30979706..bc043bf3 100644 --- a/Source.Engine/GarrysMod/Get.cs +++ b/Source.Engine/GarrysMod/Get.cs @@ -207,7 +207,7 @@ public void ShutDown() { public void RunSteamCallbacks() { if (IsDedicatedServer()) - SteamGameServer_RunCallbacks(); + Steamworks.GameServer.RunCallbacks(); else SteamAPI.RunCallbacks(); } diff --git a/Source.Engine/Net.cs b/Source.Engine/Net.cs index 68436c18..54152340 100644 --- a/Source.Engine/Net.cs +++ b/Source.Engine/Net.cs @@ -918,6 +918,14 @@ bool OpenSocketInternal(NetSocketType module, int setPort, int defaultPort, stri public void Init(bool isDedicated) { Time = 0; + ICommandLine commandLine = Singleton(); + int port = commandLine.ParmValue("-port", -1); + if (port == -1) + port = commandLine.ParmValue("+port", -1); + + if (port != -1) + hostport.SetValue(port); + NetSockets.EnsureCount(NetSocket.MAX); NetPackets.EnsureCount(NetSocket.MAX); SplitPackets.EnsureCount(NetSocket.MAX); diff --git a/Source.Engine/Server/BaseServer.cs b/Source.Engine/Server/BaseServer.cs index 153f0d99..3f1f4779 100644 --- a/Source.Engine/Server/BaseServer.cs +++ b/Source.Engine/Server/BaseServer.cs @@ -609,12 +609,12 @@ public virtual bool ProcessConnectionlessPacket(NetPacket packet) { if (!QueryRateChecker.CheckIP(packet.From)) return false; - if (Steam3Server().SteamGameServer() != null) { + if (Steam3Server().SteamGameServer() != null && Steam3Server().IsMasterServerUpdaterSharingGameSocket()) { SteamGameServer.HandleIncomingPacket( packet.Message.GetData(), packet.Message.BytesAvailable, - (uint)packet.From.Endpoint!.AddressFamily, - (ushort)packet.From.Endpoint!.Port + packet.From.GetIPHostByteOrder(), + (ushort)packet.From.GetPort() ); ForwardPacketsFromMasterServerUpdater(); @@ -1470,6 +1470,7 @@ protected void ForwardPacketsFromMasterServerUpdater() { // Send this packet for them.. adr.SetIP(netadrAddress, netadrPort); + adr.Type = NetAddressType.IP; Net.SendPacket(null!, Socket, adr, packetData, len); } } diff --git a/Source.Engine/Server/SteamAuth.cs b/Source.Engine/Server/SteamAuth.cs index 174e70eb..526a9e7e 100644 --- a/Source.Engine/Server/SteamAuth.cs +++ b/Source.Engine/Server/SteamAuth.cs @@ -103,6 +103,13 @@ public EServerMode GetCurrentServerMode() { return EServerMode.eServerModeAuthenticationAndSecure; } + const ushort MASTERSERVERUPDATERPORT_USEGAMESOCKETSHARE = 0xFFFF; + + static readonly ConVar sv_master_share_game_socket = new("sv_master_share_game_socket", "1", 0, "Use the game's socket to communicate to the master server. If this is 0, then it will create a socket on -steamport + 1 to communicate to the master server on."); + + public ushort GetQueryPort() => QueryPort; + public bool IsMasterServerUpdaterSharingGameSocket() => MasterServerUpdaterSharingGameSocket; + public bool BSecure() => SteamGameServer()?.BSecure() ?? false; public bool BIsActive() => SteamGameServer() != null && (ServerMode >= EServerMode.eServerModeNoAuthentication); public bool BLanOnly() => ServerMode == EServerMode.eServerModeNoAuthentication; @@ -131,6 +138,21 @@ public void Activate(ServerType serverType) { if (serverType == ServerType.Normal) gamePort = (ushort)Net.GetUDPPort(NetSocketType.Server); + ushort masterServerUpdaterPort; + if (sv_master_share_game_socket.GetBool()) { + MasterServerUpdaterSharingGameSocket = true; + masterServerUpdaterPort = MASTERSERVERUPDATERPORT_USEGAMESOCKETSHARE; + if (serverType == ServerType.TVRelay) + QueryPort = (ushort)Net.GetUDPPort(NetSocketType.HLTV); + else + QueryPort = gamePort; + } + else { + MasterServerUpdaterSharingGameSocket = false; + masterServerUpdaterPort = Port; + QueryPort = Port; + } + switch (ServerMode) { case EServerMode.eServerModeNoAuthentication: Msg("Initializing Steam libraries for LAN server\n"); @@ -147,7 +169,7 @@ public void Activate(ServerType serverType) { break; } - Steamworks.GameServer.Init(IP, gamePort, (ushort)(Port + 1), ServerMode, GetSteamInfIDVersionInfo().PatchVersion); + Steamworks.GameServer.Init(IP, gamePort, masterServerUpdaterPort, ServerMode, GetSteamInfIDVersionInfo().PatchVersion); if (!Init()) { Assert(false); @@ -524,7 +546,7 @@ public void RunFrame() { double CurTime = Platform.Time; if (CurTime - LastRunCallback > 0.1f) { LastRunCallback = CurTime; - SteamGameServer_RunCallbacks(); + Steamworks.GameServer.RunCallbacks(); } }