X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=7efbaa54f02a3c078a7f4cf543c9ff593a647d23;hb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;hp=c5f1a962fa2d2fafcac19bf881a72938d904a3bc;hpb=3b7ce097e2ed90b653f115ea7c2249030cc36aac;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index c5f1a962f..7efbaa54f 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -30,16 +30,8 @@ #include "inspircd.h" #include "configreader.h" #include -#include -#include #include -#include -#include -#include -#include #include -#include -#include #include "modules.h" #include "mode.h" #include "xline.h" @@ -50,12 +42,11 @@ #include "command_parse.h" using irc::sockets::NonBlocking; +using irc::sockets::Blocking; using irc::sockets::insp_ntoa; using irc::sockets::insp_inaddr; using irc::sockets::insp_sockaddr; -char lowermap[255]; - InspIRCd* SI = NULL; void InspIRCd::AddServerName(const std::string &servername) @@ -109,22 +100,30 @@ void InspIRCd::Rehash(int status) void InspIRCd::SetSignals(bool SEGVHandler) { - signal (SIGALRM, SIG_IGN); - signal (SIGHUP, InspIRCd::Rehash); - signal (SIGPIPE, SIG_IGN); - signal (SIGTERM, InspIRCd::Exit); + signal(SIGALRM, SIG_IGN); + signal(SIGHUP, InspIRCd::Rehash); + signal(SIGPIPE, SIG_IGN); + signal(SIGTERM, InspIRCd::Exit); + signal(SIGCHLD, SIG_IGN); } bool InspIRCd::DaemonSeed() { int childpid; if ((childpid = fork ()) < 0) - return (ERROR); + return false; else if (childpid > 0) { - /* We wait a few seconds here, so that the shell prompt doesnt come back over the output */ - sleep(6); - exit (0); + /* We wait here for the child process to kill us, + * so that the shell prompt doesnt come back over + * the output. + * Sending a kill with a signal of 0 just checks + * if the child pid is still around. If theyre not, + * they threw an error and we should give up. + */ + while (kill(childpid, 0) != -1) + sleep(1); + exit(ERROR); } setsid (); umask (007); @@ -142,7 +141,7 @@ bool InspIRCd::DaemonSeed() if (setrlimit(RLIMIT_CORE, &rl) == -1) this->Log(DEFAULT,"setrlimit() failed, cannot increase coredump size."); } - + return true; } @@ -171,17 +170,13 @@ InspIRCd::InspIRCd(int argc, char** argv) : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365) { bool SEGVHandler = false; - //ServerInstance = this; modules.resize(255); factory.resize(255); - - memset(fd_ref_table, 0, sizeof(fd_ref_table)); - memset(socket_ref, 0, sizeof(socket_ref)); this->Config = new ServerConfig(this); + this->SNO = new SnomaskManager(this); this->Start(); - this->module_sockets.clear(); this->TIME = this->OLDTIME = this->startup_time = time(NULL); srand(this->TIME); this->Log(DEBUG,"*** InspIRCd starting up!"); @@ -244,9 +239,7 @@ InspIRCd::InspIRCd(int argc, char** argv) strlcpy(Config->MyExecutable,argv[0],MAXBUF); - this->MakeLowerMap(); - - OpenLog(argv, argc); + this->OpenLog(argv, argc); this->stats = new serverstats(); this->Parser = new CommandParser(this); this->Timers = new TimerManager(); @@ -285,16 +278,13 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Res = new DNS(this); - this->Log(DEBUG,"RES: %08x",this->Res); - this->LoadAllModules(); - /* Just in case no modules were loaded - fix for bug #101 */ this->BuildISupport(); if (!stats->BoundPortCount) { - printf("\nI couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n"); + printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n"); Exit(ERROR); } @@ -304,8 +294,8 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Log(DEBUG,"%d listeners",stats->BoundPortCount); for (unsigned long count = 0; count < stats->BoundPortCount; count++) { - this->Log(DEBUG,"Add listener: %d",Config->openSockfd[count]); - if (!SE->AddFd(Config->openSockfd[count],true,X_LISTEN)) + this->Log(DEBUG,"Add listener: %d",Config->openSockfd[count]->GetFd()); + if (!SE->AddFd(Config->openSockfd[count])) { printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n"); Exit(ERROR); @@ -314,20 +304,16 @@ InspIRCd::InspIRCd(int argc, char** argv) if (!Config->nofork) { - fclose(stdout); - fclose(stderr); + if (kill(getppid(), SIGTERM) == -1) + printf("Error killing parent process: %s\n",strerror(errno)); fclose(stdin); + fclose(stderr); + fclose(stdout); } printf("\nInspIRCd is now running!\n"); this->WritePID(Config->PID); - - /* main loop, this never returns */ - expire_run = false; - iterations = 0; - - return; } std::string InspIRCd::GetVersionString() @@ -477,9 +463,9 @@ void InspIRCd::BuildISupport() { // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it... std::stringstream v; - v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1; + v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " 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"; + v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32"; Config->data005 = v.str(); FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005)); } @@ -635,88 +621,39 @@ bool InspIRCd::LoadModule(const char* filename) for (unsigned int j = 0; j < Config->module_names.size(); j++) { if (modules[j]->Prioritize() == PRIORITY_LAST) - { put_to_back.push_back(Config->module_names[j]); - } else if (modules[j]->Prioritize() == PRIORITY_FIRST) - { put_to_front.push_back(Config->module_names[j]); - } else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_BEFORE) - { put_before[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8]; - } else if ((modules[j]->Prioritize() & 0xFF) == PRIORITY_AFTER) - { put_after[Config->module_names[j]] = Config->module_names[modules[j]->Prioritize() >> 8]; - } } for (unsigned int j = 0; j < put_to_back.size(); j++) - { MoveToLast(put_to_back[j]); - } for (unsigned int j = 0; j < put_to_front.size(); j++) - { MoveToFirst(put_to_front[j]); - } for (std::map::iterator j = put_before.begin(); j != put_before.end(); j++) - { MoveBefore(j->first,j->second); - } for (std::map::iterator j = put_after.begin(); j != put_after.end(); j++) - { MoveAfter(j->first,j->second); - } BuildISupport(); return true; } void InspIRCd::DoOneIteration(bool process_module_sockets) { - int activefds[MAX_DESCRIPTORS]; - int incomingSockfd; - int in_port; - userrec* cu = NULL; - InspSocket* s = NULL; - InspSocket* s_del = NULL; - unsigned int numberactive; - insp_sockaddr sock_us; // our port number - socklen_t uslen; // length of our port number - /* 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 % 5) == 0) && (!expire_run)) - { - XLines->expire_lines(); - if (process_module_sockets) - { - FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); - } - Timers->TickMissedTimers(TIME); - expire_run = true; - return; - } - else if ((TIME % 5) == 1) - { - expire_run = false; - } - - if (iterations++ == 15) - { - iterations = 0; - this->DoBackgroundUserStuff(TIME); - } - - /* Once a second, do the background processing */ if (TIME != OLDTIME) { if (TIME < OLDTIME) @@ -725,161 +662,25 @@ void InspIRCd::DoOneIteration(bool process_module_sockets) { irc::whowas::MaintainWhoWas(TIME); } + Timers->TickTimers(TIME); + this->DoBackgroundUserStuff(TIME); + + if ((TIME % 5) == 0) + { + XLines->expire_lines(); + FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME)); + Timers->TickMissedTimers(TIME); + } } - /* 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) - this->DoSocketTimeouts(TIME); - - Timers->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. + * This will cause any read or write events to be + * dispatched to their handlers. */ - if (!(numberactive = SE->Wait(activefds))) - 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. - */ - this->Log(DEBUG,"There are %d fd's to process.",numberactive); - - for (unsigned int activefd = 0; activefd < numberactive; activefd++) - { - int socket_type = SE->GetType(activefds[activefd]); - switch (socket_type) - { - case X_ESTAB_CLIENT: - - this->Log(DEBUG,"Type: X_ESTAB_CLIENT: fd=%d",activefds[activefd]); - cu = this->fd_ref_table[activefds[activefd]]; - if (cu) - this->ProcessUser(cu); - - break; - - case X_ESTAB_MODULE: - - this->Log(DEBUG,"Type: X_ESTAB_MODULE: fd=%d",activefds[activefd]); - - if (!process_module_sockets) - break; - - /* Process module-owned sockets. - * Modules are encouraged to inherit their sockets from - * InspSocket so we can process them neatly like this. - */ - s = this->socket_ref[activefds[activefd]]; - - if ((s) && (!s->Poll())) - { - this->Log(DEBUG,"Socket poll returned false, close and bail"); - SE->DelFd(s->GetFd()); - this->socket_ref[activefds[activefd]] = NULL; - for (std::vector::iterator a = module_sockets.begin(); a < module_sockets.end(); a++) - { - s_del = *a; - if ((s_del) && (s_del->GetFd() == activefds[activefd])) - { - module_sockets.erase(a); - break; - } - } - s->Close(); - DELETE(s); - } - else if (!s) - { - this->Log(DEBUG,"WTF, X_ESTAB_MODULE for nonexistent InspSocket, removed!"); - SE->DelFd(s->GetFd()); - } - break; - - case X_ESTAB_DNS: - /* Handles instances of the Resolver class, - * a simple class extended by modules and the core for - * nonblocking resolving of addresses. - */ - this->Res->MarshallReads(activefds[activefd]); - break; - - case X_LISTEN: - - this->Log(DEBUG,"Type: X_LISTEN: fd=%d",activefds[activefd]); - - /* 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))) - { -#ifdef IPV6 - in_port = ntohs(sock_us.sin6_port); -#else - in_port = ntohs(sock_us.sin_port); -#endif - this->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 - { -#ifdef IPV6 - Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin6_addr), in_port); -#else - Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, insp_ntoa(client.sin_addr), in_port); -#endif - } - catch (ModuleException& modexcept) - { - this->Log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); - } - } - stats->statsAccept++; -#ifdef IPV6 - this->Log(DEBUG,"Add ipv6 client"); - userrec::AddClient(this, incomingSockfd, in_port, false, client.sin6_addr); -#else - this->Log(DEBUG,"Add ipv4 client"); - userrec::AddClient(this, incomingSockfd, in_port, false, client.sin_addr); -#endif - this->Log(DEBUG,"Adding client on port %d fd=%d",in_port,incomingSockfd); - } - else - { - this->Log(DEBUG,"Accept failed on fd %d: %s",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. - */ - this->Log(DEBUG,"Type: X_WHAT_THE_FUCK_BBQ: fd=%d",activefds[activefd]); - SE->DelFd(activefds[activefd]); - break; - } - } + SE->DispatchEvents(); } bool InspIRCd::IsIdent(const char* n) @@ -982,3 +783,71 @@ time_t InspIRCd::Time() return TIME; } +bool FileLogger::Readable() +{ + return false; +} + +void FileLogger::HandleEvent(EventType et) +{ + this->WriteLogLine(""); + ServerInstance->SE->DelFd(this); +} + +void FileLogger::WriteLogLine(const std::string &line) +{ + if (line.length()) + buffer.append(line); + + if (log) + { + int written = fprintf(log,"%s",buffer.c_str()); + if ((written >= 0) && (written < (int)buffer.length())) + { + buffer.erase(0, buffer.length()); + ServerInstance->SE->AddFd(this); + } + else if (written == -1) + { + if (errno == EAGAIN) + ServerInstance->SE->AddFd(this); + } + else + { + /* Wrote the whole buffer, and no need for write callback */ + buffer = ""; + } + } + if (writeops++ % 20) + { + fflush(log); + } +} + +void FileLogger::Close() +{ + if (log) + { + int flags = fcntl(fileno(log), F_GETFL, 0); + fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK); + if (buffer.size()) + fprintf(log,"%s",buffer.c_str()); + fflush(log); + fclose(log); + } + buffer = ""; + ServerInstance->SE->DelFd(this); +} + +FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0) +{ + irc::sockets::NonBlocking(fileno(log)); + this->SetFd(fileno(log)); + buffer = ""; +} + +FileLogger::~FileLogger() +{ + this->Close(); +} +