created = topicset = limit = 0;
internal_userlist.clear();
memset(&modes,0,64);
+ age = ServerInstance->Time(true);
}
void chanrec::SetMode(char mode,bool mode_on)
if (!user || !cn)
return NULL;
- int created = 0;
+ bool new_channel = false;
char cname[MAXBUF];
int MOD_RESULT = 0;
strlcpy(cname,cn,CHANMAX);
+ std::string privs;
+
chanrec* Ptr = Instance->FindChan(cname);
if (!Ptr)
{
- if (IS_LOCAL(user))
+ privs = "@";
+
+ if (IS_LOCAL(user) && override == false)
{
MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname));
+ FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,NULL,cname,privs));
if (MOD_RESULT == 1)
return NULL;
}
Instance->chanlist[cname] = Ptr;
strlcpy(Ptr->name, cname,CHANMAX);
- Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1;
+
+ /* As spotted by jilles, dont bother to set this on remote users */
+ if (IS_LOCAL(user))
+ Ptr->modes[CM_TOPICLOCK] = Ptr->modes[CM_NOEXTERNAL] = 1;
+
Ptr->created = Instance->Time();
*Ptr->topic = 0;
*Ptr->setby = 0;
Ptr->topicset = 0;
Instance->Log(DEBUG,"chanrec::JoinUser(): created: %s",cname);
- /*
- * set created to 2 to indicate user
- * is the first in the channel
- * and should be given ops
- */
- created = 2;
+ new_channel = true;
}
else
{
* remote users are allowed us to bypass channel modes
* and bans (used by servers)
*/
- if (IS_LOCAL(user)) /* was a check on fd > -1 */
+ if (IS_LOCAL(user) && override == false)
{
MOD_RESULT = 0;
- FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname));
+ FOREACH_RESULT_I(Instance,I_OnUserPreJoin,OnUserPreJoin(user,Ptr,cname,privs));
if (MOD_RESULT == 1)
{
return NULL;
}
if (Ptr->bans.size())
{
- MOD_RESULT = 0;
- 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)
+ if (Ptr->IsBanned(user))
{
- if (Ptr->IsBanned(user))
- {
- user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
- return NULL;
- }
+ user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+ return NULL;
}
}
}
{
Instance->Log(DEBUG,"chanrec::JoinUser(): Overridden checks");
}
- created = 1;
}
for (UserChanList::const_iterator index = user->chans.begin(); index != user->chans.end(); index++)
{
if ((*index)->channel == NULL)
{
- return chanrec::ForceChan(Instance, Ptr, *index, user, created);
+ return chanrec::ForceChan(Instance, Ptr, *index, user, privs);
}
}
* and put the channel in here. Same for remote users which are not bound by
* the channel limits. Otherwise, nope, youre boned.
*/
- if (!IS_LOCAL(user)) /* was a check on fd < 0 */
+ if (!IS_LOCAL(user) || override == true) /* was a check on fd < 0 */
{
ucrec* a = new ucrec();
- chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created);
+ chanrec* c = chanrec::ForceChan(Instance, Ptr, a, user, privs);
user->chans.push_back(a);
return c;
}
if (user->chans.size() < OPERMAXCHANS)
{
ucrec* a = new ucrec();
- chanrec* c = chanrec::ForceChan(Instance, Ptr,a,user,created);
+ chanrec* c = chanrec::ForceChan(Instance, Ptr, a, user, privs);
user->chans.push_back(a);
return c;
}
user->WriteServ("405 %s %s :You are on too many channels",user->nick, cname);
- if (created == 2)
+ if (new_channel)
{
Instance->Log(DEBUG,"BLAMMO, Whacking channel.");
/* Things went seriously pear shaped, so take this away. bwahaha. */
return NULL;
}
-chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, int created)
+chanrec* chanrec::ForceChan(InspIRCd* Instance, chanrec* Ptr,ucrec *a,userrec* user, const std::string &privs)
{
- if (created == 2)
- {
- /* first user in is given ops */
- a->uc_modes = UCMODE_OP;
- Ptr->AddOppedUser(user);
- Ptr->SetPrefix(user, '@', OP_VALUE, true);
- }
- else
- {
- a->uc_modes = 0;
- }
+ userrec* dummyuser = new userrec(Instance);
+ std::string nick = user->nick;
+
+ a->uc_modes = 0;
+ dummyuser->SetFd(FD_MAGIC_NUMBER);
a->channel = Ptr;
Ptr->AddUser(user);
user->ModChannelCount(1);
+
+ for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++)
+ {
+ const char status = *x;
+ ModeHandler* mh = Instance->Modes->FindPrefix(status);
+ if (mh)
+ {
+ 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);
+ }
+ }
+
+ delete dummyuser;
+
Ptr->WriteChannel(user,"JOIN :%s",Ptr->name);
+ /* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */
+ std::string ms = Instance->Modes->ModeString(user, Ptr);
+ if ((Ptr->GetUserCounter() > 1) && (ms.length()))
+ Ptr->WriteAllExceptSender(user, true, 0, "MODE %s +%s", Ptr->name, ms.c_str());
+
/* Major improvement by Brain - we dont need to be calculating all this pointlessly for remote users */
if (IS_LOCAL(user))
{
Ptr->UserList(user);
}
FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user,Ptr));
+ FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user,Ptr));
return Ptr;
}
bool chanrec::IsBanned(userrec* user)
{
char mask[MAXBUF];
- sprintf(mask,"%s!%s@%s",user->nick, user->ident, user->GetIPString());
- for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
+ int MOD_RESULT = 0;
+ FOREACH_RESULT(I_OnCheckBan,OnCheckBan(user, this));
+ if (!MOD_RESULT)
{
- /* 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)))
+ snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
+ for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
{
- return true;
+ /* 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)))
+ {
+ return true;
+ }
}
-
}
return false;
}
/* chanrec::PartUser
- * remove a channel from a users record, and remove the record from the hash
- * if the channel has become empty
+ * 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.
*/
long chanrec::PartUser(userrec *user, const char* reason)
{
/* zap it from the channel list of the user */
if (user->chans[i]->channel == this)
{
- if (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, this, ""));
- this->WriteChannel(user, "PART :%s", this->name);
- }
+ FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason ? reason : ""));
+ this->WriteChannel(user, "PART %s%s%s", this->name, reason ? " :" : "", reason ? reason : "");
user->chans[i]->uc_modes = 0;
user->chans[i]->channel = NULL;
user->ModChannelCount(-1);
int us = this->GetStatus(user);
if ((them < STATUS_HOP) || (them < us))
{
- if (them == STATUS_HOP)
- {
- src->WriteServ("482 %s %s :You must be a channel operator",src->nick, this->name);
- }
- else
- {
- src->WriteServ("482 %s %s :You must be at least a half-operator",src->nick, this->name);
- }
+ src->WriteServ("482 %s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-");
return this->GetUserCounter();
}
}
this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
}
-void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text)
+void chanrec::WriteAllExcept(userrec* user, bool serversource, char status, CUList &except_list, char* text, ...)
+{
+ char textbuffer[MAXBUF];
+ va_list argsPtr;
+
+ if (!text)
+ return;
+
+ va_start(argsPtr, text);
+ vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+ va_end(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)
{
CUList *ulist;
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if ((IS_LOCAL(i->second)) && (user != i->second))
+ if ((IS_LOCAL(i->second)) && (except_list.find(i->second) == except_list.end()))
{
if (serversource)
i->second->WriteServ(text);
}
}
+void chanrec::WriteAllExceptSender(userrec* user, bool serversource, char status, const std::string& text)
+{
+ CUList except_list;
+ except_list[user] = user;
+ this->WriteAllExcept(user, serversource, status, except_list, std::string(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
*scratch = '\0';
*sparam = '\0';
- /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
+ /* This was still iterating up to 190, chanrec::modes is only 64 elements -- Om */
for(int n = 0; n < 64; n++)
{
if(this->modes[n])
size_t dlen, curlen;
int MOD_RESULT = 0;
+ if (!IS_LOCAL(user))
+ return;
+
FOREACH_RESULT(I_OnUserList,OnUserList(user, this));
ServerInstance->Log(DEBUG,"MOD_RESULT for UserList = %d",MOD_RESULT);
if (MOD_RESULT == 1)
long chanrec::GetMaxBans()
{
- std::string x;
for (std::map<std::string,int>::iterator n = ServerInstance->Config->maxbans.begin(); n != ServerInstance->Config->maxbans.end(); n++)
{
- x = n->first;
- if (match(this->name,x.c_str()))
+ if (match(this->name,n->first.c_str()))
{
return n->second;
}
*/
const char* chanrec::GetPrefixChar(userrec *user)
{
- static char px[2];
- unsigned int mx = 0;
-
- *px = 0;
- *(px+1) = 0;
-
+ static char pf[2] = {0, 0};
+
prefixlist::iterator n = prefixes.find(user);
if (n != prefixes.end())
{
- for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+ if (n->second.size())
{
- if (x->second > mx)
- {
- *px = x->first;
- mx = x->second;
- }
+ /* If the user has any prefixes, their highest prefix
+ * will always be at the head of the list, as the list is
+ * sorted in rank order highest first (see SetPrefix()
+ * for reasons why)
+ */
+ *pf = n->second.begin()->first;
+ return pf;
}
}
- return px;
+ *pf = 0;
+ return pf;
}
const char* chanrec::GetAllPrefixChars(userrec* user)
unsigned int chanrec::GetPrefixValue(userrec* user)
{
- unsigned int mx = 0;
-
prefixlist::iterator n = prefixes.find(user);
if (n != prefixes.end())
{
- for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
- {
- if (x->second > mx)
- mx = x->second;
- }
+ if (n->second.size())
+ return n->second.begin()->second;
}
-
- return mx;
+ return 0;
}
return STATUS_NORMAL;
}
-/*bool ModeParser::PrefixComparison(const prefixtype one, const prefixtype two)
-{
- return one.second > two.second;
-}*/
-
void chanrec::SetPrefix(userrec* user, char prefix, unsigned int prefix_value, bool adding)
{
prefixlist::iterator n = prefixes.find(user);
if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end())
{
n->second.push_back(pfx);
+ /* We must keep prefixes in rank order, largest first.
+ * This is for two reasons, firstly because x-chat *ass-u-me's* this
+ * state, and secondly it turns out to be a benefit to us later.
+ * See above in GetPrefix().
+ */
std::sort(n->second.begin(), n->second.end(), ModeParser::PrefixComparison);
}
}
n->second.erase(x);
}
}
+ ServerInstance->Log(DEBUG,"Added prefix %c to %s for %s, prefixlist size is now %d", prefix, this->name, user->nick, prefixes.size());
}
void chanrec::RemoveAllPrefixes(userrec* user)
{
prefixlist::iterator n = prefixes.find(user);
if (n != prefixes.end())
+ {
+ ServerInstance->Log(DEBUG,"Removed prefixes from %s for %s, prefixlist size is now %d", this->name, user->nick, prefixes.size());
prefixes.erase(n);
+ }
}
projects / user / henk / code / inspircd.git / blobdiff