X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=77a74c32c111d6b2ceea501d2f2d15fff28b8158;hb=db07867e945deb72ce103f796e20104a27c5f68a;hp=46a85da2cd1bbde36455b4ed5e0d91b59754a55d;hpb=e21c3bb1408eea41d8f7c6dfbe2a58d023feada7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 46a85da2c..77a74c32c 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -14,25 +14,20 @@ * --------------------------------------------------- */ -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 +#ifdef HAS_EXECINFO +#include +#endif #include "connection.h" #include "users.h" #include "ctables.h" @@ -50,7 +45,7 @@ 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; @@ -72,7 +67,7 @@ static time_t LAST = 0; * Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level' * is greater than the configured loglevel. */ -void log(int level, char *text, ...) +void do_log(int level, const char *text, ...) { va_list argsPtr; char textbuffer[MAXBUF]; @@ -97,7 +92,10 @@ void log(int level, char *text, ...) va_end(argsPtr); if (Config->writelog) + { fprintf(Config->log_file,"%s %s\n",TIMESTR,textbuffer); + fflush(Config->log_file); + } } if (Config->nofork) @@ -160,11 +158,11 @@ void Write_NoFormat(int sock, const char *text) if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS)) return; - bytes = snprintf(tb,MAXBUF,"%s\r\n",text); - chop(tb); - if (fd_ref_table[sock]) { + bytes = snprintf(tb,MAXBUF,"%s\r\n",text); + chop(tb); + if (Config->GetIOHook(fd_ref_table[sock]->port)) { try @@ -205,14 +203,15 @@ void Write(int sock, char *text, ...) return; } - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - bytes = snprintf(tb,MAXBUF,"%s\r\n",textbuffer); - chop(tb); - if (fd_ref_table[sock]) { + + va_start(argsPtr, 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)) { try @@ -245,11 +244,11 @@ void WriteServ_NoFormat(int sock, const char* text) if ((sock < 0) || (!text) || (sock > MAX_DESCRIPTORS)) return; - bytes = snprintf(tb,MAXBUF,":%s %s\r\n",Config->ServerName,text); - chop(tb); - 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)) { try @@ -278,8 +277,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; @@ -290,34 +287,14 @@ void WriteServ(int sock, char* text, ...) return; } + if (!fd_ref_table[sock]) + return; + 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() @@ -332,11 +309,11 @@ void WriteFrom_NoFormat(int sock, userrec *user, const char* text) if ((sock < 0) || (!text) || (!user) || (sock > MAX_DESCRIPTORS)) return; - bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),text); - chop(tb); - 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)) { try @@ -376,14 +353,15 @@ void WriteFrom(int sock, userrec *user,char* text, ...) return; } - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - bytes = snprintf(tb,MAXBUF,":%s %s\r\n",user->GetFullHost(),textbuffer); - chop(tb); - if (fd_ref_table[sock]) { + + va_start(argsPtr, 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)) { try @@ -569,7 +547,7 @@ void WriteChannelLocal_NoFormat(chanrec* Ptr, userrec* user, const char* text) -void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) +void WriteChannelWithServ(const char* ServName, chanrec* Ptr, const char* text, ...) { char textbuffer[MAXBUF]; va_list argsPtr; @@ -594,7 +572,7 @@ void WriteChannelWithServ(char* ServName, chanrec* Ptr, char* text, ...) } } -void WriteChannelWithServ_NoFormat(char* ServName, chanrec* Ptr, const char* text) +void WriteChannelWithServ_NoFormat(const char* ServName, chanrec* Ptr, const char* text) { CUList *ulist; @@ -692,7 +670,7 @@ void ChanExceptSender_NoFormat(chanrec* Ptr, userrec* user, char status, const c } } -std::string GetServerDescription(char* servername) +std::string GetServerDescription(const char* servername) { std::string description = ""; @@ -988,7 +966,7 @@ void WriteOpers_NoFormat(const char* text) if (IS_LOCAL(a)) { - if (a->modebits & UM_SERVERNOTICE) + if (a->modes[UM_SERVERNOTICE]) { // send server notices to all with +s WriteServ(a->fd,"NOTICE %s :%s",a->nick,text); @@ -1067,7 +1045,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...) for (int n = 0; n < modelen; n++) { - if (!hasumode(t,modes[n])) + if (!t->modes[modes[n]-65]) { send_to_user = false; break; @@ -1080,7 +1058,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...) for (int n = 0; n < modelen; n++) { - if (hasumode(t,modes[n])) + if (t->modes[modes[n]-65]) { send_to_user = true; break; @@ -1143,7 +1121,7 @@ void WriteWallOps(userrec *source, bool local_only, char* text, ...) { userrec* t = (userrec*)(*i); - if ((IS_LOCAL(t)) && (t->modebits & UM_WALLOPS)) + if ((IS_LOCAL(t)) && (t->modes[UM_WALLOPS])) { WriteTo_NoFormat(source,t,formatbuffer); } @@ -1259,7 +1237,7 @@ void purge_empty_chans(userrec* u) if (i2 != chanlist.end()) { FOREACH_MOD(I_OnChannelDelete,OnChannelDelete(i2->second)); - delete i2->second; + DELETE(i2->second); chanlist.erase(i2); } } @@ -1323,7 +1301,7 @@ char* chanmodes(chanrec *chan, bool showkey) /* Null terminate scratch */ *offset = '\0'; - strlcat(scratch,sparam,MAXMODES); + strlcat(scratch,sparam,MAXBUF); return scratch; } @@ -1356,7 +1334,7 @@ void userlist(userrec *user,chanrec *c) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if ((!has_user) && (i->second->modebits & UM_INVISIBLE)) + if ((!has_user) && (i->second->modes[UM_INVISIBLE])) { /* * user is +i, and source not on the channel, does not show @@ -1407,7 +1385,7 @@ int usercount_i(chanrec *c) CUList *ulist= c->GetUsers(); for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { - if (!(i->second->modebits & UM_INVISIBLE)) + if (!(i->second->modes[UM_INVISIBLE])) count++; } @@ -1420,12 +1398,16 @@ int usercount(chanrec *c) } -/* looks up a users password for their connection class (/ tags) */ +/* looks up a users password for their connection class (/ tags) + * NOTE: If the or tag specifies an ip, and this user resolves, + * then their ip will be taken as 'priority' anyway, so for example, + * will match joe!bloggs@localhost + */ ConnectClass GetClass(userrec *user) { for (ClassVector::iterator i = Config->Classes.begin(); i != Config->Classes.end(); i++) { - if (match(user->host,i->host.c_str())) + if ((match(inet_ntoa(user->ip4),i->host.c_str())) || (match(user->host,i->host.c_str()))) { return *i; } @@ -1459,6 +1441,10 @@ void send_error(char *s) void Error(int status) { + void *array[300]; + size_t size; + char **strings; + signal(SIGALRM, SIG_IGN); signal(SIGPIPE, SIG_IGN); signal(SIGTERM, SIG_IGN); @@ -1467,7 +1453,24 @@ void Error(int status) signal(SIGURG, SIG_IGN); signal(SIGKILL, SIG_IGN); log(DEFAULT,"*** fell down a pothole in the road to perfection ***"); - send_error("Error! Segmentation fault! save meeeeeeeeeeeeee *splat!*"); +#ifdef HAS_EXECINFO + log(DEFAULT,"Please report the backtrace lines shown below with any bugreport to the bugtracker at http://www.inspircd.org/bugtrack/"); + size = backtrace(array, 30); + strings = backtrace_symbols(array, size); + for (size_t i = 0; i < size; i++) { + log(DEFAULT,"[%d] %s", i, strings[i]); + } + free(strings); + WriteOpers("*** SIGSEGV: Please see the ircd.log for backtrace and report the error to http://www.inspircd.org/bugtrack/"); +#else + log(DEFAULT,"You do not have execinfo.h so i could not backtrace -- on FreeBSD, please install the libexecinfo port."); +#endif + send_error("Somebody screwed up... Whoops. IRC Server terminating."); + signal(SIGSEGV, SIG_DFL); + if (raise(SIGSEGV) == -1) + { + log(DEFAULT,"What the hell, i couldnt re-raise SIGSEGV! Error: %s",strerror(errno)); + } Exit(status); } @@ -1496,7 +1499,7 @@ int usercount_invisible(void) for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++) { - if ((i->second->registered == 7) && (i->second->modebits & UM_INVISIBLE)) + if ((i->second->registered == 7) && (i->second->modes[UM_INVISIBLE])) c++; } @@ -1626,6 +1629,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];