X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=6b7178e225b9f9b9b25f8bcd54e4cf15801531f5;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=3bc2bb79aed664196b9a4bf46d4c1f8ffd0996f1;hpb=4c65d06850f4440498ee37387d7b578478a619aa;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 3bc2bb79a..6b7178e22 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -56,12 +56,14 @@ extern InspIRCd* ServerInstance; extern time_t TIME; extern char lowermap[255]; static char list[MAXBUF]; -extern userrec* fd_ref_table[65536]; -static char already_sent[65536]; +extern userrec* fd_ref_table[MAX_DESCRIPTORS]; +static char already_sent[MAX_DESCRIPTORS]; extern std::vector all_opers; extern user_hash clientlist; extern chan_hash chanlist; +extern std::vector local_users; + void log(int level,char *text, ...) { va_list argsPtr; @@ -73,11 +75,11 @@ void log(int level,char *text, ...) if (Config->log_file) { - char b[MAXBUF]; + char b[26]; va_start (argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - strlcpy(b,asctime(timeinfo),MAXBUF); + strlcpy(b,asctime(timeinfo),26); b[24] = ':'; // we know this is the end of the time string if (Config->log_file) fprintf(Config->log_file,"%s %s\n",b,textbuffer); @@ -121,9 +123,39 @@ void readfile(file_cache &F, const char* fname) log(DEBUG,"readfile: loaded %s, %lu lines",fname,(unsigned long)F.size()); } +void Write_NoFormat(int sock, const char *text) +{ + if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS)) + return; + + char tb[MAXBUF]; + int bytes = snprintf(tb,MAXBUF,"%s\r\n",text); + chop(tb); + if (fd_ref_table[sock]) + { + if (Config->GetIOHook(fd_ref_table[sock]->port)) + { + try + { + Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + } + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ + } + } + else + { + fd_ref_table[sock]->AddWriteBuf(tb); + } + ServerInstance->stats->statsSent += bytes; + } + else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); +} + void Write(int sock,char *text, ...) { - if (sock < 0) + if ((sock < 0) || (sock > MAX_DESCRIPTORS)) return; if (!text) { @@ -141,7 +173,14 @@ void Write(int sock,char *text, ...) { if (Config->GetIOHook(fd_ref_table[sock]->port)) { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + try + { + Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + } + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ + } } else { @@ -152,11 +191,40 @@ void Write(int sock,char *text, ...) else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); } +void WriteServ_NoFormat(int sock, const char* text) +{ + if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS)) + return; + char tb[MAXBUF]; + int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text); + chop(tb); + if (fd_ref_table[sock]) + { + if (Config->GetIOHook(fd_ref_table[sock]->port)) + { + try + { + Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + } + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ + } + } + else + { + fd_ref_table[sock]->AddWriteBuf(tb); + } + ServerInstance->stats->statsSent += bytes; + } + else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); +} + /* write a server formatted numeric response to a single socket */ void WriteServ(int sock, char* text, ...) { - if (sock < 0) + if ((sock < 0) || (sock > MAX_DESCRIPTORS)) return; if (!text) { @@ -174,7 +242,14 @@ void WriteServ(int sock, char* text, ...) { if (Config->GetIOHook(fd_ref_table[sock]->port)) { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + try + { + Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + } + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ + } } else { @@ -185,11 +260,40 @@ void WriteServ(int sock, char* text, ...) else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); } +void WriteFrom_NoFormat(int sock, userrec *user, const char* text) +{ + if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS)) + return; + char tb[MAXBUF]; + int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text); + chop(tb); + if (fd_ref_table[sock]) + { + if (Config->GetIOHook(fd_ref_table[sock]->port)) + { + try + { + Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + } + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ + } + } + else + { + fd_ref_table[sock]->AddWriteBuf(tb); + } + ServerInstance->stats->statsSent += bytes; + } + else log(DEFAULT,"ERROR! attempted write to a user with no fd_ref_table entry!!!"); +} + /* write text from an originating user to originating user */ void WriteFrom(int sock, userrec *user,char* text, ...) { - if (sock < 0) + if ((sock < 0) || (sock > MAX_DESCRIPTORS)) return; if ((!text) || (!user)) { @@ -201,13 +305,20 @@ void WriteFrom(int sock, userrec *user,char* text, ...) char textbuffer[MAXBUF],tb[MAXBUF]; vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - int bytes = snprintf(tb,MAXBUF,":%s!%s@%s %s\r\n",user->nick,user->ident,user->dhost,textbuffer); + int bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer); chop(tb); if (fd_ref_table[sock]) { if (Config->GetIOHook(fd_ref_table[sock]->port)) { - Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + try + { + Config->GetIOHook(fd_ref_table[sock]->port)->OnRawSocketWrite(sock,tb,bytes); + } + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ + } } else { @@ -227,7 +338,7 @@ void WriteTo(userrec *source, userrec *dest,char *data, ...) log(DEFAULT,"*** BUG *** WriteTo was given an invalid parameter"); return; } - if (dest->fd == FD_MAGIC_NUMBER) + if (!IS_LOCAL(dest)) return; char textbuffer[MAXBUF],tb[MAXBUF]; va_list argsPtr; @@ -239,14 +350,28 @@ void WriteTo(userrec *source, userrec *dest,char *data, ...) // if no source given send it from the server. if (!source) { - WriteServ(dest->fd,":%s %s",Config->ServerName,textbuffer); + WriteServ_NoFormat(dest->fd,textbuffer); } else { - WriteFrom(dest->fd,source,"%s",textbuffer); + WriteFrom_NoFormat(dest->fd,source,textbuffer); } } +void WriteTo_NoFormat(userrec *source, userrec *dest, const char *data) +{ + if ((!dest) || (!data)) + return; + if (!source) + { + WriteServ_NoFormat(dest->fd,data); + } + else + { + WriteFrom_NoFormat(dest->fd,source,data); + } +} + /* write formatted text from a source user to all users on a channel * including the sender (NOT for privmsg, notice etc!) */ @@ -263,17 +388,34 @@ void WriteChannel(chanrec* Ptr, userrec* user, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - std::vector *ulist = Ptr->GetUsers(); - unsigned int x = ulist->size(); - for (unsigned int j = 0; j < x; j++) + std::map *ulist= Ptr->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[j]; + char* o = i->second; userrec* otheruser = (userrec*)o; if (otheruser->fd != FD_MAGIC_NUMBER) - WriteTo(user,otheruser,"%s",textbuffer); + WriteTo_NoFormat(user,otheruser,textbuffer); } } +void WriteChannel_NoFormat(chanrec* Ptr, userrec* user, const char* text) +{ + if ((!Ptr) || (!user) || (!text)) + { + log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); + return; + } + std::map *ulist= Ptr->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + { + char* o = i->second; + userrec* otheruser = (userrec*)o; + if (otheruser->fd != FD_MAGIC_NUMBER) + WriteTo_NoFormat(user,otheruser,text); + } +} + + /* write formatted text from a source user to all users on a channel * including the sender (NOT for privmsg, notice etc!) doesnt send to * users on remote servers */ @@ -291,26 +433,53 @@ void WriteChannelLocal(chanrec* Ptr, userrec* user, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - std::vector *ulist = Ptr->GetUsers(); - unsigned int x = ulist->size(); - for (unsigned int j = 0; j < x; j++) + std::map *ulist= Ptr->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[j]; + char* o = i->second; userrec* otheruser = (userrec*)o; - if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser->fd != -1) && (otheruser != user)) + if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser != user)) { if (!user) { - WriteServ(otheruser->fd,"%s",textbuffer); + WriteServ_NoFormat(otheruser->fd,textbuffer); } else { - WriteTo(user,otheruser,"%s",textbuffer); + WriteTo_NoFormat(user,otheruser,textbuffer); } } } } +void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text) +{ + if ((!Ptr) || (!text)) + { + log(DEFAULT,"*** BUG *** WriteChannel was given an invalid parameter"); + return; + } + std::map *ulist= Ptr->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + { + char* o = i->second; + userrec* otheruser = (userrec*)o; + if ((otheruser->fd != FD_MAGIC_NUMBER) && (otheruser != user)) + { + if (!user) + { + WriteServ_NoFormat(otheruser->fd,text); + } + else + { + WriteTo_NoFormat(user,otheruser,text); + } + } + } +} + + + void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) { if ((!Ptr) || (!text)) @@ -325,21 +494,39 @@ void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) va_end(argsPtr); - std::vector *ulist = Ptr->GetUsers(); - unsigned int x = ulist->size(); - for (unsigned int j = 0; j < x; j++) + std::map *ulist= Ptr->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[j]; + char* o = i->second; userrec* otheruser = (userrec*)o; - if (otheruser->fd != FD_MAGIC_NUMBER) - WriteServ(otheruser->fd,"%s",textbuffer); + if (IS_LOCAL(otheruser)) + WriteServ_NoFormat(otheruser->fd,textbuffer); } } +void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text) +{ + if ((!Ptr) || (!text)) + { + log(DEFAULT,"*** BUG *** WriteChannelWithServ was given an invalid parameter"); + return; + } + std::map *ulist= Ptr->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + { + char* o = i->second; + userrec* otheruser = (userrec*)o; + if (IS_LOCAL(otheruser)) + WriteServ_NoFormat(otheruser->fd,text); + } +} + + + /* write formatted text from a source user to all users on a channel except * for the sender (for privmsg etc) */ -void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...) +void ChanExceptSender(chanrec* Ptr, userrec* user, char status, char* text, ...) { if ((!Ptr) || (!user) || (!text)) { @@ -352,21 +539,68 @@ void ChanExceptSender(chanrec* Ptr, userrec* user, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - std::vector *ulist = Ptr->GetUsers(); - unsigned int x = ulist->size(); - for (unsigned int j = 0; j < x; j++) + std::map *ulist; + switch (status) + { + case '@': + ulist = Ptr->GetOppedUsers(); + break; + case '%': + ulist = Ptr->GetHalfoppedUsers(); + break; + case '+': + ulist = Ptr->GetVoicedUsers(); + break; + default: + ulist = Ptr->GetUsers(); + break; + } + log(DEBUG,"%d users to write to",ulist->size()); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + { + char* o = i->second; + userrec* otheruser = (userrec*)o; + if ((IS_LOCAL(otheruser)) && (user != otheruser)) + WriteFrom_NoFormat(otheruser->fd,user,textbuffer); + } +} + +void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const char* text) +{ + if ((!Ptr) || (!user) || (!text)) { - char* o = (*ulist)[j]; + log(DEFAULT,"*** BUG *** ChanExceptSender was given an invalid parameter"); + return; + } + std::map *ulist; + switch (status) + { + case '@': + ulist = Ptr->GetOppedUsers(); + break; + case '%': + ulist = Ptr->GetHalfoppedUsers(); + break; + case '+': + ulist = Ptr->GetVoicedUsers(); + break; + default: + ulist = Ptr->GetUsers(); + break; + } + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + { + char* o = i->second; userrec* otheruser = (userrec*)o; - if ((otheruser->fd != FD_MAGIC_NUMBER) && (user != otheruser)) - WriteFrom(otheruser->fd,user,"%s",textbuffer); + if ((IS_LOCAL(otheruser)) && (user != otheruser)) + WriteFrom_NoFormat(otheruser->fd,user,text); } } std::string GetServerDescription(char* servername) { std::string description = ""; - FOREACH_MOD OnGetServerDescription(servername,description); + FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description)); if (description != "") { return description; @@ -400,7 +634,7 @@ void WriteCommon(userrec *u, char* text, ...) va_end(argsPtr); // FIX: Stops a message going to the same person more than once - memset(&already_sent,0,MAXCLIENTS); + memset(&already_sent,0,MAX_DESCRIPTORS); bool sent_to_at_least_one = false; @@ -409,16 +643,59 @@ void WriteCommon(userrec *u, char* text, ...) { if (u->chans[i].channel) { - std::vector *ulist = u->chans[i].channel->GetUsers(); - unsigned int x = ulist->size(); - for (unsigned int j = 0; j < x; j++) + std::map *ulist= u->chans[i].channel->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + { + char* o = i->second; + userrec* otheruser = (userrec*)o; + if ((otheruser->fd > -1) && (!already_sent[otheruser->fd])) + { + already_sent[otheruser->fd] = 1; + WriteFrom_NoFormat(otheruser->fd,u,textbuffer); + sent_to_at_least_one = true; + } + } + } + } + // if the user was not in any channels, no users will receive the text. Make sure the user + // receives their OWN message for WriteCommon + if (!sent_to_at_least_one) + { + WriteFrom_NoFormat(u->fd,u,textbuffer); + } +} + +void WriteCommon_NoFormat(userrec *u, const char* text) +{ + if (!u) + { + log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter"); + return; + } + + if (u->registered != 7) { + log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); + return; + } + // FIX: Stops a message going to the same person more than once + memset(&already_sent,0,MAX_DESCRIPTORS); + + bool sent_to_at_least_one = false; + + unsigned int y = u->chans.size(); + for (unsigned int i = 0; i < y; i++) + { + if (u->chans[i].channel) + { + std::map *ulist= u->chans[i].channel->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[j]; + char* o = i->second; userrec* otheruser = (userrec*)o; if ((otheruser->fd > -1) && (!already_sent[otheruser->fd])) { already_sent[otheruser->fd] = 1; - WriteFrom(otheruser->fd,u,"%s",textbuffer); + WriteFrom_NoFormat(otheruser->fd,u,text); sent_to_at_least_one = true; } } @@ -428,10 +705,11 @@ void WriteCommon(userrec *u, char* text, ...) // receives their OWN message for WriteCommon if (!sent_to_at_least_one) { - WriteFrom(u->fd,u,"%s",textbuffer); + WriteFrom_NoFormat(u->fd,u,text); } } + /* write a formatted string to all users who share at least one common * channel, NOT including the source user e.g. for use in QUIT */ @@ -449,30 +727,63 @@ void WriteCommonExcept(userrec *u, char* text, ...) } char textbuffer[MAXBUF]; + char oper_quit[MAXBUF]; + bool quit_munge = false; + va_list argsPtr; va_start (argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); + int total = vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - memset(&already_sent,0,MAXCLIENTS); + if ((Config->HideSplits) && (total > 6)) + { + /* Yeah yeah, this is ugly. But its fast, live with it. */ + char* check = textbuffer; + if ((*check++ == 'Q') && (*check++ == 'U') && (*check++ == 'I') && (*check++ == 'T') && (*check++ == ' ') && (*check++ == ':')) + { + std::stringstream split(check); + std::string server_one; + std::string server_two; + split >> server_one; + split >> server_two; + if ((FindServerName(server_one)) && (FindServerName(server_two))) + { + strlcpy(oper_quit,textbuffer,MAXBUF); + strlcpy(check,"*.net *.split",MAXQUIT); + quit_munge = true; + } + } + } + + memset(&already_sent,0,MAX_DESCRIPTORS); unsigned int y = u->chans.size(); for (unsigned int i = 0; i < y; i++) { if (u->chans[i].channel) { - std::vector *ulist = u->chans[i].channel->GetUsers(); - unsigned int x = ulist->size(); - for (unsigned int j = 0; j < x; j++) + std::map *ulist= u->chans[i].channel->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[j]; + char* o = i->second; userrec* otheruser = (userrec*)o; if (u != otheruser) { if ((otheruser->fd > -1) && (!already_sent[otheruser->fd])) { already_sent[otheruser->fd] = 1; - WriteFrom(otheruser->fd,u,"%s",textbuffer); + if (quit_munge) + { + if (*otheruser->oper) + { + WriteFrom_NoFormat(otheruser->fd,u,oper_quit); + } + else + { + WriteFrom_NoFormat(otheruser->fd,u,textbuffer); + } + } + else WriteFrom_NoFormat(otheruser->fd,u,textbuffer); } } } @@ -480,6 +791,46 @@ void WriteCommonExcept(userrec *u, char* text, ...) } } +void WriteCommonExcept_NoFormat(userrec *u, const char* text) +{ + if (!u) + { + log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter"); + return; + } + + if (u->registered != 7) { + log(DEFAULT,"*** BUG *** WriteCommon on an unregistered user"); + return; + } + + memset(&already_sent,0,MAX_DESCRIPTORS); + + unsigned int y = u->chans.size(); + for (unsigned int i = 0; i < y; i++) + { + if (u->chans[i].channel) + { + std::map *ulist= u->chans[i].channel->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) + { + char* o = i->second; + userrec* otheruser = (userrec*)o; + if (u != otheruser) + { + if ((otheruser->fd > -1) && (!already_sent[otheruser->fd])) + { + already_sent[otheruser->fd] = 1; + WriteFrom_NoFormat(otheruser->fd,u,text); + } + } + } + } + } +} + + + void WriteOpers(char* text, ...) { if (!text) @@ -497,7 +848,7 @@ void WriteOpers(char* text, ...) for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) { userrec* a = *i; - if ((a) && (a->fd != FD_MAGIC_NUMBER)) + if (IS_LOCAL(a)) { if (strchr(a->modes,'s')) { @@ -519,12 +870,10 @@ void ServerNoticeAll(char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - WriteServ(i->second->fd,"NOTICE $%s :%s",Config->ServerName,textbuffer); - } + userrec* t = (userrec*)(*i); + WriteServ(t->fd,"NOTICE $%s :%s",Config->ServerName,textbuffer); } } @@ -539,12 +888,10 @@ void ServerPrivmsgAll(char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - WriteServ(i->second->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); - } + userrec* t = (userrec*)(*i); + WriteServ(t->fd,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); } } @@ -563,41 +910,37 @@ void WriteMode(const char* modes, int flags, const char* text, ...) va_end(argsPtr); int modelen = strlen(modes); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) + userrec* t = (userrec*)(*i); + bool send_to_user = false; + if (flags == WM_AND) { - bool send_to_user = false; - - if (flags == WM_AND) + send_to_user = true; + for (int n = 0; n < modelen; n++) { - send_to_user = true; - for (int n = 0; n < modelen; n++) + if (!hasumode(t,modes[n])) { - if (!hasumode(i->second,modes[n])) - { - send_to_user = false; - break; - } + send_to_user = false; + break; } } - else if (flags == WM_OR) + } + else if (flags == WM_OR) + { + send_to_user = false; + for (int n = 0; n < modelen; n++) { - send_to_user = false; - for (int n = 0; n < modelen; n++) + if (hasumode(t,modes[n])) { - if (hasumode(i->second,modes[n])) - { - send_to_user = true; - break; - } + send_to_user = true; + break; } } - - if (send_to_user) - { - WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,textbuffer); - } + } + if (send_to_user) + { + WriteServ(t->fd,"NOTICE %s :%s",t->nick,textbuffer); } } } @@ -616,12 +959,10 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) - { - WriteFrom(i->second->fd,source,"NOTICE $* :%s",textbuffer); - } + userrec* t = (userrec*)(*i); + WriteFrom(t->fd,source,"NOTICE $* :%s",textbuffer); } } @@ -641,14 +982,12 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - if ((i->second) && (i->second->fd != FD_MAGIC_NUMBER)) + userrec* t = (userrec*)(*i); + if ((IS_LOCAL(t)) && (strchr(t->modes,'w'))) { - if (strchr(i->second->modes,'w')) - { - WriteTo(source,i->second,"WALLOPS :%s",textbuffer); - } + WriteTo(source,t,"WALLOPS :%s",textbuffer); } } } @@ -685,6 +1024,18 @@ userrec* Find(std::string nick) return iter->second; } +userrec* Find(const char* nick) +{ + if (!nick) + return NULL; + user_hash::iterator iter = clientlist.find(nick); + + if (iter == clientlist.end()) + return NULL; + + return iter->second; +} + /* find a channel record by channel name and return a pointer to it */ chanrec* FindChan(const char* chan) @@ -746,7 +1097,10 @@ void purge_empty_chans(userrec* u) { 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; @@ -764,7 +1118,7 @@ void purge_empty_chans(userrec* u) } -char* chanmodes(chanrec *chan) +char* chanmodes(chanrec *chan, bool showkey) { static char scratch[MAXBUF]; static char sparam[MAXBUF]; @@ -796,7 +1150,9 @@ char* chanmodes(chanrec *chan) if (chan->binarymodes & CM_PRIVATE) *offset++ = 'p'; if (*chan->key) - snprintf(sparam,MAXBUF," %s",chan->key); + { + snprintf(sparam,MAXBUF," %s",showkey ? chan->key : ""); + } if (chan->limit) { char foo[24]; @@ -837,10 +1193,10 @@ void userlist(userrec *user,chanrec *c) snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); - std::vector *ulist = c->GetUsers(); - for (unsigned int i = 0; i < ulist->size(); i++) + std::map *ulist= c->GetUsers(); + for (std::map::iterator i = ulist->begin(); i != ulist->end(); i++) { - char* o = (*ulist)[i]; + char* o = i->second; userrec* otheruser = (userrec*)o; if ((!has_channel(user,c)) && (strchr(otheruser->modes,'i'))) { @@ -855,14 +1211,14 @@ void userlist(userrec *user,chanrec *c) { /* list overflowed into * multiple numerics */ - WriteServ(user->fd,"%s",list); + WriteServ_NoFormat(user->fd,list); snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name); } } /* if whats left in the list isnt empty, send it */ if (list[strlen(list)-1] != ':') { - WriteServ(user->fd,"%s",list); + WriteServ_NoFormat(user->fd,list); } } @@ -881,11 +1237,9 @@ int usercount_i(chanrec *c) for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if (i->second) - { if (has_channel(i->second,c)) { - if (isnick(i->second->nick)) + if (i->second->registered == 7) { if ((!has_channel(i->second,c)) && (strchr(i->second->modes,'i'))) { @@ -896,7 +1250,6 @@ int usercount_i(chanrec *c) count++; } } - } } log(DEBUG,"usercount_i: %s %lu",c->name,(unsigned long)count); return count; @@ -905,66 +1258,42 @@ int usercount_i(chanrec *c) int usercount(chanrec *c) { - if (!c) - { - log(DEFAULT,"*** BUG *** usercount was given an invalid parameter"); - return 0; - } - int count = c->GetUserCounter(); - log(DEBUG,"usercount: %s %lu",c->name,(unsigned long)count); - return count; + return (c ? c->GetUserCounter() : 0); } // looks up a users password for their connection class (/ tags) -char* Passwd(userrec *user) +ConnectClass GetClass(userrec *user) { for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) { - if ((i->type == CC_ALLOW) && match(user->host,i->host.c_str())) + if (match(user->host,i->host.c_str())) { - return (char*)i->pass.c_str(); + return *i; } } - return ""; + return *(Config->Classes.begin()); } -bool IsDenied(userrec *user) -{ - for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) - { - if ((i->type == CC_DENY) && match(user->host,i->host.c_str())) - { - return true; - } - } - return false; -} - - - - /* sends out an error notice to all connected clients (not to be used * lightly!) */ void send_error(char *s) { log(DEBUG,"send_error: %s",s); - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - if (IS_LOCAL(i->second)) - { - if (i->second->registered == 7) - { - WriteServ(i->second->fd,"NOTICE %s :%s",i->second->nick,s); - } - else - { - // fix - unregistered connections receive ERROR, not NOTICE - Write(i->second->fd,"ERROR :%s",s); - } - } + userrec* t = (userrec*)(*i); + if (t->registered == 7) + { + WriteServ(t->fd,"NOTICE %s :%s",t->nick,s); + } + else + { + // fix - unregistered connections receive ERROR, not NOTICE + Write(t->fd,"ERROR :%s",s); + } } } @@ -1004,28 +1333,26 @@ int usercount_invisible(void) int c = 0; for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if ((isnick(i->second->nick)) && (strchr(i->second->modes,'i'))) c++; + if ((i->second->registered == 7) && (strchr(i->second->modes,'i'))) c++; } return c; } int usercount_opers(void) { - int c = 0; - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) - { - if ((isnick(i->second->nick)) && (strchr(i->second->modes,'o'))) c++; - } + int c = 0; + for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + if (*i->second->oper) c++; return c; } int usercount_unknown(void) { int c = 0; - - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - if ((i->second->fd > -1) && (i->second->registered != 7)) + userrec* t = (userrec*)(*i); + if (t->registered != 7) c++; } return c; @@ -1039,9 +1366,10 @@ long chancount(void) long local_count() { int c = 0; - for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) + for (std::vector::const_iterator i = local_users.begin(); i != local_users.end(); i++) { - if ((isnick(i->second->nick)) && (i->second->fd > -1)) c++; + userrec* t = (userrec*)(*i); + if (t->registered == 7) c++; } return c; } @@ -1066,7 +1394,15 @@ void ShowMOTD(userrec *user) // only one write operation if (Config->GetIOHook(user->port)) { - Config->GetIOHook(user->port)->OnRawSocketWrite(user->fd,(char*)WholeMOTD.c_str(),WholeMOTD.length()); + try + { + Config->GetIOHook(user->port)->OnRawSocketWrite(user->fd,(char*)WholeMOTD.c_str(),WholeMOTD.length()); + } + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \ + } + } else { @@ -1093,11 +1429,16 @@ void ShowRULES(userrec *user) // registration timeout maximum seconds) bool AllModulesReportReady(userrec* user) { + if (!Config->global_implementation[I_OnCheckReady]) + return true; for (int i = 0; i <= MODCOUNT; i++) { - int res = modules[i]->OnCheckReady(user); - if (!res) - return false; + if (Config->implement_lists[i][I_OnCheckReady]) + { + int res = modules[i]->OnCheckReady(user); + if (!res) + return false; + } } return true; } @@ -1163,3 +1504,59 @@ std::string GetFullProgDir(char** argv, int argc) return otherdir; } +int InsertMode(std::string &output, const char* mode, unsigned short section) +{ + unsigned short currsection = 1; + unsigned int pos = output.find("CHANMODES=", 0) + 10; // +10 for the length of "CHANMODES=" + + if(section > 4 || section == 0) + { + log(DEBUG, "InsertMode: CHANMODES doesn't have a section %dh :/", section); + return 0; + } + + for(; pos < output.size(); pos++) + { + if(section == currsection) + break; + + if(output[pos] == ',') + currsection++; + } + + output.insert(pos, mode); + return 1; +} + +bool IsValidChannelName(const char *chname) +{ + char *c; + + /* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */ + if (!chname || *chname != '#') + { + return false; + } + + c = (char *)chname + 1; + while (*c) + { + switch (*c) + { + case ' ': + case ',': + case 7: + return false; + } + + c++; + } + + /* too long a name - note funky pointer arithmetic here. */ + if ((c - chname) > CHANMAX) + { + return false; + } + + return true; +}