]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/channels.cpp
Fix passing wrong instance to resolver
[user/henk/code/inspircd.git] / src / channels.cpp
index caae1a714ed4020dc29d0eebc90b21eb18093127..d50841de7e7e0858d96c73a56556072ca0341ae5 100644 (file)
@@ -21,6 +21,7 @@ using namespace std;
 #include <sstream>
 #include <vector>
 #include <deque>
+#include <stdarg.h>
 #include "configreader.h"
 #include "inspircd.h"
 #include "hash_map.h"
@@ -38,15 +39,12 @@ using namespace std;
 #include "helperfuncs.h"
 #include "typedefs.h"
 
-extern ServerConfig* Config;
-
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
 extern time_t TIME;
-extern chan_hash chanlist;
 
-chanrec::chanrec()
+chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
 {
        *name = *topic = *setby = *key = 0;
        created = topicset = limit = 0;
@@ -216,7 +214,7 @@ CUList* chanrec::GetVoicedUsers()
  * add a channel to a user, creating the record for it if needed and linking
  * it to the user record 
  */
-chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const char* key)
+chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key)
 {
        if (!user || !cn)
                return NULL;
@@ -233,21 +231,21 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                if (user->fd > -1)
                {
                        MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
+                       FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
                        if (MOD_RESULT == 1)
                                return NULL;
                }
 
                /* create a new one */
-               chanlist[cname] = new chanrec();
-               strlcpy(chanlist[cname]->name, cname,CHANMAX);
-               chanlist[cname]->modes[CM_TOPICLOCK] = chanlist[cname]->modes[CM_NOEXTERNAL] = 1;
-               //chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL;
-               chanlist[cname]->created = TIME;
-               *chanlist[cname]->topic = 0;
-               strlcpy(chanlist[cname]->setby, user->nick,NICKMAX-1);
-               chanlist[cname]->topicset = 0;
-               Ptr = chanlist[cname];
+               Ptr = new chanrec(Instance);
+               Instance->chanlist[cname] = Ptr;
+
+               strlcpy(Ptr->name, cname,CHANMAX);
+               Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1;
+               Ptr->created = TIME;
+               *Ptr->topic = 0;
+               strlcpy(Ptr->setby, user->nick,NICKMAX-1);
+               Ptr->topicset = 0;
                log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
                /*
                 * set created to 2 to indicate user
@@ -269,7 +267,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                if (IS_LOCAL(user)) /* was a check on fd > -1 */
                {
                        MOD_RESULT = 0;
-                       FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
+                       FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
                        if (MOD_RESULT == 1)
                        {
                                return NULL;
@@ -279,13 +277,13 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                                if (*Ptr->key)
                                {
                                        MOD_RESULT = 0;
-                                       FOREACH_RESULT(I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
+                                       FOREACH_RESULT_I(Instance,I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
                                        if (!MOD_RESULT)
                                        {
                                                if (!key)
                                                {
                                                        log(DEBUG,"chanrec::JoinUser(): no key given in JOIN");
-                                                       WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
+                                                       user->WriteServ("475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name);
                                                        return NULL;
                                                }
                                                else
@@ -293,7 +291,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                                                        if (strcmp(key,Ptr->key))
                                                        {
                                                                log(DEBUG,"chanrec::JoinUser(): bad key given in JOIN");
-                                                               WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
+                                                               user->WriteServ("475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name);
                                                                return NULL;
                                                        }
                                                }
@@ -303,7 +301,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                                {
                                        MOD_RESULT = 0;
                                        irc::string xname(Ptr->name);
-                                       FOREACH_RESULT(I_OnCheckInvite,OnCheckInvite(user, Ptr));
+                                       FOREACH_RESULT_I(Instance,I_OnCheckInvite,OnCheckInvite(user, Ptr));
                                        if (!MOD_RESULT)
                                        {
                                                if (user->IsInvited(xname))
@@ -313,7 +311,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                                                }
                                                else
                                                {
-                                                       WriteServ(user->fd,"473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+                                                       user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
                                                        return NULL;
                                                }
                                        }
@@ -322,12 +320,12 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                                if (Ptr->limit)
                                {
                                        MOD_RESULT = 0;
-                                       FOREACH_RESULT(I_OnCheckLimit,OnCheckLimit(user, Ptr));
+                                       FOREACH_RESULT_I(Instance,I_OnCheckLimit,OnCheckLimit(user, Ptr));
                                        if (!MOD_RESULT)
                                        {
-                                               if (usercount(Ptr) >= Ptr->limit)
+                                               if (Ptr->GetUserCounter() >= Ptr->limit)
                                                {
-                                                       WriteServ(user->fd,"471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+                                                       user->WriteServ("471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
                                                        return NULL;
                                                }
                                        }
@@ -335,7 +333,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                                if (Ptr->bans.size())
                                {
                                        MOD_RESULT = 0;
-                                       FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, Ptr));
+                                       FOREACH_RESULT_I(Instance,I_OnCheckBan,OnCheckBan(user, Ptr));
                                        char mask[MAXBUF];
                                        sprintf(mask,"%s!%s@%s",user->nick, user->ident, user->GetIPString());
                                        if (!MOD_RESULT)
@@ -344,11 +342,11 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                                                {
                                                        /* This allows CIDR ban matching
                                                         * 
-                                                        *          Full masked host                        Full unmasked host                     IP with/without CIDR
+                                                        *        Full masked host                      Full unmasked host                   IP with/without CIDR
                                                         */
                                                        if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match(mask, i->data, true)))
                                                        {
-                                                               WriteServ(user->fd,"474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+                                                               user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
                                                                return NULL;
                                                        }
                                                }
@@ -367,7 +365,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
        {
                if ((*index)->channel == NULL)
                {
-                       return chanrec::ForceChan(Ptr, *index, user, created);
+                       return chanrec::ForceChan(Instance, Ptr, *index, user, created);
                }
        }
 
@@ -379,7 +377,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
        if (!IS_LOCAL(user)) /* was a check on fd < 0 */
        {
                ucrec* a = new ucrec();
-               chanrec* c = chanrec::ForceChan(Ptr,a,user,created);
+               chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created);
                user->chans.push_back(a);
                return c;
        }
@@ -389,24 +387,24 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
                if (user->chans.size() < OPERMAXCHANS)
                {
                        ucrec* a = new ucrec();
-                       chanrec* c = chanrec::ForceChan(Ptr,a,user,created);
+                       chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created);
                        user->chans.push_back(a);
                        return c;
                }
        }
 
-       WriteServ(user->fd,"405 %s %s :You are on too many channels",user->nick, cname);
+       user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname);
 
        if (created == 2)
        {
                log(DEBUG,"BLAMMO, Whacking channel.");
                /* Things went seriously pear shaped, so take this away. bwahaha. */
-               chan_hash::iterator n = chanlist.find(cname);
-               if (n != chanlist.end())
+               chan_hash::iterator n = Instance->chanlist.find(cname);
+               if (n != Instance->chanlist.end())
                {
                        Ptr->DelUser(user);
                        DELETE(Ptr);
-                       chanlist.erase(n);
+                       Instance->chanlist.erase(n);
                        for (unsigned int index =0; index < user->chans.size(); index++)
                        {
                                if (user->chans[index]->channel == Ptr)
@@ -431,7 +429,7 @@ chanrec* chanrec::JoinUser(userrec *user, const char* cn, bool override, const c
        return NULL;
 }
 
-chanrec* chanrec::ForceChan(chanrec* Ptr,ucrec *a,userrec* user, int created)
+chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, int created)
 {
        if (created == 2)
        {
@@ -446,7 +444,7 @@ chanrec* chanrec::ForceChan(chanrec* Ptr,ucrec *a,userrec* user, int created)
 
        a->channel = Ptr;
        Ptr->AddUser(user);
-       WriteChannel(Ptr,user,"JOIN :%s",Ptr->name);
+       Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
 
        /* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
        if (IS_LOCAL(user))
@@ -454,13 +452,13 @@ chanrec* chanrec::ForceChan(chanrec* Ptr,ucrec *a,userrec* user, int created)
                log(DEBUG,"Sent JOIN to client");
                if (Ptr->topicset)
                {
-                       WriteServ(user->fd,"332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
-                       WriteServ(user->fd,"333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
+                       user->WriteServ("332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
+                       user->WriteServ("333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
                }
                userlist(user,Ptr);
-               WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
+               user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
        }
-       FOREACH_MOD(I_OnUserJoin,OnUserJoin(user,Ptr));
+       FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user,Ptr));
        return Ptr;
 }
 
@@ -481,12 +479,12 @@ long chanrec::PartUser(userrec *user, const char* reason)
                        if (reason)
                        {
                                FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason));
-                               WriteChannel(this, user, "PART %s :%s", this->name, reason);
+                               this->WriteChannel(user, "PART %s :%s", this->name, reason);
                        }
                        else
                        {
                                FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, ""));
-                               WriteChannel(this, user, "PART :%s", this->name);
+                               this->WriteChannel(user, "PART :%s", this->name);
                        }
                        user->chans[i]->uc_modes = 0;
                        user->chans[i]->channel = NULL;
@@ -496,13 +494,13 @@ long chanrec::PartUser(userrec *user, const char* reason)
 
        if (!this->DelUser(user)) /* if there are no users left on the channel... */
        {
-               chan_hash::iterator iter = chanlist.find(this->name);
+               chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
                /* kill the record */
-               if (iter != chanlist.end())
+               if (iter != ServerInstance->chanlist.end())
                {
                        log(DEBUG,"del_channel: destroyed: %s", this->name);
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
-                       chanlist.erase(iter);
+                       ServerInstance->chanlist.erase(iter);
                }
                return 0;
        }
@@ -533,7 +531,7 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven
        {
                if (user->chans[i]->channel == this)
                {
-                       WriteChannelWithServ(Config->ServerName,this,"KICK %s %s :%s",this->name, user->nick, reason);
+                       this->WriteChannelWithServ(ServerInstance->Config->ServerName, "KICK %s %s :%s", this->name, user->nick, reason);
                        user->chans[i]->uc_modes = 0;
                        user->chans[i]->channel = NULL;
                        break;
@@ -542,12 +540,12 @@ long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggereven
 
        if (!this->DelUser(user))
        {
-               chan_hash::iterator iter = chanlist.find(this->name);
+               chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
                /* kill the record */
-               if (iter != chanlist.end())
+               if (iter != ServerInstance->chanlist.end())
                {
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
-                       chanlist.erase(iter);
+                       ServerInstance->chanlist.erase(iter);
                }
                return 0;
        }
@@ -564,12 +562,12 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
        {
                if (!this->HasUser(user))
                {
-                       WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name);
+                       src->WriteServ("441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name);
                        return this->GetUserCounter();
                }
-                if ((is_uline(user->server)) && (!is_uline(src->server)))
+               if ((is_uline(user->server)) && (!is_uline(src->server)))
                {
-                       WriteServ(src->fd,"482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name);
+                       src->WriteServ("482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name);
                        return this->GetUserCounter();
                }
                int MOD_RESULT = 0;
@@ -596,11 +594,11 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
                                {
                                        if (them == STATUS_HOP)
                                        {
-                                               WriteServ(src->fd,"482 %s %s :You must be a channel operator",src->nick, this->name);
+                                               src->WriteServ("482 %s %s :You must be a channel operator",src->nick, this->name);
                                        }
                                        else
                                        {
-                                               WriteServ(src->fd,"482 %s %s :You must be at least a half-operator",src->nick, this->name);
+                                               src->WriteServ("482 %s %s :You must be at least a half-operator",src->nick, this->name);
                                        }
                                        return this->GetUserCounter();
                                }
@@ -615,7 +613,7 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
                /* zap it from the channel list of the user */
                if ((*i)->channel == this)
                {
-                       WriteChannel(this,src,"KICK %s %s :%s",this->name, user->nick, reason);
+                       this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
                        (*i)->uc_modes = 0;
                        (*i)->channel = NULL;
                        break;
@@ -625,16 +623,119 @@ long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
        if (!this->DelUser(user))
        /* if there are no users left on the channel */
        {
-               chan_hash::iterator iter = chanlist.find(this->name);
+               chan_hash::iterator iter = ServerInstance->chanlist.find(this->name);
 
                /* kill the record */
-               if (iter != chanlist.end())
+               if (iter != ServerInstance->chanlist.end())
                {
                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this));
-                       chanlist.erase(iter);
+                       ServerInstance->chanlist.erase(iter);
                }
                return 0;
        }
 
        return this->GetUserCounter();
 }
+
+void chanrec::WriteChannel(userrec* user, char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       if (!user || !text)
+               return;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteChannel(user, std::string(textbuffer));
+}
+
+void chanrec::WriteChannel(userrec* user, const std::string &text)
+{
+       CUList *ulist = this->GetUsers();
+
+       if (!user)
+               return;
+
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if (i->second->fd != FD_MAGIC_NUMBER)
+                       user->WriteTo(i->second,text);
+       }
+}
+
+void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       if (!text)
+               return;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteChannelWithServ(ServName, std::string(textbuffer));
+}
+
+void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text)
+{
+       CUList *ulist = this->GetUsers();
+
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if (IS_LOCAL(i->second))
+                       i->second->WriteServ(text);
+       }
+}
+
+/* write formatted text from a source user to all users on a channel except
+ * for the sender (for privmsg etc) */
+void chanrec::WriteAllExceptSender(userrec* user, char status, char* text, ...)
+{
+       char textbuffer[MAXBUF];
+       va_list argsPtr;
+
+       if (!user || !text)
+               return;
+
+       va_start(argsPtr, text);
+       vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+       va_end(argsPtr);
+
+       this->WriteAllExceptSender(user, status, std::string(textbuffer));
+}
+
+void chanrec::WriteAllExceptSender(userrec* user, char status, const std::string& text)
+{
+       CUList *ulist;
+
+       if (!user)
+               return;
+
+       switch (status)
+       {
+               case '@':
+                       ulist = this->GetOppedUsers();
+                       break;
+               case '%':
+                       ulist = this->GetHalfoppedUsers();
+                       break;
+               case '+':
+                       ulist = this->GetVoicedUsers();
+                       break;
+               default:
+                       ulist = this->GetUsers();
+                       break;
+       }
+
+       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+       {
+               if ((IS_LOCAL(i->second)) && (user != i->second))
+                       i->second->WriteFrom(user,text);
+       }
+}
+