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;
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);
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;
+
+ dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+ int numusers = 0;
+ char* ptr = list + dlen;
CUList *ulist= c->GetUsers();
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if ((!has_user) && (strchr(i->second->modes,'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(i->second,c),MAXBUF);
- dlen += strlcat(list,i->second->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);
}
CUList *ulist= c->GetUsers();
for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
{
- if (!strchr(i->second->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++;
}