Add basic stuff for protocol interface and implement a couple of the methods. It...

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / main.cpp

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 27179ad4999e0779bd2e8438b1cfea10bb0f0e78..e5c7518e784e53f5f2abfedac472c61277640a4b 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -30,8 +30,9 @@
 #include "m_spanningtree/treesocket.h"
 #include "m_spanningtree/rconnect.h"
 #include "m_spanningtree/rsquit.h"
+#include "m_spanningtree/protocolinterface.h"
 
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h */
+/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h m_spanningtree/rconnect.h m_spanningtree/rsquit.h m_spanningtree/protocolinterface.h */
 
 ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
        : Module(Me), max_local(0), max_global(0)
@@ -52,9 +53,12 @@ ModuleSpanningTree::ModuleSpanningTree(InspIRCd* Me)
                I_OnUserJoin, I_OnChangeHost, I_OnChangeName, I_OnUserPart, I_OnPostConnect,
                I_OnUserQuit, I_OnUserPostNick, I_OnUserKick, I_OnRemoteKill, I_OnRehash,
                I_OnOper, I_OnAddLine, I_OnDelLine, I_ProtoSendMode, I_OnMode,
-               I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnCancelAway, I_OnPostCommand
+               I_OnStats, I_ProtoSendMetaData, I_OnEvent, I_OnSetAway, I_OnPostCommand
        };
