X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=e7564c3ea6ceddac42aa347dbf7edd47675039fa;hb=3382adb9e9a79748b4db09bb41a296861800fa2d;hp=3901530a6f8fe11cd14e09a8b792cde9b477b97d;hpb=21a1aec26cfa93e468912080c60d92c4d43b0f0c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index 3901530a6..e7564c3ea 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -16,24 +16,15 @@ using namespace std; -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include -#include -#include -#include -#include #include -#ifdef GCC3 -#include -#else -#include -#endif #include #include #include #include +#include +#include "configreader.h" +#include "inspircd.h" +#include "hash_map.h" #include "users.h" #include "ctables.h" #include "globals.h" @@ -41,151 +32,80 @@ using namespace std; #include "dynamic.h" #include "commands.h" #include "wildcard.h" -#include "message.h" #include "mode.h" #include "xline.h" #include "inspstring.h" -#include "helperfuncs.h" -#include "typedefs.h" - -#ifdef GCC3 -#define nspace __gnu_cxx -#else -#define nspace std -#endif - -extern ServerConfig* Config; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern int WHOWAS_STALE; -extern int WHOWAS_MAX; -extern time_t TIME; -extern chan_hash chanlist; - -using namespace std; - -//std::vector custom_mode_params; - -chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created); +#include "typedefs.h" -chanrec::chanrec() +chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance) { - *name = *custom_modes = *topic = *setby = *key = 0; - created = topicset = limit = binarymodes = 0; + *name = *topic = *setby = *key = 0; + created = topicset = limit = 0; internal_userlist.clear(); + memset(&modes,0,64); } -void chanrec::SetCustomMode(char mode,bool mode_on) +void chanrec::SetMode(char mode,bool mode_on) { - if (mode_on) - { - char* mptr = this->custom_modes; - int ssize = 0; - - /* Attempt to find the end of the mode string */ - while (*mptr++) - { - /* While iterating the mode string, we found that they already have - * this mode in their list. Abort right now. */ - if (*mptr == mode) - return; - /* Increment the string size, saves us doing strlen */ - ssize++; - } - - log(DEBUG,"ssize=%d",ssize); - - /* Is there room left in the buffer? If there is append the mode */ - if (ssize < MAXMODES-1) - { - *--mptr = mode; - *++mptr = 0; - } - - log(DEBUG,"Custom mode %c set, modes='%s'",mode,this->custom_modes); - } - else - { - char* mptr = this->custom_modes; - bool shift_down = false; - /* Iterate through the string */ - while (*mptr) - { - /* When we find the mode we intend to remove, set the - * flag to tell the loop to start moving chars down - * one place - */ - if (*mptr == mode) - shift_down = true; - /* If we're moving chars down one place, take the current - * char, and move it down one slot, so: - * ABC\0 becomes BBC\0 then next iteration, BBC\0 becomes - * BC\0. - */ - if (shift_down) - *mptr = *(mptr+1); - *mptr++; - } - - log(DEBUG,"Custom mode %c removed: modelist='%s'",mode,this->custom_modes); - - /* Only call this if we found the mode */ - if (shift_down) - this->SetCustomModeParam(mode,"",false); - } + modes[mode-65] = mode_on; + if (!mode_on) + this->SetModeParam(mode,"",false); } -void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on) +void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on) { + ServerInstance->Log(DEBUG,"SetModeParam called"); + + CustomModeList::iterator n = custom_mode_params.find(mode); - log(DEBUG,"SetCustomModeParam called"); - ModeParameter M; - M.mode = mode; - strlcpy(M.channel,this->name,CHANMAX); - strlcpy(M.parameter,parameter,MAXBUF); if (mode_on) { - log(DEBUG,"Custom mode parameter %c %s added",mode,parameter); - custom_mode_params.push_back(M); + if (n == custom_mode_params.end()) + { + custom_mode_params[mode] = strdup(parameter); + ServerInstance->Log(DEBUG,"Custom mode parameter %c %s added",mode,parameter); + } + else + { + ServerInstance->Log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second); + } } else { - if (custom_mode_params.size()) + if (n != custom_mode_params.end()) { - for (vector::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++) - { - if ((i->mode == mode) && (!strcasecmp(this->name,i->channel))) - { - log(DEBUG,"Custom mode parameter %c %s removed",mode,parameter); - custom_mode_params.erase(i); - return; - } - } + free(n->second); + custom_mode_params.erase(n); } } } -bool chanrec::IsCustomModeSet(char mode) +bool chanrec::IsModeSet(char mode) { - return (strchr(this->custom_modes,mode)); + return modes[mode-65]; } std::string chanrec::GetModeParameter(char mode) { - if (custom_mode_params.size()) + if (mode == 'k') + { + return this->key; + } + else if (mode == 'l') { - for (vector::iterator i = custom_mode_params.begin(); i < custom_mode_params.end(); i++) + return ConvToStr(this->limit); + } + else + { + CustomModeList::iterator n = custom_mode_params.find(mode); + if (n != custom_mode_params.end()) { - if ((i->mode == mode) && (!strcasecmp(this->name,i->channel))) - { - return i->parameter; - } + return n->second; } + return ""; } - return ""; } long chanrec::GetUserCounter() @@ -193,94 +113,93 @@ long chanrec::GetUserCounter() return (this->internal_userlist.size()); } -void chanrec::AddUser(char* castuser) +void chanrec::AddUser(userrec* user) { - internal_userlist[castuser] = castuser; - log(DEBUG,"Added casted user to channel's internal list"); + internal_userlist[user] = user; } -void chanrec::DelUser(char* castuser) +unsigned long chanrec::DelUser(userrec* user) { - std::map::iterator a = internal_userlist.find(castuser); + CUListIter a = internal_userlist.find(user); + if (a != internal_userlist.end()) { - log(DEBUG,"Removed casted user from channel's internal list"); internal_userlist.erase(a); /* And tidy any others... */ - DelOppedUser(castuser); - DelHalfoppedUser(castuser); - DelVoicedUser(castuser); - return; + DelOppedUser(user); + DelHalfoppedUser(user); + DelVoicedUser(user); } + + return internal_userlist.size(); } -void chanrec::AddOppedUser(char* castuser) +bool chanrec::HasUser(userrec* user) { - internal_op_userlist[castuser] = castuser; - log(DEBUG,"Added casted user to channel's internal list"); + return (internal_userlist.find(user) != internal_userlist.end()); } -void chanrec::DelOppedUser(char* castuser) +void chanrec::AddOppedUser(userrec* user) { - std::map::iterator a = internal_op_userlist.find(castuser); + internal_op_userlist[user] = user; +} + +void chanrec::DelOppedUser(userrec* user) +{ + CUListIter a = internal_op_userlist.find(user); if (a != internal_op_userlist.end()) { - log(DEBUG,"Removed casted user from channel's internal list"); internal_op_userlist.erase(a); return; } } -void chanrec::AddHalfoppedUser(char* castuser) +void chanrec::AddHalfoppedUser(userrec* user) { - internal_halfop_userlist[castuser] = castuser; - log(DEBUG,"Added casted user to channel's internal list"); + internal_halfop_userlist[user] = user; } -void chanrec::DelHalfoppedUser(char* castuser) +void chanrec::DelHalfoppedUser(userrec* user) { - std::map::iterator a = internal_halfop_userlist.find(castuser); + CUListIter a = internal_halfop_userlist.find(user); + if (a != internal_halfop_userlist.end()) { - log(DEBUG,"Removed casted user from channel's internal list"); internal_halfop_userlist.erase(a); - return; } } -void chanrec::AddVoicedUser(char* castuser) +void chanrec::AddVoicedUser(userrec* user) { - internal_voice_userlist[castuser] = castuser; - log(DEBUG,"Added casted user to channel's internal list"); + internal_voice_userlist[user] = user; } -void chanrec::DelVoicedUser(char* castuser) +void chanrec::DelVoicedUser(userrec* user) { - std::map::iterator a = internal_voice_userlist.find(castuser); + CUListIter a = internal_voice_userlist.find(user); + if (a != internal_voice_userlist.end()) { - log(DEBUG,"Removed casted user from channel's internal list"); internal_voice_userlist.erase(a); - return; } } -std::map *chanrec::GetUsers() +CUList* chanrec::GetUsers() { return &internal_userlist; } -std::map *chanrec::GetOppedUsers() +CUList* chanrec::GetOppedUsers() { return &internal_op_userlist; } -std::map *chanrec::GetHalfoppedUsers() +CUList* chanrec::GetHalfoppedUsers() { return &internal_halfop_userlist; } -std::map *chanrec::GetVoicedUsers() +CUList* chanrec::GetVoicedUsers() { return &internal_voice_userlist; } @@ -289,45 +208,39 @@ std::map *chanrec::GetVoicedUsers() * add a channel to a user, creating the record for it if needed and linking * it to the user record */ - -chanrec* add_channel(userrec *user, const char* cn, const char* key, bool override) +chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key) { - if ((!user) || (!cn)) - { - log(DEFAULT,"*** BUG *** add_channel was given an invalid parameter"); - return 0; - } + if (!user || !cn) + return NULL; int created = 0; char cname[MAXBUF]; int MOD_RESULT = 0; strlcpy(cname,cn,CHANMAX); - log(DEBUG,"cname='%s' cn='%s'",cname,cn); - log(DEBUG,"add_channel: %s %s",user->nick,cname); - - chanrec* Ptr = FindChan(cname); + chanrec* Ptr = Instance->FindChan(cname); if (!Ptr) { - if (user->fd > -1) + if (IS_LOCAL(user)) { 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]->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]; - log(DEBUG,"add_channel: created: %s",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 = Instance->Time(); + *Ptr->topic = 0; + strlcpy(Ptr->setby, user->nick,NICKMAX-1); + Ptr->topicset = 0; + Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname); /* * set created to 2 to indicate user * is the first in the channel @@ -338,7 +251,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri else { /* Already on the channel */ - if (has_channel(user,Ptr)) + if (Ptr->HasUser(user)) return NULL; /* @@ -348,7 +261,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri 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; @@ -358,34 +271,33 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri 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,"add_channel: no key given in JOIN"); - WriteServ(user->fd,"475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name); + Instance->Log(DEBUG,"chanrec::JoinUser(): no key given in JOIN"); + user->WriteServ("475 %s %s :Cannot join channel (Requires key)",user->nick, Ptr->name); return NULL; } else { if (strcmp(key,Ptr->key)) { - log(DEBUG,"add_channel: bad key given in JOIN"); - WriteServ(user->fd,"475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name); + Instance->Log(DEBUG,"chanrec::JoinUser(): bad key given in JOIN"); + user->WriteServ("475 %s %s :Cannot join channel (Incorrect key)",user->nick, Ptr->name); return NULL; } } } } - if (Ptr->binarymodes & CM_INVITEONLY) + if (Ptr->modes[CM_INVITEONLY]) { 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) { - log(DEBUG,"add_channel: channel is +i"); if (user->IsInvited(xname)) { /* user was invited to channel */ @@ -393,7 +305,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri } 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; } } @@ -402,28 +314,33 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri 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; } } } if (Ptr->bans.size()) { - log(DEBUG,"add_channel: about to walk banlist"); 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) { for (BanList::iterator i = Ptr->bans.begin(); i != Ptr->bans.end(); i++) { - if ((match(user->GetFullHost(),i->data)) || (match(user->GetFullRealHost(),i->data)) || (match((char*)inet_ntoa(user->ip4),i->data))) + /* This allows CIDR ban matching + * + * 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; } } @@ -433,18 +350,16 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri } else { - log(DEBUG,"Overridden checks"); + Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks"); } created = 1; } - log(DEBUG,"Passed channel checks"); - - for (unsigned int index =0; index < user->chans.size(); index++) + for (UserChanList::const_iterator index = user->chans.begin(); index != user->chans.end(); index++) { - if (user->chans[index].channel == NULL) + if ((*index)->channel == NULL) { - return ForceChan(Ptr,user->chans[index],user,created); + return chanrec::ForceChan(Instance, Ptr, *index, user, created); } } @@ -455,8 +370,8 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri */ if (!IS_LOCAL(user)) /* was a check on fd < 0 */ { - ucrec a; - chanrec* c = ForceChan(Ptr,a,user,created); + ucrec* a = new ucrec(); + chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created); user->chans.push_back(a); return c; } @@ -465,271 +380,645 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri /* Oper allows extension up to the OPERMAXCHANS value */ if (user->chans.size() < OPERMAXCHANS) { - ucrec a; - chanrec* c = ForceChan(Ptr,a,user,created); + ucrec* a = new ucrec(); + chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created); user->chans.push_back(a); return c; } } - log(DEBUG,"add_channel: user channel max exceeded: %s %s",user->nick,cname); - 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."); + Instance->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((char*)user); - delete Ptr; - chanlist.erase(n); + Ptr->DelUser(user); + DELETE(Ptr); + Instance->chanlist.erase(n); for (unsigned int index =0; index < user->chans.size(); index++) { - if (user->chans[index].channel == Ptr) + if (user->chans[index]->channel == Ptr) { - user->chans[index].channel = NULL; - user->chans[index].uc_modes = 0; + user->chans[index]->channel = NULL; + user->chans[index]->uc_modes = 0; } } } } + else + { + for (unsigned int index =0; index < user->chans.size(); index++) + { + if (user->chans[index]->channel == Ptr) + { + user->chans[index]->channel = NULL; + user->chans[index]->uc_modes = 0; + } + } + } return NULL; } -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) { /* first user in is given ops */ - a.uc_modes = UCMODE_OP; - Ptr->AddOppedUser((char*)user); + a->uc_modes = UCMODE_OP; + Ptr->AddOppedUser(user); + Ptr->SetPrefix(user, '@', OP_VALUE, true); } else { - a.uc_modes = 0; + a->uc_modes = 0; } - a.channel = Ptr; - Ptr->AddUser((char*)user); - WriteChannel(Ptr,user,"JOIN :%s",Ptr->name); - log(DEBUG,"Sent JOIN to client"); + a->channel = Ptr; + Ptr->AddUser(user); + Ptr->WriteChannel(user,"JOIN :%s",Ptr->name); - if (Ptr->topicset) + /* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */ + if (IS_LOCAL(user)) { - 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); + if (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); + } + Ptr->UserList(user); + user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name); } - - userlist(user,Ptr); - WriteServ(user->fd,"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; } -/* - *remove a channel from a users record, and remove the record from memory +/* chanrec::PartUser + * remove a channel from a users record, and remove the record from the hash * if the channel has become empty */ - -chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool local) +long chanrec::PartUser(userrec *user, const char* reason) { - if ((!user) || (!cname)) - { - log(DEFAULT,"*** BUG *** del_channel was given an invalid parameter"); - return NULL; - } - - chanrec* Ptr = FindChan(cname); - - if (!Ptr) - return NULL; - - log(DEBUG,"del_channel: removing: %s %s",user->nick,Ptr->name); + if (!user) + return this->GetUserCounter(); for (unsigned int i =0; i < user->chans.size(); i++) { /* zap it from the channel list of the user */ - if (user->chans[i].channel == Ptr) + if (user->chans[i]->channel == this) { if (reason) { - FOREACH_MOD(I_OnUserPart,OnUserPart(user,Ptr,reason)); - WriteChannel(Ptr,user,"PART %s :%s",Ptr->name, reason); + FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason)); + this->WriteChannel(user, "PART %s :%s", this->name, reason); } else { - FOREACH_MOD(I_OnUserPart,OnUserPart(user,Ptr,"")); - WriteChannel(Ptr,user,"PART :%s",Ptr->name); + FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, "")); + this->WriteChannel(user, "PART :%s", this->name); } - user->chans[i].uc_modes = 0; - user->chans[i].channel = NULL; - log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name); + user->chans[i]->uc_modes = 0; + user->chans[i]->channel = NULL; + this->RemoveAllPrefixes(user); break; } } - Ptr->DelUser((char*)user); - - /* if there are no users left on the channel */ - if (!usercount(Ptr)) + if (!this->DelUser(user)) /* if there are no users left on the channel... */ { - chan_hash::iterator iter = chanlist.find(Ptr->name); - - log(DEBUG,"del_channel: destroying channel: %s",Ptr->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",Ptr->name); - FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr)); - delete Ptr; - chanlist.erase(iter); + ServerInstance->Log(DEBUG,"del_channel: destroyed: %s", this->name); + FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this)); + ServerInstance->chanlist.erase(iter); } + return 0; } - return NULL; + return this->GetUserCounter(); } -void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool triggerevents) +long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents) { - if ((!user) || (!Ptr) || (!reason)) - { - return; - } + if (!user || !reason) + return this->GetUserCounter(); if (IS_LOCAL(user)) { - if (!has_channel(user,Ptr)) + if (!this->HasUser(user)) { /* Not on channel */ - return; + return this->GetUserCounter(); } } - + if (triggerevents) { - FOREACH_MOD(I_OnUserKick,OnUserKick(NULL,user,Ptr,reason)); + FOREACH_MOD(I_OnUserKick,OnUserKick(NULL,user,this,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)) + if (user->chans[i]->channel == this) { - WriteChannelWithServ(Config->ServerName,Ptr,"KICK %s %s :%s",Ptr->name, user->nick, reason); - user->chans[i].uc_modes = 0; - user->chans[i].channel = NULL; + 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; + this->RemoveAllPrefixes(user); break; } } - Ptr->DelUser((char*)user); - - if (!usercount(Ptr)) + if (!this->DelUser(user)) { - chan_hash::iterator iter = chanlist.find(Ptr->name); - log(DEBUG,"del_channel: destroying channel: %s",Ptr->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",Ptr->name); - FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr)); - delete Ptr; - chanlist.erase(iter); + FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this)); + ServerInstance->chanlist.erase(iter); } + return 0; } + + return this->GetUserCounter(); } -void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) +long chanrec::KickUser(userrec *src, userrec *user, const char* reason) { - if ((!src) || (!user) || (!Ptr) || (!reason)) - { - log(DEFAULT,"*** BUG *** kick_channel was given an invalid parameter"); - return; - } - - log(DEBUG,"kick_channel: removing: %s %s %s",user->nick,Ptr->name,src->nick); + if (!src || !user || !reason) + return this->GetUserCounter(); if (IS_LOCAL(src)) { - if (!has_channel(user,Ptr)) + if (!this->HasUser(user)) { - WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name); - return; + src->WriteServ("441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name); + return this->GetUserCounter(); + } + if ((ServerInstance->ULine(user->server)) && (!ServerInstance->ULine(src->server))) + { + 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; - if (!is_uline(src->server)) + if (!ServerInstance->ULine(src->server)) { MOD_RESULT = 0; - FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,Ptr,reason)); + FOREACH_RESULT(I_OnUserPreKick,OnUserPreKick(src,user,this,reason)); if (MOD_RESULT == 1) - return; + return this->GetUserCounter(); } /* Set to -1 by OnUserPreKick if explicit allow was set */ if (MOD_RESULT != -1) { - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,Ptr,AC_KICK)); - if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server))) - return; + FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,this,AC_KICK)); + if ((MOD_RESULT == ACR_DENY) && (!ServerInstance->ULine(src->server))) + return this->GetUserCounter(); - if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server))) + if ((MOD_RESULT == ACR_DEFAULT) || (!ServerInstance->ULine(src->server))) { - if ((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr))) + int them = this->GetStatus(src); + int us = this->GetStatus(user); + if ((them < STATUS_HOP) || (them < us)) { - if (cstatus(src,Ptr) == STATUS_HOP) + if (them == STATUS_HOP) { - WriteServ(src->fd,"482 %s %s :You must be a channel operator",src->nick, Ptr->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, Ptr->name); + src->WriteServ("482 %s %s :You must be at least a half-operator",src->nick, this->name); } - - return; + return this->GetUserCounter(); } } } } - FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,Ptr,reason)); - - for (unsigned int i =0; i < user->chans.size(); i++) + FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,this,reason)); + + for (UserChanList::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) { /* zap it from the channel list of the user */ - if (user->chans[i].channel) + if ((*i)->channel == this) { - if (!strcasecmp(user->chans[i].channel->name,Ptr->name)) + this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason); + (*i)->uc_modes = 0; + (*i)->channel = NULL; + this->RemoveAllPrefixes(user); + break; + } + } + + if (!this->DelUser(user)) + /* if there are no users left on the channel */ + { + chan_hash::iterator iter = ServerInstance->chanlist.find(this->name); + + /* kill the record */ + if (iter != ServerInstance->chanlist.end()) + { + FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(this)); + 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 (IS_LOCAL(i->second)) + 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); + } +} + +/* + * return a count of the users on a specific channel accounting for + * invisible users who won't increase the count. e.g. for /LIST + */ +int chanrec::CountInvisible() +{ + int count = 0; + CUList *ulist= this->GetUsers(); + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + { + if (!(i->second->modes[UM_INVISIBLE])) + count++; + } + + return count; +} + +char* chanrec::ChanModes(bool showkey) +{ + static char scratch[MAXBUF]; + static char sparam[MAXBUF]; + char* offset = scratch; + std::string extparam = ""; + + *scratch = '\0'; + *sparam = '\0'; + + /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */ + for(int n = 0; n < 64; n++) + { + if(this->modes[n]) + { + *offset++ = n + 65; + extparam = ""; + switch (n) { - WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason); - user->chans[i].uc_modes = 0; - user->chans[i].channel = NULL; - log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name); + case CM_KEY: + extparam = (showkey ? this->key : ""); break; + case CM_LIMIT: + extparam = ConvToStr(this->limit); + break; + case CM_NOEXTERNAL: + case CM_TOPICLOCK: + case CM_INVITEONLY: + case CM_MODERATED: + case CM_SECRET: + case CM_PRIVATE: + /* We know these have no parameters */ + break; + default: + extparam = this->GetModeParameter(n + 65); + break; + } + if (extparam != "") + { + charlcat(sparam,' ',MAXBUF); + strlcat(sparam,extparam.c_str(),MAXBUF); } } } - Ptr->DelUser((char*)user); + /* Null terminate scratch */ + *offset = '\0'; + strlcat(scratch,sparam,MAXBUF); + return scratch; +} - /* if there are no users left on the channel */ - if (!usercount(Ptr)) +/* compile a userlist of a channel into a string, each nick seperated by + * spaces and op, voice etc status shown as @ and +, and send it to 'user' + */ +void chanrec::UserList(userrec *user) +{ + char list[MAXBUF]; + size_t dlen, curlen; + + dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name); + + int numusers = 0; + char* ptr = list + dlen; + + CUList *ulist= this->GetUsers(); + + /* Improvement by Brain - this doesnt change in value, so why was it inside + * the loop? + */ + bool has_user = this->HasUser(user); + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - chan_hash::iterator iter = chanlist.find(Ptr->name); + if ((!has_user) && (i->second->modes[UM_INVISIBLE])) + { + /* + * user is +i, and source not on the channel, does not show + * nick in NAMES list + */ + continue; + } - log(DEBUG,"del_channel: destroying channel: %s",Ptr->name); + size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->second), i->second->nick); - /* kill the record */ - if (iter != chanlist.end()) + curlen += ptrlen; + ptr += ptrlen; + + numusers++; + + if (curlen > (480-NICKMAX)) + { + /* list overflowed into multiple numerics */ + user->WriteServ(list); + + /* reset our lengths */ + dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name); + ptr = list + dlen; + + ptrlen = 0; + numusers = 0; + } + } + + /* if whats left in the list isnt empty, send it */ + if (numusers) + { + user->WriteServ(list); + } +} + +long chanrec::GetMaxBans() +{ + std::string x; + for (std::map::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++) + { + x = n->first; + if (match(this->name,x.c_str())) { - log(DEBUG,"del_channel: destroyed: %s",Ptr->name); - FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(Ptr)); - delete Ptr; - chanlist.erase(iter); + return n->second; } } + return 64; } +/* returns the status character for a given user on a channel, e.g. @ for op, + * % for halfop etc. If the user has several modes set, the highest mode + * the user has must be returned. + */ +const char* chanrec::GetPrefixChar(userrec *user) +{ + static char px[2]; + unsigned int mx = 0; + + *px = 0; + *(px+1) = 0; + + prefixlist::iterator n = prefixes.find(user); + if (n != prefixes.end()) + { + for (std::vector::iterator x = n->second.begin(); x != n->second.end(); x++) + { + if (x->second > mx) + { + *px = x->first; + mx = x->second; + } + } + } + + return px; +} + +const char* chanrec::GetAllPrefixChars(userrec* user) +{ + static char prefix[MAXBUF]; + int ctr = 0; + *prefix = 0; + + prefixlist::iterator n = prefixes.find(user); + if (n != prefixes.end()) + { + for (std::vector::iterator x = n->second.begin(); x != n->second.end(); x++) + { + prefix[ctr++] = x->first; + } + } + + prefix[ctr] = 0; + + return prefix; +} + +unsigned int chanrec::GetPrefixValue(userrec* user) +{ + unsigned int mx = 0; + + prefixlist::iterator n = prefixes.find(user); + if (n != prefixes.end()) + { + for (std::vector::iterator x = n->second.begin(); x != n->second.end(); x++) + { + if (x->second > mx) + mx = x->second; + } + } + + return mx; +} + + +int chanrec::GetStatusFlags(userrec *user) +{ + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) + { + if ((*i)->channel == this) + { + return (*i)->uc_modes; + } + } + return 0; +} + + +int chanrec::GetStatus(userrec *user) +{ + if (ServerInstance->ULine(user->server)) + return STATUS_OP; + + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) + { + if ((*i)->channel == this) + { + if (((*i)->uc_modes & UCMODE_OP) > 0) + { + return STATUS_OP; + } + if (((*i)->uc_modes & UCMODE_HOP) > 0) + { + return STATUS_HOP; + } + if (((*i)->uc_modes & UCMODE_VOICE) > 0) + { + return STATUS_VOICE; + } + return STATUS_NORMAL; + } + } + return STATUS_NORMAL; +} + +void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding) +{ + prefixlist::iterator n = prefixes.find(user); + prefixtype pfx = std::make_pair(prefix,prefix_value); + if (adding) + { + if (n != prefixes.end()) + { + if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end()) + { + n->second.push_back(pfx); + } + } + else + { + pfxcontainer one; + one.push_back(pfx); + prefixes.insert(std::make_pair(user, one)); + } + } + else + { + if (n != prefixes.end()) + { + pfxcontainer::iterator x = std::find(n->second.begin(), n->second.end(), pfx); + if (x != n->second.end()) + n->second.erase(x); + } + } +} + +void chanrec::RemoveAllPrefixes(userrec* user) +{ + prefixlist::iterator n = prefixes.find(user); + if (n != prefixes.end()) + prefixes.erase(n); +} +