using namespace std;
-//std::vector<ModeParameter> 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)
- {
- 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);
- }
+ 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<char,char*>::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<ModeParameter>::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)
{
- return (strchr(this->custom_modes,mode));
+ return custom_modes[mode-65];
}
std::string chanrec::GetModeParameter(char mode)
{
- if (custom_mode_params.size())
+ std::map<char,char*>::iterator n = custom_mode_params.find(mode);
+ if (n != custom_mode_params.end())
{
- for (vector<ModeParameter>::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 "";
}
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<char*,char*>::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();
}
-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<char*,char*>::iterator a = internal_op_userlist.find(castuser);
+ internal_op_userlist[user] = user;
+}
+
+void chanrec::DelOppedUser(userrec* user)
+{
+ 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<char*,char*>::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<char*,char*>::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<char*,char*> *chanrec::GetUsers()
+CUList* chanrec::GetUsers()
{
return &internal_userlist;
}
-std::map<char*,char*> *chanrec::GetOppedUsers()
+CUList* chanrec::GetOppedUsers()
{
return &internal_op_userlist;
}
-std::map<char*,char*> *chanrec::GetHalfoppedUsers()
+CUList* chanrec::GetHalfoppedUsers()
{
return &internal_halfop_userlist;
}
-std::map<char*,char*> *chanrec::GetVoicedUsers()
+CUList* chanrec::GetVoicedUsers()
{
return &internal_voice_userlist;
}
else
{
/* Already on the channel */
- if (has_channel(user,Ptr))
+ if (Ptr->HasUser(user))
return NULL;
/*
log(DEBUG,"Passed channel checks");
- for (unsigned int index =0; index < user->chans.size(); index++)
+ for (std::vector<ucrec*>::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);
}
}
*/
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;
/* 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;
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;
}
}
}
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");
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)
{
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))
if (IS_LOCAL(user))
{
- if (!has_channel(user,Ptr))
+ if (!Ptr->HasUser(user))
{
/* Not on channel */
return;
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))
{
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;
}
FOREACH_MOD(I_OnUserKick,OnUserKick(src,user,Ptr,reason));
-
- for (unsigned int i =0; i < user->chans.size(); i++)
+
+ for (std::vector<ucrec*>::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);
projects / user / henk / code / inspircd.git / blobdiff