Added facility for servers to send KICK message (ew, i hate this crap)

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

diff --git a/src/channels.cpp b/src/channels.cpp
index ef1f8b6ada537eb34c7340daa729e69709dd2231..9179c80027f30687ed4cd57df4e514e9c09d9395 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -19,7 +19,6 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include <unistd.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
@@ -73,13 +72,8 @@ chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created);
 
 chanrec::chanrec()
 {
-       strcpy(name,"");
-       strcpy(custom_modes,"");
-       strcpy(topic,"");
-       strcpy(setby,"");
-       strcpy(key,"");
-       created = topicset = limit = 0;
-       binarymodes = 0;
+       *name = *custom_modes = *topic = *setby = *key = 0;
+       created = topicset = limit = binarymodes = 0;
        internal_userlist.clear();
 }
 
@@ -100,7 +94,7 @@ void chanrec::SetCustomMode(char mode,bool mode_on)
                std::string a = this->custom_modes;
                int pos = a.find(mode);
                a.erase(pos,1);
-               strncpy(this->custom_modes,a.c_str(),MAXMODES);
+               strlcpy(this->custom_modes,a.c_str(),MAXMODES);
 
                log(DEBUG,"Custom mode %c removed: modelist='%s'",mode,this->custom_modes);
                this->SetCustomModeParam(mode,"",false);
@@ -166,25 +160,23 @@ long chanrec::GetUserCounter()
 
 void chanrec::AddUser(char* castuser)
 {
-       internal_userlist.push_back(castuser);
+       internal_userlist[castuser] = castuser;
        log(DEBUG,"Added casted user to channel's internal list");
 }
 
 void chanrec::DelUser(char* castuser)
 {
-       for (std::vector<char*>::iterator a = internal_userlist.begin(); a < internal_userlist.end(); a++)
+       std::map<char*,char*>::iterator a = internal_userlist.find(castuser);
+       if (a != internal_userlist.end())
        {
-               if (*a == castuser)
-               {
-                       log(DEBUG,"Removed casted user from channel's internal list");
-                       internal_userlist.erase(a);
-                       return;
-               }
+               log(DEBUG,"Removed casted user from channel's internal list");
+               internal_userlist.erase(a);
+               return;
        }
        log(DEBUG,"BUG BUG BUG! Attempt to remove an uncasted user from the internal list of %s!",name);
 }
 
-std::vector<char*> *chanrec::GetUsers()
+std::map<char*,char*> *chanrec::GetUsers()
 {
        return &internal_userlist;
 }
@@ -203,7 +195,8 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
         int created = 0;
         char cname[MAXBUF];
         int MOD_RESULT = 0;
-        strncpy(cname,cn,CHANMAX);
+        strlcpy(cname,cn,CHANMAX);
+       log(DEBUG,"cname='%s' cn='%s'",cname,cn);
 
         log(DEBUG,"add_channel: %s %s",user->nick,cname);
 
@@ -214,7 +207,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                 if (user->fd > -1)
                 {
                         MOD_RESULT = 0;
-                        FOREACH_RESULT(OnUserPreJoin(user,NULL,cname));
+                        FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
                         if (MOD_RESULT == 1)
                                 return NULL;
                 }
@@ -223,8 +216,8 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                 strlcpy(chanlist[cname]->name, cname,CHANMAX);
                 chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL;
                 chanlist[cname]->created = TIME;
-                strcpy(chanlist[cname]->topic, "");
-                strncpy(chanlist[cname]->setby, user->nick,NICKMAX);
+                *chanlist[cname]->topic = 0;
+                strlcpy(chanlist[cname]->setby, user->nick,NICKMAX);
                 chanlist[cname]->topicset = 0;
                 Ptr = chanlist[cname];
                 log(DEBUG,"add_channel: created: %s",cname);
