extern InspIRCd* ServerInstance;
extern time_t TIME;
extern char lowermap[255];
-static char list[MAXBUF];
extern userrec* fd_ref_table[MAX_DESCRIPTORS];
static char already_sent[MAX_DESCRIPTORS];
extern std::vector<userrec*> all_opers;
{
char textbuffer[MAXBUF];
va_list argsPtr;
- std::map<char*,char*> *ulist;
+ CUList *ulist;
if ((!Ptr) || (!user) || (!text))
{
ulist = Ptr->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- /* XXX - WHAT THE HELL are we doing here? :P --w00t */
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if (otheruser->fd != FD_MAGIC_NUMBER)
- WriteTo_NoFormat(user,otheruser,textbuffer);
+ if (i->second->fd != FD_MAGIC_NUMBER)
+ WriteTo_NoFormat(user,i->second,textbuffer);
}
}
void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text)
{
- std::map<char*,char*> *ulist;
+ CUList *ulist;
if ((!Ptr) || (!user) || (!text))
{
ulist = Ptr->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- /* XXX - .....and here! --w00t */
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if (otheruser->fd != FD_MAGIC_NUMBER)
- WriteTo_NoFormat(user,otheruser,text);
+ if (i->second->fd != FD_MAGIC_NUMBER)
+ WriteTo_NoFormat(user,i->second,text);
}
}
{
char textbuffer[MAXBUF];
va_list argsPtr;
- std::map<char*,char*> *ulist;
+ CUList *ulist;
if ((!Ptr) || (!text))
{
ulist = Ptr->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- /* XXX -- w00t */
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser != user))
+ if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
{
if (!user)
{
- WriteServ_NoFormat(otheruser->fd,textbuffer);
+ WriteServ_NoFormat(i->second->fd,textbuffer);
}
else
{
- WriteTo_NoFormat(user,otheruser,textbuffer);
+ WriteTo_NoFormat(user,i->second,textbuffer);
}
}
}
void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text)
{
- std::map<char*,char*> *ulist;
+ CUList *ulist;
if ((!Ptr) || (!text))
{
ulist = Ptr->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- /* XXX -- w00t */
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser != user))
+ if ((i->second->fd != FD_MAGIC_NUMBER) && (i->second != user))
{
if (!user)
{
- WriteServ_NoFormat(otheruser->fd,text);
+ WriteServ_NoFormat(i->second->fd,text);
}
else
{
- WriteTo_NoFormat(user,otheruser,text);
+ WriteTo_NoFormat(user,i->second,text);
}
}
}
{
char textbuffer[MAXBUF];
va_list argsPtr;
- std::map<char*,char*> *ulist;
+ CUList *ulist;
if ((!Ptr) || (!text))
{
ulist = Ptr->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- /* XXX */
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if (IS_LOCAL(otheruser))
- WriteServ_NoFormat(otheruser->fd,textbuffer);
+ if (IS_LOCAL(i->second))
+ WriteServ_NoFormat(i->second->fd,textbuffer);
}
}
void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text)
{
- std::map<char*,char*> *ulist;
+ CUList *ulist;
if ((!Ptr) || (!text))
{
ulist = Ptr->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- /* XXX */
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if (IS_LOCAL(otheruser))
- WriteServ_NoFormat(otheruser->fd,text);
+ if (IS_LOCAL(i->second))
+ WriteServ_NoFormat(i->second->fd,text);
}
}
{
char textbuffer[MAXBUF];
va_list argsPtr;
- std::map<char*,char*> *ulist;
+ CUList *ulist;
if ((!Ptr) || (!user) || (!text))
{
log(DEBUG,"%d users to write to",ulist->size());
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- /* XXX */
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if ((IS_LOCAL(otheruser)) && (user != otheruser))
- WriteFrom_NoFormat(otheruser->fd,user,textbuffer);
+ if ((IS_LOCAL(i->second)) && (user != i->second))
+ WriteFrom_NoFormat(i->second->fd,user,textbuffer);
}
}
void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text)
{
- std::map<char*,char*> *ulist;
+ CUList *ulist;
if ((!Ptr) || (!user) || (!text))
{
break;
}
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- /* XXX */
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if ((IS_LOCAL(otheruser)) && (user != otheruser))
- WriteFrom_NoFormat(otheruser->fd,user,text);
+ if ((IS_LOCAL(i->second)) && (user != i->second))
+ WriteFrom_NoFormat(i->second->fd,user,text);
}
}
char textbuffer[MAXBUF];
va_list argsPtr;
bool sent_to_at_least_one = false;
- unsigned int y;
if (!u)
{
// FIX: Stops a message going to the same person more than once
memset(&already_sent,0,MAX_DESCRIPTORS);
- y = u->chans.size();
- for (unsigned int i = 0; i < y; i++)
+ for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
{
- if (u->chans[i].channel)
+ if (((ucrec*)(*v))->channel)
{
- std::map<char*,char*> *ulist= u->chans[i].channel->GetUsers();
+ CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
+ if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
{
- already_sent[otheruser->fd] = 1;
- WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
+ already_sent[i->second->fd] = 1;
+ WriteFrom_NoFormat(i->second->fd,u,textbuffer);
sent_to_at_least_one = true;
}
}
void WriteCommon_NoFormat(userrec *u, const char* text)
{
bool sent_to_at_least_one = false;
- unsigned int y;
if (!u)
{
// FIX: Stops a message going to the same person more than once
memset(&already_sent,0,MAX_DESCRIPTORS);
- y = u->chans.size();
- for (unsigned int i = 0; i < y; i++)
+ for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
{
- if (u->chans[i].channel)
+ if (((ucrec*)(*v))->channel)
{
- std::map<char*,char*> *ulist= u->chans[i].channel->GetUsers();
+ CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
+ if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
{
- already_sent[otheruser->fd] = 1;
- WriteFrom_NoFormat(otheruser->fd,u,text);
+ already_sent[i->second->fd] = 1;
+ WriteFrom_NoFormat(i->second->fd,u,text);
sent_to_at_least_one = true;
}
}
bool quit_munge = false;
va_list argsPtr;
int total;
- unsigned int y;
if (!u)
{
/* Yeah yeah, this is ugly. But its fast, live with it. */
char* check = textbuffer;
- /* XXX - don't mean to be picky, but I think this could be done better */
if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':'))
{
std::stringstream split(check);
}
memset(&already_sent,0,MAX_DESCRIPTORS);
- y = u->chans.size();
- for (unsigned int i = 0; i < y; i++)
+ for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
{
- if (u->chans[i].channel)
+ if (((ucrec*)(*v))->channel)
{
- std::map<char*,char*> *ulist= u->chans[i].channel->GetUsers();
+ CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if (u != otheruser)
+ if (u != i->second)
{
- if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
+ if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
{
- already_sent[otheruser->fd] = 1;
+ already_sent[i->second->fd] = 1;
if (quit_munge)
{
- WriteFrom_NoFormat(otheruser->fd,u,*otheruser->oper ? oper_quit : textbuffer);
+ WriteFrom_NoFormat(i->second->fd,u,*i->second->oper ? oper_quit : textbuffer);
}
else
- WriteFrom_NoFormat(otheruser->fd,u,textbuffer);
+ WriteFrom_NoFormat(i->second->fd,u,textbuffer);
}
}
}
void WriteCommonExcept_NoFormat(userrec *u, const char* text)
{
- unsigned int y;
-
if (!u)
{
log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter");
}
memset(&already_sent,0,MAX_DESCRIPTORS);
- y = u->chans.size();
- for (unsigned int i = 0; i < y; i++)
+ for (std::vector<ucrec*>::const_iterator v = u->chans.begin(); v != u->chans.end(); v++)
{
- if (u->chans[i].channel)
+ if (((ucrec*)(*v))->channel)
{
- std::map<char*,char*> *ulist= u->chans[i].channel->GetUsers();
+ CUList *ulist= ((ucrec*)(*v))->channel->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
-
- if (u != otheruser)
+ if (u != i->second)
{
- if ((otheruser->fd > -1) && (!already_sent[otheruser->fd]))
+ if ((i->second->fd > -1) && (!already_sent[i->second->fd]))
{
- already_sent[otheruser->fd] = 1;
- WriteFrom_NoFormat(otheruser->fd,u,text);
+ already_sent[i->second->fd] = 1;
+ WriteFrom_NoFormat(i->second->fd,u,text);
}
}
}
}
-/* XXX - replace with a call to WriteMode() ? -- w00t */
+/* XXX - We don't use WriteMode for this because WriteMode is very slow and
+ * this isnt. Basically WriteMode has to iterate ALL the users 'n' times for
+ * the number of modes provided, e.g. if you send WriteMode 'og' to write to
+ * opers with globops, and you have 2000 users, thats 4000 iterations. WriteOpers
+ * uses the oper list, which means if you have 2000 users but only 5 opers,
+ * it iterates 5 times.
+ */
void WriteOpers(char* text, ...)
{
char textbuffer[MAXBUF];
if (IS_LOCAL(a))
{
- if (strchr(a->modes,'s'))
+ if (a->modebits & UM_SERVERNOTICE)
{
// send server notices to all with +s
WriteServ(a->fd,"NOTICE %s :%s",a->nick,textbuffer);
return;
char textbuffer[MAXBUF];
+ char formatbuffer[MAXBUF];
va_list argsPtr;
va_start (argsPtr, text);
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
+ snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+
for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
userrec* t = (userrec*)(*i);
- WriteServ(t->fd,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+ WriteServ_NoFormat(t->fd,formatbuffer);
}
}
return;
char textbuffer[MAXBUF];
+ char formatbuffer[MAXBUF];
va_list argsPtr;
va_start (argsPtr, text);
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
+ snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+
for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
userrec* t = (userrec*)(*i);
- WriteServ(t->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+ WriteServ_NoFormat(t->fd,formatbuffer);
}
}
void NoticeAll(userrec *source, bool local_only, char* text, ...)
{
char textbuffer[MAXBUF];
+ char formatbuffer[MAXBUF];
va_list argsPtr;
if ((!text) || (!source))
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
+ snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer);
+
for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
userrec* t = (userrec*)(*i);
- WriteFrom(t->fd,source,"NOTICE $* :%s",textbuffer);
+ WriteFrom_NoFormat(t->fd,source,formatbuffer);
}
}
void WriteWallOps(userrec *source, bool local_only, char* text, ...)
{
char textbuffer[MAXBUF];
+ char formatbuffer[MAXBUF];
va_list argsPtr;
if ((!text) || (!source))
vsnprintf(textbuffer, MAXBUF, text, argsPtr);
va_end(argsPtr);
+ snprintf(formatbuffer,MAXBUF,"WALLOPS :%s",textbuffer);
+
for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
{
userrec* t = (userrec*)(*i);
- if ((IS_LOCAL(t)) && (strchr(t->modes,'w')))
+ if ((IS_LOCAL(t)) && (t->modebits & UM_WALLOPS))
{
- WriteTo(source,t,"WALLOPS :%s",textbuffer);
+ WriteTo_NoFormat(source,t,formatbuffer);
}
}
}
/* Find a user record by nickname and return a pointer to it */
-userrec* Find(std::string nick)
+userrec* Find(const std::string &nick)
{
user_hash::iterator iter = clientlist.find(nick);
void purge_empty_chans(userrec* u)
{
- int purge = 0;
+ std::vector<chanrec*> to_delete;
// firstly decrement the count on each channel
- for (unsigned int f = 0; f < u->chans.size(); f++)
+ for (std::vector<ucrec*>::iterator f = u->chans.begin(); f != u->chans.end(); f++)
{
- if (u->chans[f].channel)
+ if (((ucrec*)(*f))->channel)
{
- u->chans[f].channel->DelUser((char*)u);
+ if (((ucrec*)(*f))->channel->DelUser(u) == 0)
+ {
+ /* No users left in here, mark it for deletion */
+ to_delete.push_back(((ucrec*)(*f))->channel);
+ ((ucrec*)(*f))->channel = NULL;
+ }
}
}
- for (unsigned int i = 0; i < u->chans.size(); i++)
+ log(DEBUG,"purge_empty_chans: %d channels to delete",to_delete.size());
+
+ for (std::vector<chanrec*>::iterator n = to_delete.begin(); n != to_delete.end(); n++)
{
- if (u->chans[i].channel)
+ chanrec* thischan = (chanrec*)*n;
+ chan_hash::iterator i2 = chanlist.find(thischan->name);
+ if (i2 != chanlist.end())
{
- if (!usercount(u->chans[i].channel))
- {
- chan_hash::iterator i2 = chanlist.find(u->chans[i].channel->name);
-
- /* kill the record */
- if (i2 != chanlist.end())
- {
- log(DEBUG,"del_channel: destroyed: %s",i2->second->name);
-
- if (i2->second)
- {
- FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
- delete i2->second;
- }
-
- chanlist.erase(i2);
- purge++;
- u->chans[i].channel = NULL;
- }
- }
- else
- {
- log(DEBUG,"skipped purge for %s",u->chans[i].channel->name);
- }
+ FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second));
+ delete i2->second;
+ chanlist.erase(i2);
}
}
- log(DEBUG,"completed channel purge, killed %lu",(unsigned long)purge);
- DeleteOper(u);
+ if (*u->oper)
+ DeleteOper(u);
}
static char scratch[MAXBUF];
static char sparam[MAXBUF];
char* offset = scratch;
+ std::string extparam = "";
if (!chan)
{
*scratch = '\0';
*sparam = '\0';
- if (chan->binarymodes & CM_NOEXTERNAL)
- *offset++ = 'n';
- if (chan->binarymodes & CM_TOPICLOCK)
- *offset++ = 't';
- if (*chan->key)
- *offset++ = 'k';
- if (chan->limit)
- *offset++ = 'l';
- if (chan->binarymodes & CM_INVITEONLY)
- *offset++ = 'i';
- if (chan->binarymodes & CM_MODERATED)
- *offset++ = 'm';
- if (chan->binarymodes & CM_SECRET)
- *offset++ = 's';
- if (chan->binarymodes & CM_PRIVATE)
- *offset++ = 'p';
-
- if (*chan->key)
- {
- snprintf(sparam,MAXBUF," %s",showkey ? chan->key : "<key>");
- }
-
- if (chan->limit)
- {
- char foo[24];
- sprintf(foo," %lu",(unsigned long)chan->limit);
- strlcat(sparam,foo,MAXBUF);
- }
-
- for (int n = 0; n < 190; n++)
+ /* This was still iterating up to 190, chanrec::custom_modes is only 64 elements -- Om */
+ for(int n = 0; n < 64; n++)
{
- if (chan->custom_modes[n])
+ if(chan->modes[n])
{
*offset++ = n+65;
- std::string extparam = chan->GetModeParameter(n+65);
-
+ extparam = "";
+ switch (n)
+ {
+ case CM_KEY:
+ extparam = (showkey ? chan->key : "<key>");
+ break;
+ case CM_LIMIT:
+ extparam = ConvToStr(chan->limit);
+ break;
+ case CM_NOEXTERNAL:
+ case CM_TOPICLOCK:
+ case CM_INVITEONLY:
+ case CM_MODERATED:
+ case CM_SECRET:
+ case CM_PRIVATE:
+ /* We know these have no parameters */
+ break;
+ default:
+ extparam = chan->GetModeParameter(n+65);
+ break;
+ }
if (extparam != "")
{
charlcat(sparam,' ',MAXBUF);
return;
}
- size_t dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
- size_t initial = dlen;
+ char list[MAXBUF];
+ size_t dlen, curlen;
- std::map<char*,char*> *ulist= c->GetUsers();
+ dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
- {
- char* o = i->second;
- userrec* otheruser = (userrec*)o;
+ int numusers = 0;
+ char* ptr = list + dlen;
+
+ CUList *ulist= c->GetUsers();
+
+ /* Improvement by Brain - this doesnt change in value, so why was it inside
+ * the loop?
+ */
+ bool has_user = c->HasUser(user);
- if ((!has_channel(user,c)) && (strchr(otheruser->modes,'i')))
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ {
+ if ((!has_user) && (i->second->modebits & UM_INVISIBLE))
{
/*
* user is +i, and source not on the channel, does not show
continue;
}
- dlen += strlcat(list,cmode(otheruser,c),MAXBUF);
- dlen += strlcat(list,otheruser->nick,MAXBUF);
- charlcat(list,' ',MAXBUF);
- dlen++;
+ size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", cmode(i->second, c), i->second->nick);
+
+ curlen += ptrlen;
+ ptr += ptrlen;
+
+ numusers++;
- if (dlen > (480-NICKMAX))
+ if (curlen > (480-NICKMAX))
{
/* list overflowed into multiple numerics */
WriteServ_NoFormat(user->fd,list);
- dlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+ /* reset our lengths */
+ dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+ ptr = list + dlen;
+
+ ptrlen = 0;
+ numusers = 0;
}
}
/* if whats left in the list isnt empty, send it */
- if (dlen != initial)
+ if (numusers)
{
WriteServ_NoFormat(user->fd,list);
}
if (!c)
return 0;
- std::map<char*,char*> *ulist= c->GetUsers();
- for (std::map<char*,char*>::iterator i = ulist->begin(); i != ulist->end(); i++)
+ CUList *ulist= c->GetUsers();
+ for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- char* o = i->second;
- userrec* user = (userrec*)o;
- if (!strchr(user->modes,'i'))
+ if (!(i->second->modebits & UM_INVISIBLE))
count++;
}
for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
{
- if ((i->second->registered == 7) && (strchr(i->second->modes,'i')))
+ if ((i->second->registered == 7) && (i->second->modebits & UM_INVISIBLE))
c++;
}
if (shift_down)
*mptr = *(mptr+1);
- *mptr++;
+ mptr++;
}
return shift_down;
}
-
projects / user / henk / code / inspircd.git / blobdiff