pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-01 22:46:39 +02:00
Code Activity

Rework how the RPC interface stores its events.

Browse Source
This commit is contained in:
Sadie Powell
2025-02-18 17:01:33 +00:00
parent 98320d130f
commit 3c55fbe650
4 changed files with 155 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/extra/xmlrpc.cpp
+20 -27
View File
@@ -20,7 +20,7 @@ class MyXMLRPCServiceInterface final
, public HTTPPage
{
private:
std::deque<RPCEvent *> events;
Anope::map<RPCEvent *> events;
void SendError(HTTPReply &reply, xmlrpc_env &env)
{
@@ -46,17 +46,14 @@ public:
{
}
void Register(RPCEvent *event) override
bool Register(RPCEvent *event) override
{
this->events.push_back(event);
return this->events.emplace(event->GetEvent(), event).second;
}
void Unregister(RPCEvent *event) override
bool Unregister(RPCEvent *event) override
{
std::deque<RPCEvent *>::iterator it = std::find(this->events.begin(), this->events.end(), event);
if (it != this->events.end())
this->events.erase(it);
return this->events.erase(event->GetEvent()) != 0;
}
bool OnRequest(HTTPProvider *provider, const Anope::string &page_name, HTTPClient *client, HTTPMessage &message, HTTPReply &reply) override
@@ -79,6 +76,14 @@ public:
request.name = method;
delete method;
auto event = this->events.find(request.name);
if (event == this->events.end())
{
xmlrpc_env_set_fault(&env, -32601, "Method not found");
SendError(reply, env);
return true;
}
auto paramcount = xmlrpc_array_size(&env, params);
for (auto idx = 0; idx < paramcount; ++idx)
{
@@ -113,28 +118,16 @@ public:
}
xmlrpc_DECREF(params);
for (auto *e : this->events)
event->second->Run(this, client, request);
if (request.GetError())
{
if (!e->Run(this, client, request))
return false;
if (request.GetError())
{
xmlrpc_env_set_fault(&env, request.GetError()->first, request.GetError()->second.c_str());
SendError(reply, env);
return true;
}
if (!request.GetReplies().empty())
{
this->Reply(request);
return true;
}
xmlrpc_env_set_fault(&env, request.GetError()->first, request.GetError()->second.c_str());
SendError(reply, env);
return true;
}
// If we reached this point nobody handled the event.
xmlrpc_env_set_fault(&env, -32601, "Method not found");
SendError(reply, env);
this->Reply(request);
return true;
}