@@ -244,17 +237,17 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                 if (user->fd > -1)
                 {
                         MOD_RESULT = 0;
-                        FOREACH_RESULT(OnUserPreJoin(user,Ptr,cname));
+                        FOREACH_RESULT(I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
                         if (MOD_RESULT == 1)
                         {
                                 return NULL;
                         }
-                        else
+                        else if (MOD_RESULT == 0)
                         {
                                 if (*Ptr->key)
                                 {
                                         MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnCheckKey(user, Ptr, key ? key : ""));
+                                        FOREACH_RESULT(I_OnCheckKey,OnCheckKey(user, Ptr, key ? key : ""));
                                         if (!MOD_RESULT)
                                         {
                                                 if (!key)
@@ -278,7 +271,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                 {
                                        MOD_RESULT = 0;
                                        irc::string xname(Ptr->name);
-                                        FOREACH_RESULT(OnCheckInvite(user, Ptr));
+                                        FOREACH_RESULT(I_OnCheckInvite,OnCheckInvite(user, Ptr));
                                         if (!MOD_RESULT)
                                         {
                                                 log(DEBUG,"add_channel: channel is +i");
@@ -298,7 +291,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                 if (Ptr->limit)
                                 {
                                         MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnCheckLimit(user, Ptr));
+                                        FOREACH_RESULT(I_OnCheckLimit,OnCheckLimit(user, Ptr));
                                         if (!MOD_RESULT)
                                         {
                                                 if (usercount(Ptr) >= Ptr->limit)
@@ -312,7 +305,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri
                                 {
                                         log(DEBUG,"add_channel: about to walk banlist");
                                         MOD_RESULT = 0;
-                                        FOREACH_RESULT(OnCheckBan(user, Ptr));
+                                        FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, Ptr));
                                         if (!MOD_RESULT)
                                         {
                                                 for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++)
@@ -392,7 +385,7 @@ chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created)
         }
         userlist(user,Ptr);
         WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-        FOREACH_MOD OnUserJoin(user,Ptr);
+        FOREACH_MOD(I_OnUserJoin,OnUserJoin(user,Ptr));
         return Ptr;
 }
 
@@ -412,7 +405,6 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
         if (!Ptr)
                 return NULL;
 
-        FOREACH_MOD OnUserPart(user,Ptr);
         log(DEBUG,"del_channel: removing: %s %s",user->nick,Ptr->name);
 
         for (unsigned int i =0; i < user->chans.size(); i++)
@@ -422,10 +414,12 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
                 {
                         if (reason)
                         {
+                               FOREACH_MOD(I_OnUserPart,OnUserPart(user,Ptr,reason));
                                 WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason);
                         }
                         else
                         {
+                               FOREACH_MOD(I_OnUserPart,OnUserPart(user,Ptr,""));
                                 WriteChannel(Ptr,user,"PART :%s",Ptr->name);
                         }
                         user->chans[i].uc_modes = 0;
@@ -448,6 +442,7 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
                 if (iter != chanlist.end())
                 {
                         log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
                         delete Ptr;
                         chanlist.erase(iter);
                 }
@@ -456,6 +451,52 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool
         return NULL;
 }
 
+void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool triggerevents)
+{
+       if ((!user) || (!Ptr) || (!reason))
+       {
+               return;
+       }
+
+       if (!has_channel(user,Ptr))
+       {
+               /* Not on channel */
+               return;
+       }
+
+       if (triggerevents)
+       {
+               FOREACH_MOD(I_OnUserKick,OnUserKick(NULL,user,Ptr,reason));
+       }
+
+       for (unsigned int i =0; i < user->chans.size(); i++)
+       {
+               if (user->chans[i].channel)
+               if (!strcasecmp(user->chans[i].channel->name,Ptr->name))
+               {
+                       WriteChannelWithServ(Ptr,"KICK %s %s :%s",Ptr->name, user->nick, reason);
+                       user->chans[i].uc_modes = 0;
+                       user->chans[i].channel = NULL;
+                       break;
+               }
+       }
+
+       Ptr->DelUser((char*)user);
+
+        if (!usercount(Ptr))
+        {
+                chan_hash::iterator iter = chanlist.find(Ptr->name);
+                log(DEBUG,"del_channel: destroying channel: %s",Ptr->name);
+                /* kill the record */
+                if (iter != chanlist.end())
+                {
+                        log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
+                        FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
+                        delete Ptr;
+                        chanlist.erase(iter);
+                }
+        }
+}
 
 void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
 {
@@ -465,11 +506,6 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
                 return;
         }
 
-        if ((!Ptr) || (!user) || (!src))
-        {
-                return;
-        }
-
         log(DEBUG,"kick_channel: removing: %s %s %s",user->nick,Ptr->name,src->nick);
 
         if (!has_channel(user,Ptr))
@@ -479,7 +515,7 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
         }
 
         int MOD_RESULT = 0;
-        FOREACH_RESULT(OnAccessCheck(src,user,Ptr,AC_KICK));
+        FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,Ptr,AC_KICK));
         if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server)))
                 return;
 
@@ -503,12 +539,12 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
         if (!is_uline(src->server))
         {
                 MOD_RESULT = 0;
-                FOREACH_RESULT(OnUserPreKick(src,user,Ptr,reason));
+                FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,Ptr,reason));
                 if (MOD_RESULT)
                         return;
         }
 
-        FOREACH_MOD OnUserKick(src,user,Ptr,reason);
+        FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,Ptr,reason));
 
         for (unsigned int i =0; i < user->chans.size(); i++)
         {
@@ -537,6 +573,7 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason)
                 if (iter != chanlist.end())
                 {
                         log(DEBUG,"del_channel: destroyed: %s",Ptr->name);
+                       FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr));
                         delete Ptr;
                         chanlist.erase(iter);
                 }