summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/extra/xmlrpc.cpp18
-rw-r--r--modules/rpc/jsonrpc.cpp18
-rw-r--r--modules/rpc/rpc_main.cpp50
3 files changed, 43 insertions, 43 deletions
diff --git a/modules/extra/xmlrpc.cpp b/modules/extra/xmlrpc.cpp
index cd51f5889..df566c0a4 100644
--- a/modules/extra/xmlrpc.cpp
+++ b/modules/extra/xmlrpc.cpp
@@ -19,11 +19,11 @@ template<class... Ts> struct overloaded : Ts... { using Ts::operator()...; };
template<class... Ts> overloaded(Ts...) -> overloaded<Ts...>;
class MyXMLRPCServiceInterface final
- : public RPCServiceInterface
+ : public RPC::ServiceInterface
, public HTTPPage
{
private:
- Anope::map<RPCEvent *> events;
+ Anope::map<RPC::Event *> events;
static void SendError(HTTPReply &reply, xmlrpc_env &env)
{
@@ -42,14 +42,14 @@ private:
xmlrpc_env_clean(&env);
}
- static void SerializeObject(xmlrpc_env &env, xmlrpc_value *value, const RPCBlock &block)
+ static void SerializeObject(xmlrpc_env &env, xmlrpc_value *value, const RPC::Block &block)
{
for (const auto &[k, v] : block.GetReplies())
{
xmlrpc_value *elem;
std::visit(overloaded
{
- [&env, &elem](const RPCBlock &b)
+ [&env, &elem](const RPC::Block &b)
{
elem = xmlrpc_struct_new(&env);
SerializeObject(env, elem, b);
@@ -97,17 +97,17 @@ private:
public:
MyXMLRPCServiceInterface(Module *creator, const Anope::string &sname)
- : RPCServiceInterface(creator, sname)
+ : RPC::ServiceInterface(creator, sname)
, HTTPPage("/xmlrpc", "text/xml")
{
}
- bool Register(RPCEvent *event) override
+ bool Register(RPC::Event *event) override
{
return this->events.emplace(event->GetEvent(), event).second;
}
- bool Unregister(RPCEvent *event) override
+ bool Unregister(RPC::Event *event) override
{
return this->events.erase(event->GetEvent()) != 0;
}
@@ -127,7 +127,7 @@ public:
return true;
}
- RPCRequest request(reply);
+ RPC::Request request(reply);
request.name = method;
delete method;
@@ -181,7 +181,7 @@ public:
return true;
}
- void Reply(RPCRequest &request) override
+ void Reply(RPC::Request &request) override
{
xmlrpc_env env;
xmlrpc_env_init(&env);
diff --git a/modules/rpc/jsonrpc.cpp b/modules/rpc/jsonrpc.cpp
index ab7617c4d..1b1c35a4d 100644
--- a/modules/rpc/jsonrpc.cpp
+++ b/modules/rpc/jsonrpc.cpp
@@ -22,11 +22,11 @@ inline Anope::string yyjson_get_astr(yyjson_val *val, const char *key)
}
class MyJSONRPCServiceInterface final
- : public RPCServiceInterface
+ : public RPC::ServiceInterface
, public HTTPPage
{
private:
- Anope::map<RPCEvent *> events;
+ Anope::map<RPC::Event *> events;
static void SendError(HTTPReply &reply, int64_t code, const Anope::string &message, const Anope::string &id)
{
@@ -59,7 +59,7 @@ private:
yyjson_mut_doc_free(doc);
}
- static void SerializeObject(yyjson_mut_doc *doc, yyjson_mut_val *root, const char *key, const RPCBlock &block)
+ static void SerializeObject(yyjson_mut_doc *doc, yyjson_mut_val *root, const char *key, const RPC::Block &block)
{
auto *result = yyjson_mut_obj(doc);
for (const auto &reply : block.GetReplies())
@@ -68,7 +68,7 @@ private:
const auto &k = reply.first;
std::visit(overloaded
{
- [&doc, &result, &k](const RPCBlock &b)
+ [&doc, &result, &k](const RPC::Block &b)
{
SerializeObject(doc, result, k.c_str(), b);
},
@@ -103,17 +103,17 @@ private:
public:
MyJSONRPCServiceInterface(Module *creator, const Anope::string &sname)
- : RPCServiceInterface(creator, sname)
+ : RPC::ServiceInterface(creator, sname)
, HTTPPage("/jsonrpc", "application/json")
{
}
- bool Register(RPCEvent *event) override
+ bool Register(RPC::Event *event) override
{
return this->events.emplace(event->GetEvent(), event).second;
}
- bool Unregister(RPCEvent *event) override
+ bool Unregister(RPC::Event *event) override
{
return this->events.erase(event->GetEvent()) != 0;
}
@@ -145,7 +145,7 @@ public:
return true;
}
- RPCRequest request(reply);
+ RPC::Request request(reply);
request.id = id;
request.name = yyjson_get_astr(root, "method");
@@ -174,7 +174,7 @@ public:
return true;
}
- void Reply(RPCRequest &request) override
+ void Reply(RPC::Request &request) override
{
if (request.GetError())
{
diff --git a/modules/rpc/rpc_main.cpp b/modules/rpc/rpc_main.cpp
index 012010fcc..8b6a1797e 100644
--- a/modules/rpc/rpc_main.cpp
+++ b/modules/rpc/rpc_main.cpp
@@ -14,14 +14,14 @@ static Module *me;
class RPCIdentifyRequest final
: public IdentifyRequest
{
- RPCRequest request;
+ RPC::Request request;
HTTPReply repl; /* Request holds a reference to the HTTPReply, because we might exist long enough to invalidate it
we'll copy it here then reset the reference before we use it */
Reference<HTTPClient> client;
- Reference<RPCServiceInterface> xinterface;
+ Reference<RPC::ServiceInterface> xinterface;
public:
- RPCIdentifyRequest(Module *m, RPCRequest &req, HTTPClient *c, RPCServiceInterface *iface, const Anope::string &acc, const Anope::string &pass)
+ RPCIdentifyRequest(Module *m, RPC::Request &req, HTTPClient *c, RPC::ServiceInterface *iface, const Anope::string &acc, const Anope::string &pass)
: IdentifyRequest(m, acc, pass)
, request(req)
, repl(request.reply)
@@ -58,15 +58,15 @@ public:
};
class CommandRPCEvent final
- : public RPCEvent
+ : public RPC::Event
{
public:
CommandRPCEvent()
- : RPCEvent("command")
+ : RPC::Event("command")
{
}
- bool Run(RPCServiceInterface *iface, HTTPClient *client, RPCRequest &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
Anope::string service = request.data.size() > 0 ? request.data[0] : "";
Anope::string user = request.data.size() > 1 ? request.data[1] : "";
@@ -115,15 +115,15 @@ public:
};
class CheckAuthenticationRPCEvent final
- : public RPCEvent
+ : public RPC::Event
{
public:
CheckAuthenticationRPCEvent()
- : RPCEvent("checkAuthentication")
+ : RPC::Event("checkAuthentication")
{
}
- bool Run(RPCServiceInterface *iface, HTTPClient *client, RPCRequest &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
Anope::string username = request.data.size() > 0 ? request.data[0] : "";
Anope::string password = request.data.size() > 1 ? request.data[1] : "";
@@ -142,15 +142,15 @@ public:
};
class StatsRPCEvent final
- : public RPCEvent
+ : public RPC::Event
{
public:
StatsRPCEvent()
- : RPCEvent("stats")
+ : RPC::Event("stats")
{
}
- bool Run(RPCServiceInterface *iface, HTTPClient *client, RPCRequest &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
request.ReplyInt("uptime", Anope::CurTime - Anope::StartTime);
request.Reply("uplinkname", Me->GetLinks().front()->GetName());
@@ -170,15 +170,15 @@ public:
};
class ChannelRPCEvent final
- : public RPCEvent
+ : public RPC::Event
{
public:
ChannelRPCEvent()
- : RPCEvent("channel")
+ : RPC::Event("channel")
{
}
- bool Run(RPCServiceInterface *iface, HTTPClient *client, RPCRequest &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
if (request.data.empty())
{
@@ -236,15 +236,15 @@ public:
};
class UserRPCEvent final
- : public RPCEvent
+ : public RPC::Event
{
public:
UserRPCEvent()
- : RPCEvent("user")
+ : RPC::Event("user")
{
}
- bool Run(RPCServiceInterface *iface, HTTPClient *client, RPCRequest &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
if (request.data.empty())
{
@@ -292,15 +292,15 @@ public:
};
class OpersRPCEvent final
- : public RPCEvent
+ : public RPC::Event
{
public:
OpersRPCEvent()
- : RPCEvent("opers")
+ : RPC::Event("opers")
{
}
- bool Run(RPCServiceInterface *iface, HTTPClient *client, RPCRequest &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
for (auto *ot : Config->MyOperTypes)
{
@@ -316,15 +316,15 @@ public:
};
class NoticeRPCEvent final
- : public RPCEvent
+ : public RPC::Event
{
public:
NoticeRPCEvent()
- : RPCEvent("notice")
+ : RPC::Event("notice")
{
}
- bool Run(RPCServiceInterface *iface, HTTPClient *client, RPCRequest &request) override
+ bool Run(RPC::ServiceInterface *iface, HTTPClient *client, RPC::Request &request) override
{
Anope::string from = request.data.size() > 0 ? request.data[0] : "";
Anope::string to = request.data.size() > 1 ? request.data[1] : "";
@@ -348,7 +348,7 @@ class ModuleRPCMain final
: public Module
{
private:
- ServiceReference<RPCServiceInterface> rpc;
+ ServiceReference<RPC::ServiceInterface> rpc;
CommandRPCEvent commandrpcevent;
CheckAuthenticationRPCEvent checkauthenticationrpcevent;
StatsRPCEvent statsrpcevent;
generated by cgit (git 2.34.1) at 2025-07-04 19:34:56 +0000