Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Important fixes for zonebuilder & filter servers on protocol

Browse Source
This commit is contained in:
Louvenarde 2024-01-31 20:53:41 +01:00
parent 197fe51a64
commit 0d222e30cf
3 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/Components/Modules/Node.cpp
View File

@ -342,12 +342,12 @@ namespace Components
for (const auto& nodeListData : nodeListReponseMessages)
{
Scheduler::Once([=]
{
{
#ifdef NODE_SYSTEM_DEBUG
Logger::Debug("Sending {} nodeListResponse length to {}\n", nodeListData.length(), address.getCString());
Logger::Debug("Sending {} nodeListResponse length to {}\n", nodeListData.length(), address.getCString());
#endif
Session::Send(address, "nodeListResponse", nodeListData);
}, Scheduler::Pipeline::MAIN, NODE_SEND_RATE * i++);
Session::Send(address, "nodeListResponse", nodeListData);
}, Scheduler::Pipeline::MAIN, NODE_SEND_RATE * i++);
}
}
@ -397,48 +397,54 @@ namespace Components
Node::Node()
{
if (ZoneBuilder::IsEnabled())
{
return;
}
net_natFix = Game::Dvar_RegisterBool("net_natFix", false, 0, "Fix node registration for certain firewalls/routers");
Scheduler::Loop([]
{
StoreNodes(false);
}, Scheduler::Pipeline::ASYNC, 5min);
{
StoreNodes(false);
}, Scheduler::Pipeline::ASYNC, 5min);
Scheduler::Loop(RunFrame, Scheduler::Pipeline::MAIN);
Session::Handle("nodeListResponse", HandleResponse);
Session::Handle("nodeListRequest", [](const Network::Address& address, [[maybe_unused]] const std::string& data)
{
SendList(address);
});
Scheduler::OnGameInitialized([]
{
Migrate();
LoadNodePreset();
LoadNodes();
}, Scheduler::Pipeline::MAIN);
{
Session::Handle("nodeListResponse", HandleResponse);
Session::Handle("nodeListRequest", [](const Network::Address& address, [[maybe_unused]] const std::string& data)
{
SendList(address);
});
Migrate();
LoadNodePreset();
LoadNodes();
}, Scheduler::Pipeline::MAIN);
Command::Add("listNodes", [](const Command::Params*)
{
Logger::Print("Nodes: {}\n", Nodes.size());
std::lock_guard _(Mutex);
for (const auto& node : Nodes)
{
Logger::Print("{}\t({})\n", node.address.getString(), node.isValid() ? "Valid" : "Invalid");
}
});
Logger::Print("Nodes: {}\n", Nodes.size());
std::lock_guard _(Mutex);
for (const auto& node : Nodes)
{
Logger::Print("{}\t({})\n", node.address.getString(), node.isValid() ? "Valid" : "Invalid");
}
});
Command::Add("addNode", [](const Command::Params* params)
{
if (params->size() < 2) return;
auto address = Network::Address{ params->get(1) };
if (address.isValid())
{
Add(address);
}
});
if (params->size() < 2) return;
auto address = Network::Address{ params->get(1) };
if (address.isValid())
{
Add(address);
}
});
}
void Node::preDestroy()

15
src/Components/Modules/ServerList.cpp
View File

@ -322,6 +322,19 @@ namespace Components
continue;
}
if (!entry.HasMember("ip") || !entry["protocol"].IsInt())
{
continue;
}
const auto protocol = entry["protocol"].GetInt();
if (protocol != PROTOCOL)
{
// We can't connect to it anyway
continue;
}
// Using VA because it's faster
Network::Address server(Utils::String::VA("%s:%u", entry["ip"].GetString(), entry["port"].GetInt()));
server.setType(Game::NA_IP); // Just making sure...
@ -371,7 +384,7 @@ namespace Components
Toast::Show("cardicon_headshot", "Server Browser", "Fetching servers...", 3000);
const auto* url = "http://iw4x.plutools.pw/v1/servers/iw4x";
const auto url = std::format("http://iw4x.plutools.pw/v1/servers/iw4x?protocol={}", PROTOCOL);
const auto reply = Utils::WebIO("IW4x", url).setTimeout(5000)->get();
if (reply.empty())
{

1
src/Components/Modules/ServerList.hpp
View File

@ -23,6 +23,7 @@ namespace Components
int ping;
int matchType;
int securityLevel;
int protocol;
bool hardcore;
bool svRunning;
bool aimassist;