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

fix: Fixes TCPServer accept async, makes Firewall/IP Limiter multithreaded (#2134)

Browse source
This commit is contained in:
Kamron Batman 2025-02-27 22:19:38 -08:00 • committed by GitHub
parent bcab91255a
commit 2a8c62e8be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 578 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Projects/UOContent/Gumps/AdminGump.cs
View file

@ -170,7 +170,7 @@ namespace Server.Gumps
AddLabel(150, 150, LabelHue, banned.ToString());
AddLabel(20, 170, LabelHue, "Firewalled:");
AddLabel(150, 170, LabelHue, Firewall.FirewallSet.Count.ToString());
AddLabel(150, 170, LabelHue, Firewall.FirewallSetCount.ToString());
AddLabel(20, 190, LabelHue, "Clients:");
AddLabel(150, 190, LabelHue, NetState.Instances.Count.ToString());
@ -1165,7 +1165,16 @@ namespace Server.Gumps
{
AddFirewallHeader();
m_List ??= Firewall.FirewallSet.ToList<object>();
if (m_List == null)
{
Firewall.ReadFirewallSet(firewallSet =>
{
list = new List<object>(firewallSet.Count);
list.AddRange(firewallSet);
});
m_List = list;
}
AddLabelCropped(12, 120, 358, 20, LabelHue, "IP Address");
@ -1178,7 +1187,7 @@ namespace Server.Gumps
AddImage(375, 122, 0x25EA);
}
if ((listPage + 1) * 12 < m_List.Count)
if ((listPage + 1) * 12 < m_List!.Count)
{
AddButton(392, 122, 0x15E1, 0x15E5, GetButtonID(1, 1));
}
@ -3470,19 +3479,22 @@ namespace Server.Gumps
if (string.IsNullOrEmpty(match))
{
notice = "You must enter a username to search.";
notice = "You must enter an IP to search.";
}
else
{
foreach (var check in Firewall.FirewallSet)
Firewall.ReadFirewallSet(firewallSet =>
{
var checkStr = check.ToString();
if (checkStr.ContainsOrdinal(match))
foreach (var check in firewallSet)
{
results.Add(check);
var checkStr = check.ToString();
if (checkStr.ContainsOrdinal(match))
{
results.Add(check);
}
}
}
});
}
if (results.Count == 1)