X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=02a23c0acf73ad33137d80a35db158ce54b7afdb;hb=c4458ecc70025aeac7ca87115ed0a698e7bbcdad;hp=77a74c32c111d6b2ceea501d2f2d15fff28b8158;hpb=fc9e00f49299cb3b402406b5f185d5f4af1e9780;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 77a74c32c..02a23c0ac 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -3,13 +3,13 @@ * +------------------------------------+ * * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * E-mail: + * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -51,7 +51,7 @@ extern InspIRCd* ServerInstance; extern time_t TIME; extern char lowermap[255]; extern userrec* fd_ref_table[MAX_DESCRIPTORS]; -static char already_sent[MAX_DESCRIPTORS]; +static unsigned long already_sent[MAX_DESCRIPTORS] = {0}; extern std::vector all_opers; extern user_hash clientlist; extern chan_hash chanlist; @@ -63,6 +63,9 @@ extern std::vector local_users; static char TIMESTR[26]; static time_t LAST = 0; +/* XXX: Used for speeding up WriteCommon operations */ +unsigned long uniq_id = 0; + /** log() * Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level' * is greater than the configured loglevel. @@ -161,7 +164,6 @@ void Write_NoFormat(int sock, const char *text) if (fd_ref_table[sock]) { bytes = snprintf(tb,MAXBUF,"%s\r\n",text); - chop(tb); if (Config->GetIOHook(fd_ref_table[sock]->port)) { @@ -210,7 +212,6 @@ void Write(int sock, char *text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer); - chop(tb); if (Config->GetIOHook(fd_ref_table[sock]->port)) { @@ -247,7 +248,6 @@ void WriteServ_NoFormat(int sock, const char* text) if (fd_ref_table[sock]) { bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text); - chop(tb); if (Config->GetIOHook(fd_ref_table[sock]->port)) { @@ -312,7 +312,6 @@ void WriteFrom_NoFormat(int sock, userrec *user, const char* text) if (fd_ref_table[sock]) { bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text); - chop(tb); if (Config->GetIOHook(fd_ref_table[sock]->port)) { @@ -360,7 +359,6 @@ void WriteFrom(int sock, userrec *user,char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer); - chop(tb); if (Config->GetIOHook(fd_ref_table[sock]->port)) { @@ -403,7 +401,6 @@ void WriteTo(userrec *source, userrec *dest,char *data, ...) va_start(argsPtr, data); vsnprintf(textbuffer, MAXBUF, data, argsPtr); va_end(argsPtr); - chop(textbuffer); // if no source given send it from the server. if (!source) @@ -712,8 +709,8 @@ void WriteCommon(userrec *u, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - // FIX: Stops a message going to the same person more than once - memset(&already_sent,0,MAX_DESCRIPTORS); + // XXX: Save on memset calls by using an ID. This clever trick thought of during discussion with nazzy and w00t. + uniq_id++; for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { @@ -723,9 +720,9 @@ void WriteCommon(userrec *u, char* text, ...) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((i->second->fd > -1) && (!already_sent[i->second->fd])) + if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id)) { - already_sent[i->second->fd] = 1; + already_sent[i->second->fd] = uniq_id; WriteFrom_NoFormat(i->second->fd,u,textbuffer); sent_to_at_least_one = true; } @@ -759,8 +756,8 @@ void WriteCommon_NoFormat(userrec *u, const char* text) return; } - // FIX: Stops a message going to the same person more than once - memset(&already_sent,0,MAX_DESCRIPTORS); + // XXX: See comment in WriteCommon + uniq_id++; for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { @@ -770,9 +767,9 @@ void WriteCommon_NoFormat(userrec *u, const char* text) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((i->second->fd > -1) && (!already_sent[i->second->fd])) + if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id)) { - already_sent[i->second->fd] = 1; + already_sent[i->second->fd] = uniq_id; WriteFrom_NoFormat(i->second->fd,u,text); sent_to_at_least_one = true; } @@ -860,7 +857,7 @@ void WriteCommonExcept(userrec *u, char* text, ...) } } - memset(&already_sent,0,MAX_DESCRIPTORS); + uniq_id++; for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { @@ -872,9 +869,9 @@ void WriteCommonExcept(userrec *u, char* text, ...) { if (u != i->second) { - if ((i->second->fd > -1) && (!already_sent[i->second->fd])) + if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id)) { - already_sent[i->second->fd] = 1; + already_sent[i->second->fd] = uniq_id; if (quit_munge) { @@ -903,7 +900,7 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text) return; } - memset(&already_sent,0,MAX_DESCRIPTORS); + uniq_id++; for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { @@ -915,9 +912,9 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text) { if (u != i->second) { - if ((i->second->fd > -1) && (!already_sent[i->second->fd])) + if ((i->second->fd > -1) && (already_sent[i->second->fd] != uniq_id)) { - already_sent[i->second->fd] = 1; + already_sent[i->second->fd] = uniq_id; WriteFrom_NoFormat(i->second->fd,u,text); } } @@ -1217,13 +1214,14 @@ void purge_empty_chans(userrec* u) // firstly decrement the count on each channel for (std::vector::iterator f = u->chans.begin(); f != u->chans.end(); f++) { - if (((ucrec*)(*f))->channel) + ucrec* uc = (ucrec*)(*f); + if (uc->channel) { - if (((ucrec*)(*f))->channel->DelUser(u) == 0) + if (uc->channel->DelUser(u) == 0) { /* No users left in here, mark it for deletion */ - to_delete.push_back(((ucrec*)(*f))->channel); - ((ucrec*)(*f))->channel = NULL; + to_delete.push_back(uc->channel); + uc->channel = NULL; } } } @@ -1553,44 +1551,17 @@ long local_count() void ShowMOTD(userrec *user) { - static char mbuf[MAXBUF]; - static char crud[MAXBUF]; - std::string WholeMOTD = ""; - if (!Config->MOTD.size()) { WriteServ(user->fd,"422 %s :Message of the day file is missing.",user->nick); return; } - - snprintf(crud,MAXBUF,":%s 372 %s :- ", Config->ServerName, user->nick); - snprintf(mbuf,MAXBUF,":%s 375 %s :- %s message of the day\r\n", Config->ServerName, user->nick, Config->ServerName); - WholeMOTD = WholeMOTD + mbuf; + WriteServ(user->fd,"375 %s :%s message of the day", user->nick, Config->ServerName); for (unsigned int i = 0; i < Config->MOTD.size(); i++) - WholeMOTD = WholeMOTD + std::string(crud) + Config->MOTD[i].c_str() + std::string("\r\n"); - - snprintf(mbuf,MAXBUF,":%s 376 %s :End of message of the day.\r\n", Config->ServerName, user->nick); - WholeMOTD = WholeMOTD + mbuf; - - // only one write operation - if (Config->GetIOHook(user->port)) - { - try - { - Config->GetIOHook(user->port)->OnRawSocketWrite(user->fd,(char*)WholeMOTD.c_str(),WholeMOTD.length()); - } - catch (ModuleException& modexcept) - { - log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); - } - } - else - { - user->AddWriteBuf(WholeMOTD); - } + WriteServ(user->fd,"372 %s :- %s",user->nick,Config->MOTD[i].c_str()); - ServerInstance->stats->statsSent += WholeMOTD.length(); + WriteServ(user->fd,"376 %s :End of message of the day.", user->nick); } void ShowRULES(userrec *user) @@ -1900,7 +1871,7 @@ void LoadAllModules(InspIRCd* ServerInstance) Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF); printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken); - if (!ServerInstance->LoadModule(configToken)) + if (!ServerInstance->LoadModule(configToken)) { log(DEFAULT,"Exiting due to a module loader error."); printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError());