Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed custom ipv4. Small changes

Browse Source
This commit is contained in:
EntenKoeniq
2022-04-19 03:38:48 +02:00
parent 406248a05f
commit e8c376154a
2 changed files with 55 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
Server/Server.cs
View File

@ -8,18 +8,10 @@ using System.Reflection;
using System.IO; using System.IO;
using System.Net.Http; using System.Net.Http;
using Newtonsoft.Json;
using Lidgren.Network; using Lidgren.Network;
namespace CoopServer namespace CoopServer
{ {
internal class IpInfo
{
[JsonProperty("country")]
public string Country { get; set; }
}
internal class Server internal class Server
{ {
private static readonly string _compatibleVersion = "V1_4"; private static readonly string _compatibleVersion = "V1_4";
@ -39,18 +31,8 @@ namespace CoopServer
public Server() public Server()
{ {
if (IPAddress.TryParse(MainSettings.Address, out IPAddress parsedAddress) == false)
{
throw new Exception($"Something went wrong while parsing IP {MainSettings.Address}!");
}
if (parsedAddress.AddressFamily != System.Net.Sockets.AddressFamily.InterNetwork)
{
throw new Exception("Please use a valid IPv4 address!");
}
Logging.Info("================"); Logging.Info("================");
Logging.Info($"Server bound to: {MainSettings.Address}:{MainSettings.Port}"); Logging.Info($"Server bound to: 0.0.0.0:{MainSettings.Port}");
Logging.Info($"Server version: {Assembly.GetCallingAssembly().GetName().Version}"); Logging.Info($"Server version: {Assembly.GetCallingAssembly().GetName().Version}");
Logging.Info($"Compatible RAGECOOP versions: {_compatibleVersion.Replace('_', '.')}.x"); Logging.Info($"Compatible RAGECOOP versions: {_compatibleVersion.Replace('_', '.')}.x");
Logging.Info("================"); Logging.Info("================");
@ -58,8 +40,6 @@ namespace CoopServer
// 623c92c287cc392406e7aaaac1c0f3b0 = RAGECOOP // 623c92c287cc392406e7aaaac1c0f3b0 = RAGECOOP
NetPeerConfiguration config = new("623c92c287cc392406e7aaaac1c0f3b0") NetPeerConfiguration config = new("623c92c287cc392406e7aaaac1c0f3b0")
{ {
LocalAddress = parsedAddress,
BroadcastAddress = parsedAddress,
Port = MainSettings.Port, Port = MainSettings.Port,
MaximumConnections = MainSettings.MaxPlayers, MaximumConnections = MainSettings.MaxPlayers,
EnableUPnP = MainSettings.UPnP EnableUPnP = MainSettings.UPnP
@ -91,92 +71,78 @@ namespace CoopServer
if (MainSettings.AnnounceSelf) if (MainSettings.AnnounceSelf)
{ {
Logging.Info("Announcing to master server..."); Logging.Info("Announcing to master server...");
if (new string[5] { "127.0.0.1", "192.168.", "0.0.0.0", "1.1.1.1", "1.2.3.4" }.Any(el => MainSettings.Address.Contains(el, StringComparison.CurrentCultureIgnoreCase))) #region -- MASTERSERVER --
new Thread(async () =>
{ {
Logging.Error($"Announcing to the master server failed because this is not a public address!"); try
}
else
{
#region -- MASTERSERVER --
new Thread(async () =>
{ {
try // TLS only
ServicePointManager.Expect100Continue = true;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls13 | SecurityProtocolType.Tls12;
ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
HttpClient httpClient = new();
while (!Program.ReadyToStop)
{ {
// TLS only string msg =
ServicePointManager.Expect100Continue = true; "{ " +
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls13 | SecurityProtocolType.Tls12; "\"port\": \"" + MainSettings.Port + "\", " +
ServicePointManager.ServerCertificateValidationCallback = delegate { return true; }; "\"name\": \"" + MainSettings.Name + "\", " +
"\"version\": \"" + _compatibleVersion.Replace("_", ".") + "\", " +
HttpClient httpClient = new(); "\"players\": \"" + MainNetServer.ConnectionsCount + "\", " +
"\"maxPlayers\": \"" + MainSettings.MaxPlayers + "\", " +
IpInfo info; "\"allowlist\": \"" + _mainAllowlist.Username.Any() + "\", " +
"\"mods\": \"" + MainSettings.ModsAllowed + "\", " +
"\"npcs\": \"" + MainSettings.NpcsAllowed + "\"" +
" }";
HttpResponseMessage response = null;
try try
{ {
string data = await httpClient.GetStringAsync("https://ipinfo.io/json"); response = await httpClient.PostAsync(MainSettings.MasterServer, new StringContent(msg, Encoding.UTF8, "application/json"));
info = JsonConvert.DeserializeObject<IpInfo>(data);
} }
catch catch (Exception ex)
{ {
info = new() { Country = "?" }; Logging.Error($"MasterServer: {ex.Message}");
// Sleep for 5s
Thread.Sleep(5000);
continue;
} }
while (!Program.ReadyToStop) if (response == null)
{ {
string msg = Logging.Error("MasterServer: Something went wrong!");
"{ " + }
"\"address\": \"" + MainSettings.Address + "\", " + else if (response.StatusCode != HttpStatusCode.OK)
"\"port\": \"" + MainSettings.Port + "\", " + {
"\"name\": \"" + MainSettings.Name + "\", " + if (response.StatusCode == HttpStatusCode.BadRequest)
"\"version\": \"" + _compatibleVersion.Replace("_", ".") + "\", " +
"\"players\": \"" + MainNetServer.ConnectionsCount + "\", " +
"\"maxPlayers\": \"" + MainSettings.MaxPlayers + "\", " +
"\"allowlist\": \"" + _mainAllowlist.Username.Any() + "\", " +
"\"mods\": \"" + MainSettings.ModsAllowed + "\", " +
"\"npcs\": \"" + MainSettings.NpcsAllowed + "\", " +
"\"country\": \"" + info.Country + "\"" +
" }";
HttpResponseMessage response = null;
try
{ {
response = await httpClient.PostAsync(MainSettings.MasterServer, new StringContent(msg, Encoding.UTF8, "application/json")); string requestContent = await response.Content.ReadAsStringAsync();
Logging.Error($"MasterServer: [{(int)response.StatusCode}], {requestContent}");
} }
catch (Exception ex) else
{
Logging.Error($"MasterServer: {ex.Message}");
// Sleep for 5s
Thread.Sleep(5000);
continue;
}
if (response == null)
{
Logging.Error("MasterServer: Something went wrong!");
}
else if (response.StatusCode != System.Net.HttpStatusCode.OK)
{ {
Logging.Error($"MasterServer: [{(int)response.StatusCode}]"); Logging.Error($"MasterServer: [{(int)response.StatusCode}]");
} }
// Sleep for 10s
Thread.Sleep(10000);
} }
// Sleep for 10s
Thread.Sleep(10000);
} }
catch (HttpRequestException ex) }
{ catch (HttpRequestException ex)
Logging.Error($"MasterServer: {ex.InnerException.Message}"); {
} Logging.Error($"MasterServer: {ex.InnerException.Message}");
catch (Exception ex) }
{ catch (Exception ex)
Logging.Error($"MasterServer: {ex.Message}"); {
} Logging.Error($"MasterServer: {ex.Message}");
}).Start(); }
#endregion }).Start();
} #endregion
} }
if (!string.IsNullOrEmpty(MainSettings.Resource)) if (!string.IsNullOrEmpty(MainSettings.Resource))

1
Server/Settings.cs
View File

@ -2,7 +2,6 @@
{ {
public class Settings public class Settings
{ {
public string Address { get; set; } = "127.0.0.1";
public int Port { get; set; } = 4499; public int Port { get; set; } = 4499;
public int MaxPlayers { get; set; } = 16; public int MaxPlayers { get; set; } = 16;
public int MaxLatency { get; set; } = 300; public int MaxLatency { get; set; } = 300;