X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=41759f2e2eb5b684216d6bcac9c7dfe4f03f444d;hb=b251c1feb7f7e379181266f23f4f20a740b68fe8;hp=8ca993f2b6a461103dc004de145406109522f9d4;hpb=4648c98fa1b221d8c9dff5dcae030d33ac12982f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index 8ca993f2b..41759f2e2 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -66,90 +66,59 @@ extern chan_hash chanlist; using namespace std; -//std::vector custom_mode_params; - -chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created); +chanrec* ForceChan(chanrec* Ptr,ucrec *a,userrec* user, int created); chanrec::chanrec() { - *name = *custom_modes = *topic = *setby = *key = 0; + *name = *topic = *setby = *key = 0; created = topicset = limit = binarymodes = 0; internal_userlist.clear(); + memset(&custom_modes,0,64); } void chanrec::SetCustomMode(char mode,bool mode_on) { - if (mode_on) - { - static char m[3]; - m[0] = mode; - m[1] = '\0'; - if (!strchr(this->custom_modes,mode)) - { - strlcat(custom_modes,m,MAXMODES); - } - log(DEBUG,"Custom mode %c set",mode); - } - else { - - std::string a = this->custom_modes; - int pos = a.find(mode); - a.erase(pos,1); - strlcpy(this->custom_modes,a.c_str(),MAXMODES); - - log(DEBUG,"Custom mode %c removed: modelist='%s'",mode,this->custom_modes); + custom_modes[mode-65] = mode_on; + if (!mode_on) this->SetCustomModeParam(mode,"",false); - } } void chanrec::SetCustomModeParam(char mode,char* parameter,bool mode_on) { - log(DEBUG,"SetCustomModeParam called"); - ModeParameter M; - M.mode = mode; - strlcpy(M.channel,this->name,CHANMAX); - strlcpy(M.parameter,parameter,MAXBUF); + + std::map::iterator n = custom_mode_params.find(mode); + 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); + } } 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); } - log(DEBUG,"*** BUG *** Attempt to remove non-existent mode parameter!"); } } bool chanrec::IsCustomModeSet(char mode) { - return (strchr(this->custom_modes,mode)); + return custom_modes[mode-65]; } std::string chanrec::GetModeParameter(char mode) { - if (custom_mode_params.size()) + std::map::iterator n = custom_mode_params.find(mode); + 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))) - { - return i->parameter; - } - } + return n->second; } return ""; } @@ -159,94 +128,92 @@ 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); + CUList::iterator 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(); } + return internal_userlist.size(); +} + +bool chanrec::HasUser(userrec* user) +{ + return (internal_userlist.find(user) != internal_userlist.end()); } -void chanrec::AddOppedUser(char* castuser) +void chanrec::AddOppedUser(userrec* user) { - internal_op_userlist[castuser] = castuser; - log(DEBUG,"Added casted user to channel's internal list"); + internal_op_userlist[user] = user; } -void chanrec::DelOppedUser(char* castuser) +void chanrec::DelOppedUser(userrec* user) { - std::map::iterator a = internal_op_userlist.find(castuser); + CUList::iterator 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); + CUList::iterator 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); + CUList::iterator 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; } @@ -290,7 +257,7 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri chanlist[cname]->binarymodes = CM_TOPICLOCK | CM_NOEXTERNAL; chanlist[cname]->created = TIME; *chanlist[cname]->topic = 0; - strlcpy(chanlist[cname]->setby, user->nick,NICKMAX); + strlcpy(chanlist[cname]->setby, user->nick,NICKMAX-1); chanlist[cname]->topicset = 0; Ptr = chanlist[cname]; log(DEBUG,"add_channel: created: %s",cname); @@ -304,7 +271,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; /* @@ -406,11 +373,11 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri log(DEBUG,"Passed channel checks"); - for (unsigned int index =0; index < user->chans.size(); index++) + for (std::vector::const_iterator index = user->chans.begin(); index != user->chans.end(); index++) { - if (user->chans[index].channel == NULL) + if ((ucrec*)(*index)->channel == NULL) { - return ForceChan(Ptr,user->chans[index],user,created); + return ForceChan(Ptr,(ucrec*)(*index),user,created); } } @@ -421,7 +388,7 @@ 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; + ucrec* a = new ucrec(); chanrec* c = ForceChan(Ptr,a,user,created); user->chans.push_back(a); return c; @@ -431,7 +398,7 @@ 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; + ucrec* a = new ucrec(); chanrec* c = ForceChan(Ptr,a,user,created); user->chans.push_back(a); return c; @@ -448,15 +415,15 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri chan_hash::iterator n = chanlist.find(cname); if (n != chanlist.end()) { - Ptr->DelUser((char*)user); + Ptr->DelUser(user); delete Ptr; 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; } } } @@ -464,21 +431,21 @@ chanrec* add_channel(userrec *user, const char* cn, const char* key, bool overri return NULL; } -chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created) +chanrec* ForceChan(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); } else { - a.uc_modes = 0; + a->uc_modes = 0; } - a.channel = Ptr; - Ptr->AddUser((char*)user); + a->channel = Ptr; + Ptr->AddUser(user); WriteChannel(Ptr,user,"JOIN :%s",Ptr->name); log(DEBUG,"Sent JOIN to client"); @@ -517,7 +484,7 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool 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 == Ptr) { if (reason) { @@ -529,14 +496,14 @@ chanrec* del_channel(userrec *user, const char* cname, const char* reason, bool FOREACH_MOD(I_OnUserPart,OnUserPart(user,Ptr,"")); WriteChannel(Ptr,user,"PART :%s",Ptr->name); } - user->chans[i].uc_modes = 0; - user->chans[i].channel = NULL; + user->chans[i]->uc_modes = 0; + user->chans[i]->channel = NULL; log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name); break; } } - Ptr->DelUser((char*)user); + Ptr->DelUser(user); /* if there are no users left on the channel */ if (!usercount(Ptr)) @@ -567,7 +534,7 @@ void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool trigger if (IS_LOCAL(user)) { - if (!has_channel(user,Ptr)) + if (!Ptr->HasUser(user)) { /* Not on channel */ return; @@ -581,17 +548,16 @@ void server_kick_channel(userrec* user, chanrec* Ptr, char* reason, bool trigger 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) && (user->chans[i]->channel == Ptr)) { WriteChannelWithServ(Config->ServerName,Ptr,"KICK %s %s :%s",Ptr->name, user->nick, reason); - user->chans[i].uc_modes = 0; - user->chans[i].channel = NULL; + user->chans[i]->uc_modes = 0; + user->chans[i]->channel = NULL; break; } } - Ptr->DelUser((char*)user); + Ptr->DelUser(user); if (!usercount(Ptr)) { @@ -620,7 +586,7 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) if (IS_LOCAL(src)) { - if (!has_channel(user,Ptr)) + if (!Ptr->HasUser(user)) { WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name); return; @@ -661,27 +627,22 @@ void kick_channel(userrec *src,userrec *user, chanrec *Ptr, char* reason) } FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,Ptr,reason)); - - for (unsigned int i =0; i < user->chans.size(); i++) + + for (std::vector::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 ((((ucrec*)(*i))->channel) && (((ucrec*)(*i))->channel == Ptr)) { - if (!strcasecmp(user->chans[i].channel->name,Ptr->name)) - { - 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); - break; - } + WriteChannel(Ptr,src,"KICK %s %s :%s",Ptr->name, user->nick, reason); + ((ucrec*)(*i))->uc_modes = 0; + ((ucrec*)(*i))->channel = NULL; + log(DEBUG,"del_channel: unlinked: %s %s",user->nick,Ptr->name); + break; } } - Ptr->DelUser((char*)user); - + if (!Ptr->DelUser(user)) /* if there are no users left on the channel */ - if (!usercount(Ptr)) { chan_hash::iterator iter = chanlist.find(Ptr->name);