X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=5760e631b501f62ee155ce12537a671cdd1fe91e;hb=78db7544d26cdeffeb2bd8045529fe90bd5d852d;hp=384f783aa0e1eb0f116739ce928e317ea1d0e53f;hpb=ad50225dc3d5ce6e44a5009351a7434b7249d233;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 384f783aa..5760e631b 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -1,16 +1,21 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2020 Matt Schatz + * Copyright (C) 2018 Chris Novakovic + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2014, 2016, 2018 Attila Molnar * Copyright (C) 2012 William Pitcock + * Copyright (C) 2012 Robby + * Copyright (C) 2012 ChrisTX * Copyright (C) 2009-2010 Daniel De Graaf - * Copyright (C) 2003-2008 Craig Edwards - * Copyright (C) 2008 Uli Schlachter - * Copyright (C) 2006-2008 Robin Burchell - * Copyright (C) 2006-2007 Oliver Lupton + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007-2008, 2010 Craig Edwards + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Oliver Lupton * Copyright (C) 2007 Dennis Friis - * Copyright (C) 2007 Burlex - * Copyright (C) 2003 Craig McLure - * Copyright (C) 2003 randomdan * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -32,7 +37,6 @@ #ifndef _WIN32 #include #include - #include #include #include // setuid #include // setgid @@ -49,7 +53,7 @@ InspIRCd* ServerInstance = NULL; -/** Seperate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping +/** Separate from the other casemap tables so that code *can* still exclusively rely on RFC casemapping * if it must. * * This is provided as a pointer so that modules can change it to their custom mapping tables, @@ -132,13 +136,19 @@ namespace #endif } - // Deletes a pointer and then zeroes it. - template - void DeleteZero(T*& pr) + // Checks whether the server clock has skipped too much and warn about it if it has. + void CheckTimeSkip(time_t oldtime, time_t newtime) { - T* p = pr; - pr = NULL; - delete p; + if (!ServerInstance->Config->TimeSkipWarn) + return; + + time_t timediff = newtime - oldtime; + + if (timediff > ServerInstance->Config->TimeSkipWarn) + ServerInstance->SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped forwards by %lu seconds!", timediff); + + else if (timediff < -ServerInstance->Config->TimeSkipWarn) + ServerInstance->SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped backwards by %lu seconds!", labs(timediff)); } // Drops to the unprivileged user/group specified in . @@ -312,7 +322,7 @@ namespace default: // An unknown option was specified. - std::cout << con_red << "Error:" << con_reset << " unknown option '" << argv[optind - 1] << "'." << std::endl + std::cout << con_red << "Error:" << con_reset << " unknown option '" << argv[optind] << "'." << std::endl << con_bright << "Usage: " << con_reset << argv[0] << " [--config ] [--debug] [--nofork] [--nolog]" << std::endl << std::string(strlen(argv[0]) + 8, ' ') << "[--nopid] [--runasroot] [--version]" << std::endl; ServerInstance->Exit(EXIT_STATUS_ARGV); @@ -358,6 +368,31 @@ namespace signal(SIGTERM, InspIRCd::SetSignal); } + void TryBindPorts() + { + FailedPortList pl; + ServerInstance->BindPorts(pl); + + if (!pl.empty()) + { + std::cout << con_red << "Warning!" << con_reset << " Some of your listener" << (pl.size() == 1 ? "s" : "") << " failed to bind:" << std::endl + << std::endl; + + for (FailedPortList::const_iterator iter = pl.begin(); iter != pl.end(); ++iter) + { + const FailedPort& fp = *iter; + std::cout << " " << con_bright << fp.sa.str() << con_reset << ": " << strerror(fp.error) << '.' << std::endl + << " " << "Created from tag at " << fp.tag->getTagLocation() << std::endl + << std::endl; + } + + std::cout << con_bright << "Hints:" << con_reset << std::endl + << "- For TCP/IP listeners try using a public IP address in instead" << std::endl + << " of * or leaving it blank." << std::endl + << "- For UNIX socket listeners try enabling to replace old sockets." << std::endl; + } + } + // Required for returning the proper value of EXIT_SUCCESS for the parent process. void VoidSignalHandler(int) { @@ -394,9 +429,9 @@ void InspIRCd::Cleanup() delete FakeClient->server; FakeClient->cull(); } - DeleteZero(this->FakeClient); - DeleteZero(this->XLines); - DeleteZero(this->Config); + stdalgo::delete_zero(this->FakeClient); + stdalgo::delete_zero(this->XLines); + stdalgo::delete_zero(this->Config); SocketEngine::Deinit(); Logs->CloseLogs(); } @@ -510,7 +545,7 @@ InspIRCd::InspIRCd(int argc, char** argv) std::cout << "InspIRCd Process ID: " << con_green << getpid() << con_reset << std::endl; /* During startup we read the configuration now, not in - * a seperate thread + * a separate thread */ this->Config->Read(); this->Config->Apply(NULL, ""); @@ -529,30 +564,15 @@ InspIRCd::InspIRCd(int argc, char** argv) // This is needed as all new XLines are marked pending until ApplyLines() is called this->XLines->ApplyLines(); - FailedPortList pl; - size_t bounditems = BindPorts(pl); - std::cout << std::endl; + TryBindPorts(); + this->Modules->LoadAll(); // Build ISupport as ModuleManager::LoadAll() does not do it this->ISupport.Build(); - if (!pl.empty()) - { - std::cout << std::endl << "WARNING: Not all your client ports could be bound -- " << std::endl << "starting anyway with " << bounditems - << " of " << (bounditems + pl.size()) << " client ports bound." << std::endl << std::endl; - std::cout << "The following port(s) failed to bind:" << std::endl << std::endl; - int j = 1; - for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++) - { - std::cout << j << ".\tAddress: " << i->first.str() << " \tReason: " << strerror(i->second) << std::endl; - } - - std::cout << std::endl << "Hint: Try using a public IP instead of blank or *" << std::endl; - } - std::cout << "InspIRCd is now running as '" << Config->ServerName << "'[" << Config->GetSID() << "] with " << SocketEngine::GetMaxFds() << " max open sockets" << std::endl; #ifndef _WIN32 @@ -656,24 +676,14 @@ void InspIRCd::Run() UpdateTime(); /* Run background module timers every few seconds - * (the docs say modules shouldnt rely on accurate + * (the docs say modules should not rely on accurate * timing using this event, so we dont have to * time this exactly). */ if (TIME.tv_sec != OLDTIME) { CollectStats(); - - if (Config->TimeSkipWarn) - { - time_t timediff = TIME.tv_sec - OLDTIME; - - if (timediff > Config->TimeSkipWarn) - SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped forwards by %lu seconds!", timediff); - - else if (timediff < -Config->TimeSkipWarn) - SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped backwards by %lu seconds!", labs(timediff)); - } + CheckTimeSkip(OLDTIME, TIME.tv_sec); OLDTIME = TIME.tv_sec;