using namespace std;
-#include "inspircd_config.h"
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
#include <map>
#include <sstream>
#include <vector>
#include <deque>
+#include <stdarg.h>
+#include "configreader.h"
+#include "inspircd.h"
+#include "hash_map.h"
#include "users.h"
#include "ctables.h"
#include "globals.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<Module*> modules;
extern std::vector<ircd_module*> factory;
-extern int WHOWAS_STALE;
-extern int WHOWAS_MAX;
extern time_t TIME;
-extern chan_hash chanlist;
-using namespace std;
-
-chanrec* ForceChan(chanrec* Ptr,ucrec &a,userrec* user, int created);
-
-chanrec::chanrec()
+chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
{
*name = *topic = *setby = *key = 0;
- created = topicset = limit = binarymodes = 0;
+ created = topicset = limit = 0;
internal_userlist.clear();
- memset(&custom_modes,0,96);
+ memset(&modes,0,64);
}
-void chanrec::SetCustomMode(char mode,bool mode_on)
+void chanrec::SetMode(char mode,bool mode_on)
{
- custom_modes[mode-65] = mode_on;
+ modes[mode-65] = mode_on;
if (!mode_on)
- this->SetCustomModeParam(mode,"",false);
+ 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)
{
- log(DEBUG,"SetCustomModeParam called");
+ log(DEBUG,"SetModeParam called");
- std::map<char,char*>::iterator n = custom_mode_params.find(mode);
+ CustomModeList::iterator n = custom_mode_params.find(mode);
if (mode_on)
{
- log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
if (n == custom_mode_params.end())
{
custom_mode_params[mode] = strdup(parameter);
+ log(DEBUG,"Custom mode parameter %c %s added",mode,parameter);
+ }
+ else
+ {
+ log(DEBUG, "Tried to set custom mode parameter for %c '%s' when it was already '%s'", mode, parameter, n->second);
}
}
else
}
}
-bool chanrec::IsCustomModeSet(char mode)
+bool chanrec::IsModeSet(char mode)
{
- return custom_modes[mode-65];
+ return modes[mode-65];
}
std::string chanrec::GetModeParameter(char mode)
{
- std::map<char,char*>::iterator n = custom_mode_params.find(mode);
- if (n != custom_mode_params.end())
+ if (mode == 'k')
+ {
+ return this->key;
+ }
+ else if (mode == 'l')
{
- return n->second;
+ return ConvToStr(this->limit);
+ }
+ else
+ {
+ CustomModeList::iterator n = custom_mode_params.find(mode);
+ if (n != custom_mode_params.end())
+ {
+ return n->second;
+ }
+ return "";
}
- return "";
}
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<char*,char*>::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<char*,char*>::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<char*,char*>::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<char*,char*>::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<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;
}
* 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);
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]->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 = 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
* is the first in the channel
else
{
/* Already on the channel */
- if (has_channel(user,Ptr))
+ if (Ptr->HasUser(user))
return NULL;
/*
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;
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);
+ 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);
+ 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 */
}
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;
}
}
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;
}
}
}
else
{
- log(DEBUG,"Overridden checks");
+ 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);
}
}
*/
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;
}
/* 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.");
/* 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);
}
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);
+ log(DEBUG,"Sent JOIN to client");
+ 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);
+ }
+ userlist(user,Ptr);
+ 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;
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);
+ 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;
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))
+ {
+ 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)))
{
- WriteServ(src->fd,"441 %s %s %s :They are not on that channel",src->nick, user->nick, Ptr->name);
- return;
+ 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))
{
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));
+ FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(src,user,this,AC_KICK));
if ((MOD_RESULT == ACR_DENY) && (!is_uline(src->server)))
- return;
+ return this->GetUserCounter();
if ((MOD_RESULT == ACR_DEFAULT) || (!is_uline(src->server)))
{
- if ((cstatus(src,Ptr) < STATUS_HOP) || (cstatus(src,Ptr) < cstatus(user,Ptr)))
+ int them = cstatus(src, this);
+ int us = cstatus(user, this);
+ 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))
- {
- 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;
- }
+ this->WriteChannel(src, "KICK %s %s :%s", this->name, user->nick, reason);
+ (*i)->uc_modes = 0;
+ (*i)->channel = NULL;
+ break;
}
}
- Ptr->DelUser((char*)user);
-
+ if (!this->DelUser(user))
/* if there are no users left on the channel */
- if (!usercount(Ptr))
{
- 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 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);
+ }
+}