X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=5e437365be0f3a3e8d74c5057bce24517e7f341f;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=4ce203a94b06315fe8b6e8ca429a2e540533973d;hpb=38d7b5b0d9206e85dcf531036b863a0864c35f93;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 4ce203a94..5e437365b 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -16,23 +16,22 @@ /* Now with added unF! ;) */ -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 +#include #include #include #ifdef THREADED_DNS @@ -63,15 +62,20 @@ InspIRCd* ServerInstance; int WHOWAS_STALE = 48; // default WHOWAS Entries last 2 days before they go 'stale' int WHOWAS_MAX = 100; // default 100 people maximum in the WHOWAS list -extern std::vector modules; -extern std::vector factory; +extern ModuleList modules; +extern FactoryList factory; std::vector module_sockets; std::vector local_users; extern int MODCOUNT; -int openSockfd[MAXSOCKS]; -sockaddr_in client,server; +extern char LOG_FILE[MAXBUF]; +int openSockfd[MAX_DESCRIPTORS]; +int yield_depth; +int iterations = 0; + +insp_sockaddr client, server; + socklen_t length; extern InspSocket* socket_ref[MAX_DESCRIPTORS]; @@ -88,57 +92,129 @@ ServerConfig *Config = new ServerConfig; user_hash clientlist; chan_hash chanlist; -whowas_hash whowas; + servernamelist servernames; char lowermap[255]; -void AddServerName(std::string servername) +void AddServerName(const std::string &servername) { log(DEBUG,"Adding server name: %s",servername.c_str()); - for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++) - { - if (*a == servername) - return; + + if(find(servernames.begin(), servernames.end(), servername) == servernames.end()) + servernames.push_back(servername); /* Wasn't already there. */ +} + +const char* FindServerNamePtr(const std::string &servername) +{ + servernamelist::iterator iter = find(servernames.begin(), servernames.end(), servername); + + if(iter == servernames.end()) + { + AddServerName(servername); + iter = --servernames.end(); } - servernames.push_back(servername); + + return iter->c_str(); +} + +bool FindServerName(const std::string &servername) +{ + return (find(servernames.begin(), servernames.end(), servername) != servernames.end()); +} + +void Exit(int status) +{ + if (Config->log_file) + fclose(Config->log_file); + send_error("Server shutdown."); + exit (status); +} + +void Start() +{ + printf("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__); + printf("(C) ChatSpike Development team.\033[0m\n\n"); + printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om\033[0m\n"); + printf("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n"); + printf("Name concept:\t\t\033[1;32mLord_Zathras\033[0m\n\n"); +} + +void Killed(int status) +{ + if (Config->log_file) + fclose(Config->log_file); + send_error("Server terminated."); + exit(status); +} + +void Rehash(int status) +{ + WriteOpers("Rehashing config file %s due to SIGHUP",CleanFilename(CONFIG_FILE)); + fclose(Config->log_file); + OpenLog(NULL,0); + Config->Read(false,NULL); + FOREACH_MOD(I_OnRehash,OnRehash("")); +} + +void SetSignals() +{ + signal (SIGALRM, SIG_IGN); + signal (SIGHUP, Rehash); + signal (SIGPIPE, SIG_IGN); + signal (SIGTERM, Exit); + signal (SIGSEGV, Error); } -const char* FindServerNamePtr(std::string servername) +bool DaemonSeed() { - for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++) + int childpid; + if ((childpid = fork ()) < 0) + return (ERROR); + else if (childpid > 0) { - if (*a == servername) - return a->c_str(); + /* We wait a few seconds here, so that the shell prompt doesnt come back over the output */ + sleep(6); + exit (0); } - AddServerName(servername); - return FindServerNamePtr(servername); + setsid (); + umask (007); + printf("InspIRCd Process ID: \033[1;32m%lu\033[0m\n",(unsigned long)getpid()); + + rlimit rl; + if (getrlimit(RLIMIT_CORE, &rl) == -1) + { + log(DEFAULT,"Failed to getrlimit()!"); + return false; + } + else + { + rl.rlim_cur = rl.rlim_max; + if (setrlimit(RLIMIT_CORE, &rl) == -1) + log(DEFAULT,"setrlimit() failed, cannot increase coredump size."); + } + + return true; } -bool FindServerName(std::string servername) +void WritePID(const std::string &filename) { - for (servernamelist::iterator a = servernames.begin(); a < servernames.end(); a++) + std::ofstream outfile(filename.c_str()); + if (outfile.is_open()) { - if (*a == servername) - return true; + outfile << getpid(); + outfile.close(); + } + else + { + printf("Failed to write PID-file '%s', exiting.\n",filename.c_str()); + log(DEFAULT,"Failed to write PID-file '%s', exiting.",filename.c_str()); + Exit(0); } - return false; } std::string InspIRCd::GetRevision() { - /* w00t got me to replace a bunch of strtok_r - * with something nicer, so i did this. Its the - * same thing really, only in C++. It places the - * text into a std::stringstream which is a readable - * and writeable buffer stream, and then pops two - * words off it, space delimited. Because it reads - * into the same variable twice, the first word - * is discarded, and the second one returned. - */ - std::stringstream Revision("$Revision$"); - std::string single; - Revision >> single >> single; - return single; + return REVISION; } void InspIRCd::MakeLowerMap() @@ -169,17 +245,42 @@ InspIRCd::InspIRCd(int argc, char** argv) printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n"); Exit(ERROR); } + *LOG_FILE = 0; if (argc > 1) { for (int i = 1; i < argc; i++) { - if (!strcmp(argv[i],"-nofork")) { + if (!strcmp(argv[i],"-nofork")) + { Config->nofork = true; } - if (!strcmp(argv[i],"-wait")) { + else if(!strcmp(argv[i],"-debug")) + { + Config->forcedebug = true; + } + else if(!strcmp(argv[i],"-nolog")) + { + Config->writelog = false; + } + else if (!strcmp(argv[i],"-wait")) + { sleep(6); } - if (!strcmp(argv[i],"-nolimit")) { - Config->unlimitcore = true; + else if (!strcmp(argv[i],"-nolimit")) + { + printf("WARNING: The `-nolimit' option is deprecated, and now on by default. This behaviour may change in the future.\n"); + } + else if (!strcmp(argv[i],"-logfile")) + { + if (argc > i+1) + { + strlcpy(LOG_FILE,argv[i+1],MAXBUF); + printf("LOG: Setting logfile to %s\n",LOG_FILE); + } + else + { + printf("ERROR: The -logfile parameter must be followed by a log file name and path.\n"); + Exit(ERROR); + } } } } @@ -188,39 +289,39 @@ InspIRCd::InspIRCd(int argc, char** argv) this->MakeLowerMap(); - OpenLog(argv, argc); - Config->ClearStack(); - Config->Read(true,NULL); - CheckRoot(); + OpenLog(argv, argc); + this->stats = new serverstats(); + Config->ClearStack(); + Config->Read(true,NULL); + CheckRoot(); this->ModeGrok = new ModeParser(); this->Parser = new CommandParser(); - this->stats = new serverstats(); - AddServerName(Config->ServerName); - CheckDie(); - stats->BoundPortCount = BindPorts(); + AddServerName(Config->ServerName); + CheckDie(); + stats->BoundPortCount = BindPorts(true); for(int t = 0; t < 255; t++) Config->global_implementation[t] = 0; memset(&Config->implement_lists,0,sizeof(Config->implement_lists)); - printf("\n"); + printf("\n"); SetSignals(); - if (!Config->nofork) - { - if (DaemonSeed() == ERROR) - { - printf("ERROR: could not go into daemon mode. Shutting down.\n"); - Exit(ERROR); - } - } - - /* Because of limitations in kqueue on freebsd, we must fork BEFORE we - * initialize the socket engine. - */ - SE = new SocketEngine(); - - /* We must load the modules AFTER initializing the socket engine, now */ + if (!Config->nofork) + { + if (!DaemonSeed()) + { + printf("ERROR: could not go into daemon mode. Shutting down.\n"); + Exit(ERROR); + } + } + + /* Because of limitations in kqueue on freebsd, we must fork BEFORE we + * initialize the socket engine. + */ + SE = new SocketEngine(); + + /* We must load the modules AFTER initializing the socket engine, now */ return; } @@ -235,11 +336,11 @@ std::string InspIRCd::GetVersionString() #endif if (*Config->CustomVersion) { - snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s",VERSION,GetRevision().c_str(),Config->ServerName,Config->CustomVersion); + snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion); } else { - snprintf(versiondata,MAXBUF,"%s Rev. %s %s :%s [FLAGS=%lu,%s,%s]",VERSION,GetRevision().c_str(),Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine); + snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%lu,%s,%s]",VERSION,Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine); } return versiondata; } @@ -256,45 +357,44 @@ void InspIRCd::erase_factory(int j) { if (v == j) { - factory.erase(t); - factory.push_back(NULL); - return; - } + factory.erase(t); + factory.push_back(NULL); + return; + } v++; - } + } } void InspIRCd::erase_module(int j) { int v1 = 0; for (std::vector::iterator m = modules.begin(); m!= modules.end(); m++) - { - if (v1 == j) - { + { + if (v1 == j) + { delete *m; - modules.erase(m); - modules.push_back(NULL); + modules.erase(m); + modules.push_back(NULL); break; - } + } v1++; - } + } int v2 = 0; - for (std::vector::iterator v = Config->module_names.begin(); v != Config->module_names.end(); v++) - { - if (v2 == j) - { - Config->module_names.erase(v); - break; - } + for (std::vector::iterator v = Config->module_names.begin(); v != Config->module_names.end(); v++) + { + if (v2 == j) + { + Config->module_names.erase(v); + break; + } v2++; - } + } } void InspIRCd::MoveTo(std::string modulename,int slot) { unsigned int v2 = 256; - log(DEBUG,"Moving %s to slot %d",modulename.c_str(),slot); for (unsigned int v = 0; v < Config->module_names.size(); v++) { if (Config->module_names[v] == modulename) @@ -304,11 +404,7 @@ void InspIRCd::MoveTo(std::string modulename,int slot) break; } } - if (v2 == (unsigned int)slot) - { - log(DEBUG,"Item %s already in slot %d!",modulename.c_str(),slot); - } - else if (v2 < 256) + if ((v2 != (unsigned int)slot) && (v2 < 256)) { // Swap the module names over Config->module_names[v2] = Config->module_names[slot]; @@ -329,7 +425,6 @@ void InspIRCd::MoveTo(std::string modulename,int slot) Config->implement_lists[v2][n] = Config->implement_lists[slot][n]; Config->implement_lists[slot][n] = x; } - log(DEBUG,"Moved %s to slot successfully",modulename.c_str()); } else { @@ -339,7 +434,6 @@ void InspIRCd::MoveTo(std::string modulename,int slot) void InspIRCd::MoveAfter(std::string modulename, std::string after) { - log(DEBUG,"Move %s after %s...",modulename.c_str(),after.c_str()); for (unsigned int v = 0; v < Config->module_names.size(); v++) { if (Config->module_names[v] == after) @@ -352,7 +446,6 @@ void InspIRCd::MoveAfter(std::string modulename, std::string after) void InspIRCd::MoveBefore(std::string modulename, std::string before) { - log(DEBUG,"Move %s before %s...",modulename.c_str(),before.c_str()); for (unsigned int v = 0; v < Config->module_names.size(); v++) { if (Config->module_names[v] == before) @@ -382,11 +475,11 @@ void InspIRCd::MoveToLast(std::string modulename) void InspIRCd::BuildISupport() { - // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it... + // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it... std::stringstream v; - v << "WALLCHOPS MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 NICKLEN=" << NICKMAX-1; - v << " CASEMAPPING=rfc1459 STATUSMSG=@+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN="; - v << MAXAWAY << " CHANMODES=b,k,l,psmnti NETWORK=" << Config->Network; + v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1; + v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN="; + v << MAXAWAY << " CHANMODES=b,k,l,psmnti FNC NETWORK=" << Config->Network << " MAXPARA=32"; Config->data005 = v.str(); FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005)); } @@ -416,7 +509,7 @@ bool InspIRCd::UnloadModule(const char* filename) FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j])); - for(int t = 0; t < 255; t++) + for(int t = 0; t < 255; t++) { Config->global_implementation[t] -= Config->implement_lists[j][t]; } @@ -436,8 +529,8 @@ bool InspIRCd::UnloadModule(const char* filename) erase_module(j); log(DEBUG,"Erasing module entry..."); erase_factory(j); - log(DEBUG,"Removing dependent commands..."); - Parser->RemoveCommands(filename); + log(DEBUG,"Removing dependent commands..."); + Parser->RemoveCommands(filename); log(DEFAULT,"Module %s unloaded",filename); MODCOUNT--; BuildISupport(); @@ -470,8 +563,8 @@ bool InspIRCd::LoadModule(const char* filename) #endif log(DEBUG,"Loading module: %s",modfile); #ifndef STATIC_LINK - if (FileExists(modfile)) - { + if (FileExists(modfile)) + { #endif for (unsigned int j = 0; j < Config->module_names.size(); j++) { @@ -483,50 +576,53 @@ bool InspIRCd::LoadModule(const char* filename) } } ircd_module* a = new ircd_module(modfile); - factory[MODCOUNT+1] = a; - if (factory[MODCOUNT+1]->LastError()) - { - log(DEFAULT,"Unable to load %s: %s",modfile,factory[MODCOUNT+1]->LastError()); + factory[MODCOUNT+1] = a; + if (factory[MODCOUNT+1]->LastError()) + { + log(DEFAULT,"Unable to load %s: %s",modfile,factory[MODCOUNT+1]->LastError()); snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[MODCOUNT+1]->LastError()); return false; - } - if (factory[MODCOUNT+1]->factory) - { - Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer); - modules[MODCOUNT+1] = m; - /* save the module and the module's classfactory, if - * this isnt done, random crashes can occur :/ */ - Config->module_names.push_back(filename); - - char* x = &Config->implement_lists[MODCOUNT+1][0]; - for(int t = 0; t < 255; t++) - x[t] = 0; + } + try + { + if (factory[MODCOUNT+1]->factory) + { + Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer); + modules[MODCOUNT+1] = m; + /* save the module and the module's classfactory, if + * this isnt done, random crashes can occur :/ */ + Config->module_names.push_back(filename); - modules[MODCOUNT+1]->Implements(x); + char* x = &Config->implement_lists[MODCOUNT+1][0]; + for(int t = 0; t < 255; t++) + x[t] = 0; - for(int t = 0; t < 255; t++) + modules[MODCOUNT+1]->Implements(x); + + for(int t = 0; t < 255; t++) + Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t]; + } + else { - Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t]; - if (Config->implement_lists[MODCOUNT+1][t]) - { - log(DEBUG,"Add global implementation: %d %d => %d",MODCOUNT+1,t,Config->global_implementation[t]); - } + log(DEFAULT,"Unable to load %s",modfile); + snprintf(MODERR,MAXBUF,"Factory function failed!"); + return false; } - } - else - { - log(DEFAULT,"Unable to load %s",modfile); - snprintf(MODERR,MAXBUF,"Factory function failed!"); + } + catch (ModuleException& modexcept) + { + log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason()); + snprintf(MODERR,MAXBUF,"Factory function threw an exception: %s",modexcept.GetReason()); return false; - } + } #ifndef STATIC_LINK - } - else - { - log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile); + } + else + { + log(DEFAULT,"InspIRCd: startup: Module Not Found %s",modfile); snprintf(MODERR,MAXBUF,"Module file could not be found"); return false; - } + } #endif MODCOUNT++; FOREACH_MOD(I_OnLoadModule,OnLoadModule(modules[MODCOUNT],filename_str)); @@ -548,15 +644,11 @@ bool InspIRCd::LoadModule(const char* filename) } else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE) { - log(DEBUG,"Module %d wants PRIORITY_BEFORE",j); put_before[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8]; - log(DEBUG,"Before: %s",Config->module_names[modules[j]->Prioritize() >> 8].c_str()); } else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER) { - log(DEBUG,"Module %d wants PRIORITY_AFTER",j); put_after[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8]; - log(DEBUG,"After: %s",Config->module_names[modules[j]->Prioritize() >> 8].c_str()); } } for (unsigned int j = 0; j < put_to_back.size(); j++) @@ -579,9 +671,8 @@ bool InspIRCd::LoadModule(const char* filename) return true; } -int InspIRCd::Run() +void InspIRCd::DoOneIteration(bool process_module_sockets) { - bool expire_run = false; int activefds[MAX_DESCRIPTORS]; int incomingSockfd; int in_port; @@ -589,171 +680,256 @@ int InspIRCd::Run() InspSocket* s = NULL; InspSocket* s_del = NULL; unsigned int numberactive; - sockaddr_in sock_us; // our port number - socklen_t uslen; // length of our port number + insp_sockaddr sock_us; // our port number + socklen_t uslen; // length of our port number - /* Until THIS point, ServerInstance == NULL */ - - LoadAllModules(this); + if (yield_depth > 100) + return; - printf("\nInspIRCd is now running!\n"); - - if (!Config->nofork) - { - freopen("/dev/null","w",stdout); - freopen("/dev/null","w",stderr); - } + yield_depth++; - /* Add the listening sockets used for client inbound connections - * to the socket engine + /* time() seems to be a pretty expensive syscall, so avoid calling it too much. + * Once per loop iteration is pleanty. */ - for (int count = 0; count < stats->BoundPortCount; count++) - SE->AddFd(openSockfd[count],true,X_LISTEN); - - WritePID(Config->PID); - - /* main loop, this never returns */ - for (;;) - { - /* time() seems to be a pretty expensive syscall, so avoid calling it too much. - * Once per loop iteration is pleanty. - */ - OLDTIME = TIME; - TIME = time(NULL); - - /* Run background module timers every few seconds - * (the docs say modules shouldnt rely on accurate - * timing using this event, so we dont have to - * time this exactly). - */ - if (((TIME % 8) == 0) && (!expire_run)) + OLDTIME = TIME; + TIME = time(NULL); + + /* Run background module timers every few seconds + * (the docs say modules shouldnt rely on accurate + * timing using this event, so we dont have to + * time this exactly). + */ + if (((TIME % 5) == 0) && (!expire_run)) + { + expire_lines(); + if (process_module_sockets) { - expire_lines(); + /* Fix by brain - the addition of DoOneIteration means that this + * can end up getting called recursively in the following pattern: + * + * m_spanningtree DoPingChecks + * (server pings out and is squit) + * (squit causes call to DoOneIteration) + * DoOneIteration enters here + * calls DoBackground timer + * enters m_spanningtree DoPingChecks... see step 1. + * + * This should do the job and fix the bug. + */ FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME)); - expire_run = true; - continue; } - else if ((TIME % 8) == 1) + TickMissedTimers(TIME); + expire_run = true; + yield_depth--; + return; + } + else if ((TIME % 5) == 1) + { + expire_run = false; + } + + if (iterations++ == 15) + { + iterations = 0; + DoBackgroundUserStuff(TIME); + } + + /* Once a second, do the background processing */ + if (TIME != OLDTIME) + { + if (TIME < OLDTIME) + WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME)); + if ((TIME % 3600) == 0) { - expire_run = false; + MaintainWhoWas(TIME); } - - /* Once a second, do the background processing */ - if (TIME != OLDTIME) - DoBackgroundUserStuff(TIME); - - /* Call the socket engine to wait on the active - * file descriptors. The socket engine has everything's - * descriptors in its list... dns, modules, users, - * servers... so its nice and easy, just one call. - */ - if (!(numberactive = SE->Wait(activefds))) - continue; - - /** - * Now process each of the fd's. For users, we have a fast - * lookup table which can find a user by file descriptor, so - * processing them by fd isnt expensive. If we have a lot of - * listening ports or module sockets though, things could get - * ugly. - */ - for (unsigned int activefd = 0; activefd < numberactive; activefd++) - { - int socket_type = SE->GetType(activefds[activefd]); - switch (socket_type) - { - case X_ESTAB_CLIENT: + } + + /* Process timeouts on module sockets each time around + * the loop. There shouldnt be many module sockets, at + * most, 20 or so, so this won't be much of a performance + * hit at all. + */ + if (process_module_sockets) + DoSocketTimeouts(TIME); + + TickTimers(TIME); + + /* Call the socket engine to wait on the active + * file descriptors. The socket engine has everything's + * descriptors in its list... dns, modules, users, + * servers... so its nice and easy, just one call. + */ + if (!(numberactive = SE->Wait(activefds))) + { + yield_depth--; + return; + } + + /** + * Now process each of the fd's. For users, we have a fast + * lookup table which can find a user by file descriptor, so + * processing them by fd isnt expensive. If we have a lot of + * listening ports or module sockets though, things could get + * ugly. + */ + log(DEBUG,"There are %d fd's to process.",numberactive); - cu = fd_ref_table[activefds[activefd]]; - if (cu) - ProcessUser(cu); + for (unsigned int activefd = 0; activefd < numberactive; activefd++) + { + int socket_type = SE->GetType(activefds[activefd]); + switch (socket_type) + { + case X_ESTAB_CLIENT: - break; + log(DEBUG,"Type: X_ESTAB_CLIENT: fd=%d",activefds[activefd]); + cu = fd_ref_table[activefds[activefd]]; + if (cu) + ProcessUser(cu); + + break; + + case X_ESTAB_MODULE: - case X_ESTAB_MODULE: + log(DEBUG,"Type: X_ESTAB_MODULE: fd=%d",activefds[activefd]); - /* Process module-owned sockets. - * Modules are encouraged to inherit their sockets from - * InspSocket so we can process them neatly like this. - */ - s = socket_ref[activefds[activefd]]; + if (!process_module_sockets) + break; - if ((s) && (!s->Poll())) + /* Process module-owned sockets. + * Modules are encouraged to inherit their sockets from + * InspSocket so we can process them neatly like this. + */ + s = socket_ref[activefds[activefd]]; + + if ((s) && (!s->Poll())) + { + log(DEBUG,"inspircd.cpp: Socket poll returned false, close and bail"); + SE->DelFd(s->GetFd()); + socket_ref[activefds[activefd]] = NULL; + for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) { - log(DEBUG,"Socket poll returned false, close and bail"); - SE->DelFd(s->GetFd()); - for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) + s_del = (InspSocket*)*a; + if ((s_del) && (s_del->GetFd() == activefds[activefd])) { - s_del = (InspSocket*)*a; - if ((s_del) && (s_del->GetFd() == activefds[activefd])) - { - module_sockets.erase(a); - break; - } + module_sockets.erase(a); + break; } - s->Close(); - delete s; } + s->Close(); + delete s; + } + else if (!s) + { + log(DEBUG,"WTF, X_ESTAB_MODULE for nonexistent InspSocket, removed!"); + SE->DelFd(s->GetFd()); + } + break; - break; + case X_ESTAB_DNS: + /* When we are using single-threaded dns, + * the sockets for dns end up in our mainloop. + * When we are using multi-threaded dns, + * each thread has its own basic poll() loop + * within it, making them 'fire and forget' + * and independent of the mainloop. + */ +#ifndef THREADED_DNS + log(DEBUG,"Type: X_ESTAB_DNS: fd=%d",activefds[activefd]); + dns_poll(activefds[activefd]); +#endif + break; + + case X_LISTEN: - case X_ESTAB_DNS: + log(DEBUG,"Type: X_LISTEN_MODULE: fd=%d",activefds[activefd]); - /* When we are using single-threaded dns, - * the sockets for dns end up in our mainloop. - * When we are using multi-threaded dns, - * each thread has its own basic poll() loop - * within it, making them 'fire and forget' - * and independent of the mainloop. + /* It's a listener */ + uslen = sizeof(sock_us); + length = sizeof(client); + incomingSockfd = accept (activefds[activefd],(struct sockaddr*)&client,&length); + + if ((incomingSockfd > -1) && (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen))) + { + in_port = ntohs(sock_us.sin_port); + log(DEBUG,"Accepted socket %d",incomingSockfd); + /* Years and years ago, we used to resolve here + * using gethostbyaddr(). That is sucky and we + * don't do that any more... */ -#ifndef THREADED_DNS - dns_poll(activefds[activefd]); -#endif - break; - - case X_LISTEN: - - /* It's a listener */ - uslen = sizeof(sock_us); - length = sizeof(client); - incomingSockfd = accept (activefds[activefd],(struct sockaddr*)&client,&length); - - if ((incomingSockfd > -1) && (!getsockname(incomingSockfd,(sockaddr*)&sock_us,&uslen))) + NonBlocking(incomingSockfd); + if (Config->GetIOHook(in_port)) { - in_port = ntohs(sock_us.sin_port); - log(DEBUG,"Accepted socket %d",incomingSockfd); - /* Years and years ago, we used to resolve here - * using gethostbyaddr(). That is sucky and we - * don't do that any more... - */ - NonBlocking(incomingSockfd); - if (Config->GetIOHook(in_port)) + try { Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, (char*)inet_ntoa(client.sin_addr), in_port); } - stats->statsAccept++; - AddClient(incomingSockfd, in_port, false, client.sin_addr); - log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd); - } - else - { - log(DEBUG,"Accept failed on fd %lu: %s",(unsigned long)incomingSockfd,strerror(errno)); - shutdown(incomingSockfd,2); - close(incomingSockfd); - stats->statsRefused++; + catch (ModuleException& modexcept) + { + log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); + } } - break; + stats->statsAccept++; + AddClient(incomingSockfd, in_port, false, client.sin_addr); + log(DEBUG,"Adding client on port %lu fd=%lu",(unsigned long)in_port,(unsigned long)incomingSockfd); + } + else + { + log(DEBUG,"Accept failed on fd %lu: %s",(unsigned long)incomingSockfd,strerror(errno)); + shutdown(incomingSockfd,2); + close(incomingSockfd); + stats->statsRefused++; + } + break; - default: - /* Something went wrong if we're in here. - * In fact, so wrong, im not quite sure - * what we would do, so for now, its going - * to safely do bugger all. - */ - break; - } + default: + /* Something went wrong if we're in here. + * In fact, so wrong, im not quite sure + * what we would do, so for now, its going + * to safely do bugger all. + */ + log(DEBUG,"Type: X_WHAT_THE_FUCK_BBQ: fd=%d",activefds[activefd]); + SE->DelFd(activefds[activefd]); + break; } + } + yield_depth--; +} +int InspIRCd::Run() +{ + /* Until THIS point, ServerInstance == NULL */ + + LoadAllModules(this); + + /* Just in case no modules were loaded - fix for bug #101 */ + this->BuildISupport(); + + printf("\nInspIRCd is now running!\n"); + + if (!Config->nofork) + { + fclose(stdout); + fclose(stderr); + fclose(stdin); + } + + /* Add the listening sockets used for client inbound connections + * to the socket engine + */ + for (int count = 0; count < stats->BoundPortCount; count++) + SE->AddFd(openSockfd[count],true,X_LISTEN); + + WritePID(Config->PID); + + /* main loop, this never returns */ + expire_run = false; + yield_depth = 0; + iterations = 0; + + while (true) + { + DoOneIteration(true); } /* This is never reached -- we hope! */ return 0; @@ -767,9 +943,17 @@ int InspIRCd::Run() int main(int argc, char** argv) { - ServerInstance = new InspIRCd(argc, argv); - ServerInstance->Run(); - delete ServerInstance; - return 0; + try + { + ServerInstance = new InspIRCd(argc, argv); + ServerInstance->Run(); + delete ServerInstance; + } + catch (std::bad_alloc) + { + log(DEFAULT,"You are out of memory! (got exception std::bad_alloc!)"); + send_error("**** OUT OF MEMORY **** We're gonna need a bigger boat!"); + printf("Out of memory! (got exception std::bad_alloc!"); + } + return 0; } -