* ---------------------------------------------------
*/
-/* $Core */
-
#include "inspircd.h"
#include <stdarg.h>
#include "socketengine.h"
#include "bancache.h"
#include "commands/cmd_whowas.h"
-static unsigned long uniq_id = 1;
-
-static unsigned long* already_sent = NULL;
-
-void InitializeAlreadySent(SocketEngine* SE)
+typedef unsigned int uniq_id_t;
+class sent
{
- already_sent = new unsigned long[SE->GetMaxFds()];
- memset(already_sent, 0, SE->GetMaxFds() * sizeof(unsigned long));
-}
+ uniq_id_t uniq_id;
+ uniq_id_t* array;
+ void init()
+ {
+ if (!array)
+ array = new uniq_id_t[ServerInstance->SE->GetMaxFds()];
+ memset(array, 0, ServerInstance->SE->GetMaxFds() * sizeof(uniq_id_t));
+ uniq_id++;
+ }
+ public:
+ sent() : uniq_id(static_cast<uniq_id_t>(-1)), array(NULL) {}
+ inline uniq_id_t operator++()
+ {
+ if (++uniq_id == 0)
+ init();
+ return uniq_id;
+ }
+ inline uniq_id_t& operator[](int i)
+ {
+ return array[i];
+ }
+ ~sent()
+ {
+ delete array;
+ }
+};
+
+static sent already_sent;
std::string User::ProcessNoticeMasks(const char *sm)
{
char textbuffer[MAXBUF];
va_list argsPtr;
- if (this->registered != REG_ALL || !IS_LOCAL(this) || quitting)
+ if (this->registered != REG_ALL || quitting)
return;
int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
char textbuffer[MAXBUF];
va_list argsPtr;
- if (this->registered != REG_ALL || !IS_LOCAL(this) || quitting)
+ if (this->registered != REG_ALL || quitting)
return;
int len = snprintf(textbuffer,MAXBUF,":%s ",this->GetFullHost().c_str());
void User::WriteCommonRaw(const std::string &line, bool include_self)
{
- if (this->registered != REG_ALL || !IS_LOCAL(this) || quitting)
+ if (this->registered != REG_ALL || quitting)
return;
- if (!already_sent)
- InitializeAlreadySent(ServerInstance->SE);
- uniq_id++;
+ uniq_id_t uniq_id = ++already_sent;
UserChanList include_c(chans);
std::map<User*,bool> exceptions;
if (this->registered != REG_ALL)
return;
- uniq_id++;
-
- if (!already_sent)
- InitializeAlreadySent(ServerInstance->SE);
+ uniq_id_t uniq_id = ++already_sent;
snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),normal_text.c_str());
snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost().c_str(),oper_text.c_str());
if (!ServerInstance->Config->CycleHosts)
return;
- uniq_id++;
-
- if (!already_sent)
- InitializeAlreadySent(ServerInstance->SE);
+ uniq_id_t silent_id = ++already_sent;
+ uniq_id_t seen_id = ++already_sent;
UserChanList include_c(chans);
std::map<User*,bool> exceptions;
User* u = i->first;
if (IS_LOCAL(u) && !u->quitting)
{
- already_sent[u->fd] = uniq_id;
if (i->second)
+ {
+ already_sent[u->fd] = seen_id;
u->Write(quitline);
+ }
+ else
+ {
+ already_sent[u->fd] = silent_id;
+ }
}
}
for (UCListIter v = include_c.begin(); v != include_c.end(); ++v)
User* u = i->first;
if (u == this || !IS_LOCAL(u))
continue;
+ if (already_sent[u->fd] == silent_id)
+ continue;
- if (already_sent[i->first->fd] != uniq_id)
+ if (already_sent[u->fd] != seen_id)
{
u->Write(quitline);
- already_sent[i->first->fd] = uniq_id;
+ already_sent[i->first->fd] = seen_id;
}
u->Write(joinline);
if (modeline.length() > 0)