Refactor port binding, warning not yet tested fully

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 83b88b2fa32bb9b43e6d45dc6d9775e0226bc3fa..0acc3683c04efcca08eda73330c03607a4c15749 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -104,11 +104,11 @@ std::string Event::GetEventID()
                Module::Module(InspIRCd* Me) : ServerInstance(Me) { }
                Module::~Module() { }
 void           Module::OnUserConnect(userrec* user) { }
-void           Module::OnUserQuit(userrec* user, const std::string& message) { }
+void           Module::OnUserQuit(userrec* user, const std::string& message, const std::string &oper_message) { }
 void           Module::OnUserDisconnect(userrec* user) { }
-void           Module::OnUserJoin(userrec* user, chanrec* channel) { }
+void           Module::OnUserJoin(userrec* user, chanrec* channel, bool &silent) { }
 void           Module::OnPostJoin(userrec* user, chanrec* channel) { }
-void           Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) { }
+void           Module::OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { }
 void           Module::OnRehash(userrec* user, const std::string &parameter) { }
 void           Module::OnServerRaw(std::string &raw, bool inbound, userrec* user) { }
 int            Module::OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { return 0; }
@@ -134,7 +134,7 @@ void                Module::OnPostCommand(const std::string &command, const char** parameters,
 bool           Module::OnCheckReady(userrec* user) { return true; };
 int            Module::OnUserRegister(userrec* user) { return 0; };
 int            Module::OnUserPreKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { return 0; };
-void           Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) { };
+void           Module::OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) { };
 int            Module::OnCheckInvite(userrec* user, chanrec* chan) { return 0; };
 int            Module::OnCheckKey(userrec* user, chanrec* chan, const std::string &keygiven) { return 0; };
 int            Module::OnCheckLimit(userrec* user, chanrec* chan) { return 0; };
@@ -164,9 +164,9 @@ void                Module::OnGetServerDescription(const std::string &servername,std::string &
 void           Module::OnSyncUser(userrec* user, Module* proto, void* opaque) { };
 void           Module::OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { };
 void           Module::ProtoSendMode(void* opaque, int target_type, void* target, const std::string &modeline) { };
-void           Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname) { };
-void           Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname) { };
-void           Module::OnSyncOtherMetaData(Module* proto, void* opaque) { };
+void           Module::OnSyncChannelMetaData(chanrec* chan, Module* proto,void* opaque, const std::string &extname, bool displayable) { };
+void           Module::OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable) { };
+void           Module::OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable) { };
 void           Module::OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) { };
 void           Module::ProtoSendMetaData(void* opaque, int target_type, void* target, const std::string &extname, const std::string &extdata) { };
 void           Module::OnWallops(userrec* user, const std::string &text) { };
@@ -188,10 +188,11 @@ void              Module::OnChannelDelete(chanrec* chan) { };
 Priority       Module::Prioritize() { return PRIORITY_DONTCARE; }
 void           Module::OnSetAway(userrec* user) { };
 void           Module::OnCancelAway(userrec* user) { };
-int            Module::OnUserList(userrec* user, chanrec* Ptr) { return 0; };
+int            Module::OnUserList(userrec* user, chanrec* Ptr, CUList* &userlist) { return 0; };
 int            Module::OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) { return 0; };
 void           Module::OnBuildExemptList(MessageType message_type, chanrec* chan, userrec* sender, char status, CUList &exempt_list) { };
 void           Module::OnGarbageCollect() { };
+void           Module::OnBufferFlushed(userrec* user) { };
 
 long InspIRCd::PriorityAfter(const std::string &modulename)
 {
@@ -449,56 +450,14 @@ bool InspIRCd::AddResolver(Resolver* r, bool cached)
 
 bool InspIRCd::UserToPseudo(userrec* user, const std::string &message)
 {
-       unsigned int old_fd = user->GetFd();
-       user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,message.c_str());
-       user->FlushWriteBuf();
-       user->ClearBuffer();
-       user->SetFd(FD_MAGIC_NUMBER);
-
-       if (find(local_users.begin(),local_users.end(),user) != local_users.end())
-       {
-               local_users.erase(find(local_users.begin(),local_users.end(),user));
-       }
-
-       this->SE->DelFd(user);
-       shutdown(old_fd,2);
-       close(old_fd);
-       return true;
+       throw CoreException("The InspIRCd::UsertoPseudo function should not be used in InspIRCd later than 1.0.x");
+       return false;
 }
 
 bool InspIRCd::PseudoToUser(userrec* alive, userrec* zombie, const std::string &message)
 {
-       zombie->SetFd(alive->GetFd());
-       FOREACH_MOD_I(this,I_OnUserQuit,OnUserQuit(alive,message));
-       alive->SetFd(FD_MAGIC_NUMBER);
-       alive->FlushWriteBuf();
-       alive->ClearBuffer();
-       // save these for later
-       std::string oldnick = alive->nick;
-       std::string oldhost = alive->host;
-       std::string oldident = alive->ident;
-       userrec::QuitUser(this,alive,message.c_str());
-       if (find(local_users.begin(),local_users.end(),alive) != local_users.end())
-       {
-               local_users.erase(find(local_users.begin(),local_users.end(),alive));
-       }
-       // Fix by brain - cant write the user until their fd table entry is updated
-       zombie->Write(":%s!%s@%s NICK %s",oldnick.c_str(),oldident.c_str(),oldhost.c_str(),zombie->nick);
-       for (UCListIter i = zombie->chans.begin(); i != zombie->chans.end(); i++)
-       {
-               chanrec* Ptr = i->first;
-               zombie->WriteFrom(zombie,"JOIN %s",Ptr->name);
-               if (Ptr->topicset)
-               {
-                       zombie->WriteServ("332 %s %s :%s", zombie->nick, Ptr->name, Ptr->topic);
-                       zombie->WriteServ("333 %s %s %s %d", zombie->nick, Ptr->name, Ptr->setby, Ptr->topicset);
-               }
-               Ptr->UserList(zombie);
-               zombie->WriteServ("366 %s %s :End of /NAMES list.", zombie->nick, Ptr->name);
-       }
-       if ((find(local_users.begin(),local_users.end(),zombie) == local_users.end()) && (zombie->GetFd() != FD_MAGIC_NUMBER))
-               local_users.push_back(zombie);
-       return true;
+       throw CoreException("The InspIRCd::PseudotoUser function should not be used in InspIRCd later than 1.0.x");
+       return false;
 }
 
 void InspIRCd::AddGLine(long duration, const std::string &source, const std::string &reason, const std::string &hostmask)