-       ServerInstance->Modules->Attach(eventlist, this, 29);
+       ServerInstance->Modules->Attach(eventlist, this, 28);
+
+       delete ServerInstance->PI;
+       ServerInstance->PI = new SpanningTreeProtocolInterface(this, Utils, ServerInstance);
 
        for (std::vector<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
        {
@@ -90,7 +94,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
        else if ((Current->Hidden) && (!IS_OPER(user)))
                return;
 
-       user->WriteServ("364 %s %s %s :%d %s",  user->nick,Current->GetName().c_str(),
+       user->WriteNumeric(364, "%s %s %s :%d %s",      user->nick,Current->GetName().c_str(),
                        (Utils->FlatLinks && (!IS_OPER(user))) ? ServerInstance->Config->ServerName : Parent.c_str(),
                        (Utils->FlatLinks && (!IS_OPER(user))) ? 0 : hops,
                        Current->GetDesc().c_str());
@@ -109,7 +113,7 @@ int ModuleSpanningTree::CountServs()
 void ModuleSpanningTree::HandleLinks(const char* const* parameters, int pcnt, User* user)
 {
        ShowLinks(Utils->TreeRoot,user,0);
-       user->WriteServ("365 %s * :End of /LINKS list.",user->nick);
+       user->WriteNumeric(365, "%s * :End of /LINKS list.",user->nick);
        return;
 }
 
@@ -141,23 +145,23 @@ void ModuleSpanningTree::HandleLusers(const char* const* parameters, int pcnt, U
                        }
                }
        }
-       user->WriteServ("251 %s :There are %d users and %d invisible on %d servers",user->nick,
+       user->WriteNumeric(251, "%s :There are %d users and %d invisible on %d servers",user->nick,
                        n_users-ServerInstance->Users->ModeCount('i'),
                        ServerInstance->Users->ModeCount('i'),
                        ulined_count ? this->CountServs() - ulined_count : this->CountServs());
 
        if (ServerInstance->Users->OperCount())
-               user->WriteServ("252 %s %d :operator(s) online",user->nick,ServerInstance->Users->OperCount());
+               user->WriteNumeric(252, "%s %d :operator(s) online",user->nick,ServerInstance->Users->OperCount());
 
        if (ServerInstance->Users->UnregisteredUserCount())
-               user->WriteServ("253 %s %d :unknown connections",user->nick,ServerInstance->Users->UnregisteredUserCount());
+               user->WriteNumeric(253, "%s %d :unknown connections",user->nick,ServerInstance->Users->UnregisteredUserCount());
        
        if (ServerInstance->ChannelCount())
-               user->WriteServ("254 %s %d :channels formed",user->nick,ServerInstance->ChannelCount());
+               user->WriteNumeric(254, "%s %ld :channels formed",user->nick,ServerInstance->ChannelCount());
        
-       user->WriteServ("255 %s :I have %d clients and %d servers",user->nick,ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
-       user->WriteServ("265 %s :Current Local Users: %d  Max: %d",user->nick,ServerInstance->Users->LocalUserCount(),max_local);
-       user->WriteServ("266 %s :Current Global Users: %d  Max: %d",user->nick,n_users,max_global);
+       user->WriteNumeric(255, "%s :I have %d clients and %d servers",user->nick,ServerInstance->Users->LocalUserCount(),ulined_local_count ? this->CountLocalServs() - ulined_local_count : this->CountLocalServs());
+       user->WriteNumeric(265, "%s :Current Local Users: %d  Max: %d",user->nick,ServerInstance->Users->LocalUserCount(),max_local);
+       user->WriteNumeric(266, "%s :Current Global Users: %d  Max: %d",user->nick,n_users,max_global);
        return;
 }
 
@@ -321,7 +325,7 @@ int ModuleSpanningTree::HandleVersion(const char* const* parameters, int pcnt, U
        if (found)
        {
                std::string Version = found->GetVersion();
-               user->WriteServ("351 %s :%s",user->nick,Version.c_str());
+               user->WriteNumeric(351, "%s :%s",user->nick,Version.c_str());
                if (found == Utils->TreeRoot)
                {
                        ServerInstance->Config->Send005(user);
@@ -329,7 +333,7 @@ int ModuleSpanningTree::HandleVersion(const char* const* parameters, int pcnt, U
        }
        else
        {
-               user->WriteServ("402 %s %s :No such server",user->nick,parameters[0]);
+               user->WriteNumeric(402, "%s %s :No such server",user->nick,parameters[0]);
        }
        return 1;
 }
@@ -817,24 +821,25 @@ void ModuleSpanningTree::OnMode(User* user, void* dest, int target_type, const s
        }
 }
 
-void ModuleSpanningTree::OnSetAway(User* user)
+int ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
 {
        if (IS_LOCAL(user))
        {
-               std::deque<std::string> params;
-               params.push_back(":"+std::string(user->awaymsg));
-               Utils->DoOneToMany(user->uuid,"AWAY",params);
+               if (awaymsg.empty())
+               {
+                       std::deque<std::string> params;
+                       params.clear();
+                       Utils->DoOneToMany(user->uuid,"AWAY",params);
+               }
+               else
+               {
+                       std::deque<std::string> params;
+                       params.push_back(":" + awaymsg);
+                       Utils->DoOneToMany(user->uuid,"AWAY",params);
+               }
        }
-}
 
-void ModuleSpanningTree::OnCancelAway(User* user)
-{
-       if (IS_LOCAL(user))
-       {
-               std::deque<std::string> params;
-               params.clear();
-               Utils->DoOneToMany(user->uuid,"AWAY",params);
-       }
+       return 0;
 }
 
 void ModuleSpanningTree::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline)
@@ -989,6 +994,9 @@ void ModuleSpanningTree::OnEvent(Event* event)
 ModuleSpanningTree::~ModuleSpanningTree()
 {
        /* This will also free the listeners */
+       delete ServerInstance->PI;
+       ServerInstance->PI = new ProtocolInterface(ServerInstance);
+
        delete Utils;
 
        ServerInstance->Timers->DelTimer(RefreshTimer);
@@ -998,7 +1006,7 @@ ModuleSpanningTree::~ModuleSpanningTree()
 
 Version ModuleSpanningTree::GetVersion()
 {
-       return Version(1,1,0,2,VF_VENDOR,API_VERSION);
+       return Version(1,2,0,2,VF_VENDOR,API_VERSION);
 }
 
 /* It is IMPORTANT that m_spanningtree is the last module in the chain