#include "inspircd.h"
#include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
#include "wildcard.h"
#include "mode.h"
-chanrec::chanrec(InspIRCd* Instance) : ServerInstance(Instance)
+Channel::Channel(InspIRCd* Instance) : ServerInstance(Instance)
{
*name = *topic = *setby = *key = 0;
maxbans = created = topicset = limit = 0;
age = ServerInstance->Time(true);
}
-void chanrec::SetMode(char mode,bool mode_on)
+void Channel::SetMode(char mode,bool mode_on)
{
modes[mode-65] = mode_on;
if (!mode_on)
}
-void chanrec::SetModeParam(char mode,const char* parameter,bool mode_on)
+void Channel::SetModeParam(char mode,const char* parameter,bool mode_on)
{
CustomModeList::iterator n = custom_mode_params.find(mode);
}
}
-bool chanrec::IsModeSet(char mode)
+bool Channel::IsModeSet(char mode)
{
return modes[mode-65];
}
-std::string chanrec::GetModeParameter(char mode)
+std::string Channel::GetModeParameter(char mode)
{
switch (mode)
{
}
}
-long chanrec::GetUserCounter()
+long Channel::GetUserCounter()
{
return (this->internal_userlist.size());
}
-void chanrec::AddUser(userrec* user)
+void Channel::AddUser(User* user)
{
internal_userlist[user] = user->nick;
}
-unsigned long chanrec::DelUser(userrec* user)
+unsigned long Channel::DelUser(User* user)
{
CUListIter a = internal_userlist.find(user);
return internal_userlist.size();
}
-bool chanrec::HasUser(userrec* user)
+bool Channel::HasUser(User* user)
{
return (internal_userlist.find(user) != internal_userlist.end());
}
-void chanrec::AddOppedUser(userrec* user)
+void Channel::AddOppedUser(User* user)
{
internal_op_userlist[user] = user->nick;
}
-void chanrec::DelOppedUser(userrec* user)
+void Channel::DelOppedUser(User* user)
{
CUListIter a = internal_op_userlist.find(user);
if (a != internal_op_userlist.end())
}
}
-void chanrec::AddHalfoppedUser(userrec* user)
+void Channel::AddHalfoppedUser(User* user)
{
internal_halfop_userlist[user] = user->nick;
}
-void chanrec::DelHalfoppedUser(userrec* user)
+void Channel::DelHalfoppedUser(User* user)
{
CUListIter a = internal_halfop_userlist.find(user);
}
}
-void chanrec::AddVoicedUser(userrec* user)
+void Channel::AddVoicedUser(User* user)
{
internal_voice_userlist[user] = user->nick;
}
-void chanrec::DelVoicedUser(userrec* user)
+void Channel::DelVoicedUser(User* user)
{
CUListIter a = internal_voice_userlist.find(user);
}
}
-CUList* chanrec::GetUsers()
+CUList* Channel::GetUsers()
{
return &internal_userlist;
}
-CUList* chanrec::GetOppedUsers()
+CUList* Channel::GetOppedUsers()
{
return &internal_op_userlist;
}
-CUList* chanrec::GetHalfoppedUsers()
+CUList* Channel::GetHalfoppedUsers()
{
return &internal_halfop_userlist;
}
-CUList* chanrec::GetVoicedUsers()
+CUList* Channel::GetVoicedUsers()
{
return &internal_voice_userlist;
}
-void chanrec::SetDefaultModes()
+void Channel::SetDefaultModes()
{
irc::spacesepstream list(ServerInstance->Config->DefaultModes);
- std::string modeseq = list.GetToken();
+ std::string modeseq;
std::string parameter;
- userrec* dummyuser = new userrec(ServerInstance);
- dummyuser->SetFd(FD_MAGIC_NUMBER);
+
+ list.GetToken(modeseq);
for (std::string::iterator n = modeseq.begin(); n != modeseq.end(); ++n)
{
if (mode)
{
if (mode->GetNumParams(true))
- parameter = list.GetToken().c_str();
+ list.GetToken(parameter);
else
parameter.clear();
- mode->OnModeChange(dummyuser, dummyuser, this, parameter, true);
+ mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true);
}
}
-
- delete dummyuser;
}
/*
* add a channel to a user, creating the record for it if needed and linking
* it to the user record
*/
-chanrec* chanrec::JoinUser(InspIRCd* Instance, userrec *user, const char* cn, bool override, const char* key, time_t TS)
+Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool override, const char* key, time_t TS)
{
if (!user || !cn)
return NULL;
- bool new_channel = false;
char cname[MAXBUF];
int MOD_RESULT = 0;
- strlcpy(cname,cn,CHANMAX);
-
std::string privs;
+ Channel *Ptr;
- chanrec* Ptr = Instance->FindChan(cname);
+ /*
+ * We don't restrict the number of channels that remote users or users that are override-joining may be in.
+ * We restrict local users to MaxChans channels.
+ * We restrict local operators to OperMaxChans channels.
+ * This is a lot more logical than how it was formerly. -- w00t
+ */
+ if (IS_LOCAL(user) && !override)
+ {
+ if (user->GetMaxChans())
+ {
+ if (user->chans.size() >= user->GetMaxChans())
+ {
+ user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+ return NULL;
+ }
+ }
+ else
+ {
+ if (IS_OPER(user))
+ {
+ if (user->chans.size() >= Instance->Config->OperMaxChans)
+ {
+ user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+ return NULL;
+ }
+ }
+ else
+ {
+ if (user->chans.size() >= Instance->Config->MaxChans)
+ {
+ user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+ return NULL;
+ }
+ }
+ }
+ }
+
+ strlcpy(cname, cn, CHANMAX);
+ Ptr = Instance->FindChan(cname);
if (!Ptr)
{
if (!IS_LOCAL(user))
{
if (!TS)
- Instance->Log(DEBUG,"*** BUG *** chanrec::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn);
+ Instance->Log(DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn);
}
else
{
}
/* create a new one */
- Ptr = new chanrec(Instance);
+ Ptr = new Channel(Instance);
(*(Instance->chanlist))[cname] = Ptr;
strlcpy(Ptr->name, cname,CHANMAX);
*Ptr->topic = 0;
*Ptr->setby = 0;
Ptr->topicset = 0;
- new_channel = true;
}
else
{
}
}
- /* NOTE: If the user is an oper here, we can extend their user->chans by up to
- * OperMaxchans. For remote users which are not bound by the channel limits,
- * we can extend infinitely. Otherwise, nope, youre restricted to MaxChans.
- */
-
-
-
- /*
- * We place no restrictions on remote users, users that are override-joining, or users that are
- * currently in under MaxChans channels. For all others, they won't get in here. -- w00t
- */
- if (!IS_LOCAL(user) || override == true || user->chans.size() < Instance->Config->MaxChans)
- {
- return chanrec::ForceChan(Instance, Ptr, user, privs);
- }
-
- /*
- * If the above fails, and the user is an oper -- we let them in if they are under OperMaxChans.
- * Otherwise, they're stuck, and need to override to get in, etc. -- w00t
- */
- if (IS_OPER(user))
- {
- if (user->chans.size() < Instance->Config->OperMaxChans)
- {
- return chanrec::ForceChan(Instance, Ptr, user, privs);
- }
- }
-
- user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname);
-
- if (new_channel)
- {
- /* Things went seriously pear shaped, so take this away. bwahaha. */
- chan_hash::iterator n = Instance->chanlist->find(cname);
- if (n != Instance->chanlist->end())
- {
- Ptr->DelUser(user);
- DELETE(Ptr);
- Instance->chanlist->erase(n);
- }
- }
-
- return NULL;
+ return Channel::ForceChan(Instance, Ptr, user, privs);
}
-chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr, userrec* user, const std::string &privs)
+Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs)
{
- userrec* dummyuser = new userrec(Instance);
std::string nick = user->nick;
bool silent = false;
- dummyuser->SetFd(FD_MAGIC_NUMBER);
Ptr->AddUser(user);
/* Just in case they have no permissions */
{
Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
/* Make sure that the mode handler knows this mode was now set */
- mh->OnModeChange(dummyuser, dummyuser, Ptr, nick, true);
+ mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true);
switch (mh->GetPrefix())
{
}
}
- delete dummyuser;
-
FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, silent));
if (!silent)
return Ptr;
}
-bool chanrec::IsBanned(userrec* user)
+bool Channel::IsBanned(User* user)
{
char mask[MAXBUF];
int MOD_RESULT = 0;
return false;
}
-/* chanrec::PartUser
+/* Channel::PartUser
* remove a channel from a users record, and return the number of users left.
- * Therefore, if this function returns 0 the caller should delete the chanrec.
+ * Therefore, if this function returns 0 the caller should delete the Channel.
*/
-long chanrec::PartUser(userrec *user, const char* reason)
+long Channel::PartUser(User *user, const char* reason)
{
bool silent = false;
return this->GetUserCounter();
}
-long chanrec::ServerKickUser(userrec* user, const char* reason, bool triggerevents)
+long Channel::ServerKickUser(User* user, const char* reason, bool triggerevents)
{
bool silent = false;
return this->GetUserCounter();
}
-long chanrec::KickUser(userrec *src, userrec *user, const char* reason)
+long Channel::KickUser(User *src, User *user, const char* reason)
{
bool silent = false;
return this->GetUserCounter();
}
-void chanrec::WriteChannel(userrec* user, char* text, ...)
+void Channel::WriteChannel(User* user, char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteChannel(user, std::string(textbuffer));
}
-void chanrec::WriteChannel(userrec* user, const std::string &text)
+void Channel::WriteChannel(User* user, const std::string &text)
{
CUList *ulist = this->GetUsers();
char tb[MAXBUF];
}
}
-void chanrec::WriteChannelWithServ(const char* ServName, const char* text, ...)
+void Channel::WriteChannelWithServ(const char* ServName, const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteChannelWithServ(ServName, std::string(textbuffer));
}
-void chanrec::WriteChannelWithServ(const char* ServName, const std::string &text)
+void Channel::WriteChannelWithServ(const char* ServName, const std::string &text)
{
CUList *ulist = this->GetUsers();
char tb[MAXBUF];
/* 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, bool serversource, char status, char* text, ...)
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
}
-void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, char* text, ...)
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteAllExcept(user, serversource, status, except_list, std::string(textbuffer));
}
-void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, const std::string &text)
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &text)
{
CUList *ulist;
char tb[MAXBUF];
}
}
-void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text)
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text)
{
CUList except_list;
except_list[user] = user->nick;
* 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 Channel::CountInvisible()
{
int count = 0;
CUList *ulist= this->GetUsers();
return count;
}
-char* chanrec::ChanModes(bool showkey)
+char* Channel::ChanModes(bool showkey)
{
static char scratch[MAXBUF];
static char sparam[MAXBUF];
*scratch = '\0';
*sparam = '\0';
- /* This was still iterating up to 190, chanrec::modes is only 64 elements -- Om */
+ /* This was still iterating up to 190, Channel::modes is only 64 elements -- Om */
for(int n = 0; n < 64; n++)
{
if(this->modes[n])
/* 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, CUList *ulist)
+void Channel::UserList(User *user, CUList *ulist)
{
char list[MAXBUF];
size_t dlen, curlen;
if (MOD_RESULT == 1)
return;
- dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
+ dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
int numusers = 0;
char* ptr = list + dlen;
user->WriteServ(std::string(list));
/* reset our lengths */
- dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, this->name);
+ dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
ptr = list + dlen;
ptrlen = 0;
user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
}
-long chanrec::GetMaxBans()
+long Channel::GetMaxBans()
{
/* Return the cached value if there is one */
if (this->maxbans)
return this->maxbans;
}
-void chanrec::ResetMaxBans()
+void Channel::ResetMaxBans()
{
this->maxbans = 0;
}
* % 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)
+const char* Channel::GetPrefixChar(User *user)
{
static char pf[2] = {0, 0};
return pf;
}
-const char* chanrec::GetAllPrefixChars(userrec* user)
+const char* Channel::GetAllPrefixChars(User* user)
{
static char prefix[MAXBUF];
int ctr = 0;
return prefix;
}
-unsigned int chanrec::GetPrefixValue(userrec* user)
+unsigned int Channel::GetPrefixValue(User* user)
{
prefixlist::iterator n = prefixes.find(user);
if (n != prefixes.end())
return 0;
}
-int chanrec::GetStatusFlags(userrec *user)
+int Channel::GetStatusFlags(User *user)
{
UCListIter i = user->chans.find(this);
if (i != user->chans.end())
return 0;
}
-int chanrec::GetStatus(userrec *user)
+int Channel::GetStatus(User *user)
{
if (ServerInstance->ULine(user->server))
return STATUS_OP;
return STATUS_NORMAL;
}
-void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding)
+void Channel::SetPrefix(User* user, char prefix, unsigned int prefix_value, bool adding)
{
prefixlist::iterator n = prefixes.find(user);
prefixtype pfx = std::make_pair(prefix,prefix_value);
{
pfxcontainer one;
one.push_back(pfx);
- prefixes.insert(std::make_pair<userrec*,pfxcontainer>(user, one));
+ prefixes.insert(std::make_pair<User*,pfxcontainer>(user, one));
}
}
else
}
}
-void chanrec::RemoveAllPrefixes(userrec* user)
+void Channel::RemoveAllPrefixes(User* user)
{
prefixlist::iterator n = prefixes.find(user);
if (n != prefixes.end())
projects / user / henk / code / inspircd.git / blobdiff