X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=6412175b1666da23799d5414bd4310463af9c33f;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=f728516f90752b45b59f1cd720ce281c8d078092;hpb=c2a5839bcbd6bebf0dd102a8dfd283e92c8a0507;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index f728516f9..6412175b1 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -14,25 +14,17 @@ * --------------------------------------------------- */ -using namespace std; - +#include #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include +#include #include #include -#ifdef GCC3 -#include -#else -#include -#endif #include -#include -#include -#include #include "connection.h" #include "users.h" #include "ctables.h" @@ -50,18 +42,19 @@ using namespace std; #include "typedefs.h" extern int MODCOUNT; -extern std::vector modules; +extern ModuleList modules; extern ServerConfig *Config; 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 all_opers; extern user_hash clientlist; extern chan_hash chanlist; +char LOG_FILE[MAXBUF]; + extern std::vector local_users; static char TIMESTR[26]; @@ -76,7 +69,8 @@ void log(int level, char *text, ...) va_list argsPtr; char textbuffer[MAXBUF]; - if (level < Config->LogLevel) + /* If we were given -debug we output all messages, regardless of configured loglevel */ + if ((level < Config->LogLevel) && !Config->forcedebug) return; if (TIME != LAST) @@ -94,13 +88,13 @@ void log(int level, char *text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - if (Config->log_file) + if (Config->writelog) fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer); - - if (Config->nofork) - { - printf("%s %s\n", TIMESTR, textbuffer); - } + } + + if (Config->nofork) + { + printf("%s %s\n", TIMESTR, textbuffer); } } @@ -276,8 +270,6 @@ void WriteServ(int sock, char* text, ...) { va_list argsPtr; char textbuffer[MAXBUF]; - char tb[MAXBUF]; - int bytes; if ((sock < 0) || (sock > MAX_DESCRIPTORS)) return; @@ -291,31 +283,8 @@ void WriteServ(int sock, char* text, ...) va_start(argsPtr, text); vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); - bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,textbuffer); - 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 caught: %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!!!"); + + WriteServ_NoFormat(sock, textbuffer); } /** WriteFrom_NoFormat() @@ -715,7 +684,6 @@ void WriteCommon(userrec *u, char* text, ...) char textbuffer[MAXBUF]; va_list argsPtr; bool sent_to_at_least_one = false; - unsigned int y; if (!u) { @@ -735,13 +703,12 @@ void WriteCommon(userrec *u, char* text, ...) // 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::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { - if (u->chans[i].channel) + if (((ucrec*)(*v))->channel) { - CUList *ulist= u->chans[i].channel->GetUsers(); + CUList *ulist= ((ucrec*)(*v))->channel->GetUsers(); for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { @@ -768,7 +735,6 @@ void WriteCommon(userrec *u, char* text, ...) void WriteCommon_NoFormat(userrec *u, const char* text) { bool sent_to_at_least_one = false; - unsigned int y; if (!u) { @@ -784,13 +750,12 @@ void WriteCommon_NoFormat(userrec *u, const char* text) // 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::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { - if (u->chans[i].channel) + if (((ucrec*)(*v))->channel) { - CUList *ulist= u->chans[i].channel->GetUsers(); + CUList *ulist= ((ucrec*)(*v))->channel->GetUsers(); for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { @@ -826,7 +791,6 @@ void WriteCommonExcept(userrec *u, char* text, ...) bool quit_munge = false; va_list argsPtr; int total; - unsigned int y; if (!u) { @@ -886,13 +850,12 @@ void WriteCommonExcept(userrec *u, char* text, ...) } memset(&already_sent,0,MAX_DESCRIPTORS); - y = u->chans.size(); - for (unsigned int i = 0; i < y; i++) + for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { - if (u->chans[i].channel) + if (((ucrec*)(*v))->channel) { - CUList *ulist= u->chans[i].channel->GetUsers(); + CUList *ulist= ((ucrec*)(*v))->channel->GetUsers(); for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { @@ -917,8 +880,6 @@ void WriteCommonExcept(userrec *u, char* text, ...) void WriteCommonExcept_NoFormat(userrec *u, const char* text) { - unsigned int y; - if (!u) { log(DEFAULT,"*** BUG *** WriteCommon was given an invalid parameter"); @@ -932,13 +893,12 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text) } memset(&already_sent,0,MAX_DESCRIPTORS); - y = u->chans.size(); - for (unsigned int i = 0; i < y; i++) + for (std::vector::const_iterator v = u->chans.begin(); v != u->chans.end(); v++) { - if (u->chans[i].channel) + if (((ucrec*)(*v))->channel) { - CUList *ulist= u->chans[i].channel->GetUsers(); + CUList *ulist= ((ucrec*)(*v))->channel->GetUsers(); for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { @@ -963,7 +923,7 @@ void WriteCommonExcept_NoFormat(userrec *u, const char* text) * uses the oper list, which means if you have 2000 users but only 5 opers, * it iterates 5 times. */ -void WriteOpers(char* text, ...) +void WriteOpers(const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -978,16 +938,27 @@ void WriteOpers(char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + WriteOpers_NoFormat(textbuffer); +} + +void WriteOpers_NoFormat(const char* text) +{ + if (!text) + { + log(DEFAULT,"*** BUG *** WriteOpers_NoFormat was given an invalid parameter"); + return; + } + for (std::vector::iterator i = all_opers.begin(); i != all_opers.end(); i++) { userrec* a = *i; 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); + WriteServ(a->fd,"NOTICE %s :%s",a->nick,text); } } } @@ -999,15 +970,18 @@ void ServerNoticeAll(char* text, ...) 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::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); } } @@ -1017,15 +991,18 @@ void ServerPrivmsgAll(char* text, ...) 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,"PRIVMSG $%s :%s",Config->ServerName,textbuffer); + for (std::vector::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); } } @@ -1088,6 +1065,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...) void NoticeAll(userrec *source, bool local_only, char* text, ...) { char textbuffer[MAXBUF]; + char formatbuffer[MAXBUF]; va_list argsPtr; if ((!text) || (!source)) @@ -1100,10 +1078,12 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + snprintf(formatbuffer,MAXBUF,"NOTICE $* :%s",textbuffer); + for (std::vector::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); } } @@ -1111,6 +1091,7 @@ void NoticeAll(userrec *source, bool local_only, char* text, ...) void WriteWallOps(userrec *source, bool local_only, char* text, ...) { char textbuffer[MAXBUF]; + char formatbuffer[MAXBUF]; va_list argsPtr; if ((!text) || (!source)) @@ -1123,13 +1104,15 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...) vsnprintf(textbuffer, MAXBUF, text, argsPtr); va_end(argsPtr); + snprintf(formatbuffer,MAXBUF,"WALLOPS :%s",textbuffer); + for (std::vector::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); } } } @@ -1148,13 +1131,13 @@ void strlower(char *n) if (n) { for (char* t = n; *t; t++) - *t = lowermap[(unsigned)*t]; + *t = lowermap[(unsigned char)*t]; } } /* 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); @@ -1218,24 +1201,24 @@ long GetMaxBans(char* name) void purge_empty_chans(userrec* u) { - int purge = 0; std::vector to_delete; // firstly decrement the count on each channel for (std::vector::iterator f = u->chans.begin(); f != u->chans.end(); f++) { - ucrec* (ucrec*)*f; - if (f->channel) + if (((ucrec*)(*f))->channel) { - if (f->channel->DelUser(u) == 0) + if (((ucrec*)(*f))->channel->DelUser(u) == 0) { /* No users left in here, mark it for deletion */ - to_delete.push_back(f->channel); - f->channel = NULL; + to_delete.push_back(((ucrec*)(*f))->channel); + ((ucrec*)(*f))->channel = NULL; } } } + log(DEBUG,"purge_empty_chans: %d channels to delete",to_delete.size()); + for (std::vector::iterator n = to_delete.begin(); n != to_delete.end(); n++) { chanrec* thischan = (chanrec*)*n; @@ -1258,6 +1241,7 @@ char* chanmodes(chanrec *chan, bool showkey) static char scratch[MAXBUF]; static char sparam[MAXBUF]; char* offset = scratch; + std::string extparam = ""; if (!chan) { @@ -1269,43 +1253,33 @@ char* chanmodes(chanrec *chan, bool showkey) *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 : ""); - } - - if (chan->limit) - { - char foo[24]; - sprintf(foo," %lu",(unsigned long)chan->limit); - strlcat(sparam,foo,MAXBUF); - } - /* 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 : ""); + 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); @@ -1332,8 +1306,13 @@ void userlist(userrec *user,chanrec *c) 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(); @@ -1344,7 +1323,7 @@ void userlist(userrec *user,chanrec *c) 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 @@ -1353,21 +1332,29 @@ void userlist(userrec *user,chanrec *c) 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; - if (dlen > (480-NICKMAX)) + numusers++; + + 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); } @@ -1387,7 +1374,7 @@ int usercount_i(chanrec *c) 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++; } @@ -1476,7 +1463,7 @@ int usercount_invisible(void) 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++; } @@ -1489,7 +1476,7 @@ int usercount_opers(void) for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if (i->second->oper) + if (*(i->second->oper)) c++; } return c; @@ -1606,6 +1593,34 @@ bool AllModulesReportReady(userrec* user) return true; } +/* Make Sure Modules Are Avaliable! + * (BugFix By Craig.. See? I do work! :p) + * Modified by brain, requires const char* + * to work with other API functions + */ + +/* XXX - Needed? */ +bool FileExists (const char* file) +{ + FILE *input; + if ((input = fopen (file, "r")) == NULL) + { + return(false); + } + else + { + fclose (input); + return(true); + } +} + +char* CleanFilename(char* name) +{ + char* p = name + strlen(name); + while ((p != name) && (*p != '/')) p--; + return (p != name ? ++p : p); +} + bool DirValid(char* dirandfile) { char work[MAXBUF]; @@ -1785,3 +1800,77 @@ bool charremove(char* mp, char remove) return shift_down; } + +void OpenLog(char** argv, int argc) +{ + if (!*LOG_FILE) + { + if (Config->logpath == "") + { + Config->logpath = GetFullProgDir(argv,argc) + "/ircd.log"; + } + } + else + { + Config->log_file = fopen(LOG_FILE,"a+"); + + if (!Config->log_file) + { + printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); + Exit(ERROR); + } + + return; + } + + Config->log_file = fopen(Config->logpath.c_str(),"a+"); + + if (!Config->log_file) + { + printf("ERROR: Could not write to logfile %s, bailing!\n\n",Config->logpath.c_str()); + Exit(ERROR); + } +} + +void CheckRoot() +{ + if (geteuid() == 0) + { + printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n"); + log(DEFAULT,"InspIRCd: startup: not starting with UID 0!"); + Exit(ERROR); + } +} + +void CheckDie() +{ + if (*Config->DieValue) + { + printf("WARNING: %s\n\n",Config->DieValue); + log(DEFAULT,"Uh-Oh, somebody didn't read their config file: '%s'",Config->DieValue); + Exit(ERROR); + } +} + +/* We must load the modules AFTER initializing the socket engine, now */ +void LoadAllModules(InspIRCd* ServerInstance) +{ + char configToken[MAXBUF]; + Config->module_names.clear(); + MODCOUNT = -1; + + for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++) + { + 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)) + { + log(DEFAULT,"Exiting due to a module loader error."); + printf("\nThere was an error loading a module: %s\n\n",ServerInstance->ModuleError()); + Exit(0); + } + } + + log(DEFAULT,"Total loaded modules: %lu",(unsigned long)MODCOUNT+1); +}