warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixes disconnect, and publishing to windows. (#114)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 01:43:53 -07:00 • committed by GitHub
parent cffb32d6ef
commit 63bf71ea47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 72 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Projects/Server/Network/TcpServer.cs
View file

@ -37,6 +37,8 @@ namespace Server.Network
// Make this thread safe
public static List<NetState> Instances { get; } = new List<NetState>();
private static IPAddress[] m_ListeningAddresses;
public static IWebHostBuilder CreateWebHostBuilder(string[] args = null) =>
WebHost.CreateDefaultBuilder(args)
.UseSetting(WebHostDefaults.SuppressStatusMessagesKey, "True")
@ -46,6 +48,7 @@ namespace Server.Network
foreach (var ipep in Listeners)
{
options.Listen(ipep, builder => { builder.UseConnectionHandler<ServerConnectionHandler>(); });
m_ListeningAddresses = GetListeningAddresses(ipep);
DisplayListener(ipep);
}
@ -54,23 +57,30 @@ namespace Server.Network
.UseLibuv()
.UseStartup<ServerStartup>();
public static IPAddress[] GetListeningAddresses(IPEndPoint ipep)
{
if (m_ListeningAddresses != null)
return m_ListeningAddresses;
var list = new List<IPAddress>();
foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces())
{
var properties = adapter.GetIPProperties();
foreach (var unicast in properties.UnicastAddresses)
if (ipep.AddressFamily == unicast.Address.AddressFamily)
list.Add(unicast.Address);
}
return list.ToArray();
}
private static void DisplayListener(IPEndPoint ipep)
{
if (ipep.Address.Equals(IPAddress.Any) || ipep.Address.Equals(IPAddress.IPv6Any))
{
var adapters = NetworkInterface.GetAllNetworkInterfaces();
foreach (var adapter in adapters)
{
var properties = adapter.GetIPProperties();
foreach (var unicast in properties.UnicastAddresses)
if (ipep.AddressFamily == unicast.Address.AddressFamily)
Console.WriteLine("Listening: {0}:{1}", unicast.Address, ipep.Port);
}
}
foreach (var ip in m_ListeningAddresses)
Console.WriteLine("Listening: {0}:{1}", ip, ipep.Port);
else
{
Console.WriteLine("Listening: {0}:{1}", ipep.Address, ipep.Port);
}
}
}
}