std::vector<std::string> mymodnames;
int MyModCount = this->GetModuleCount();
- for (unsigned int i = 0; i < stats->BoundPortCount; i++)
+ for (unsigned int i = 0; i < Config->ports.size(); i++)
{
/* This calls the constructor and closes the listening socket */
- delete Config->openSockfd[i];
- Config->openSockfd[i] = NULL;
+ delete Config->ports[i];
}
- stats->BoundPortCount = 0;
+
+ Config->ports.clear();
/* Close all client sockets, or the new process inherits them */
for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
{
int found_ports = 0;
FailedPortList pl;
- int do_version, do_nofork = 0, do_debug = 0, do_nolog = 0, do_restart = 0, do_root = 0; /* flag variables */
+ int do_version = 0, do_nofork = 0, do_debug = 0, do_nolog = 0, do_root = 0; /* flag variables */
char c = 0;
modules.resize(255);
{ "config", required_argument, NULL, 'c' },
{ "debug", no_argument, &do_debug, 1 },
{ "nolog", no_argument, &do_nolog, 1 },
- { "restart", no_argument, &do_restart, 1 },
{ "runasroot", no_argument, &do_root, 1 },
{ "version", no_argument, &do_version, 1 },
{ 0, 0, 0, 0 }
strlcpy(Config->MyExecutable,argv[0],MAXBUF);
this->OpenLog(argv, argc);
+
this->stats = new serverstats();
this->Timers = new TimerManager(this);
this->Parser = new CommandParser(this);
sleep(20);
}
- this->Modes = new ModeParser(this);
- this->AddServerName(Config->ServerName);
- CheckDie();
- InitializeDisabledCommands(Config->DisabledCommands, this);
- stats->BoundPortCount = BindPorts(true, found_ports, pl);
-
- for(int t = 0; t < 255; t++)
- Config->global_implementation[t] = 0;
-
- memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
-
- printf("\n");
this->SetSignals();
if (!Config->nofork)
}
}
- /* Because of limitations in kqueue on freebsd, we must fork BEFORE we
+
+ /* Because of limitations in kqueue on freebsd, we must fork BEFORE we
* initialize the socket engine.
*/
SocketEngineFactory* SEF = new SocketEngineFactory();
SE = SEF->Create(this);
delete SEF;
+ this->Modes = new ModeParser(this);
+ this->AddServerName(Config->ServerName);
+ CheckDie();
+ int bounditems = BindPorts(true, found_ports, pl);
+
+ for(int t = 0; t < 255; t++)
+ Config->global_implementation[t] = 0;
+
+ memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
+
+ printf("\n");
+
this->Res = new DNS(this);
this->LoadAllModules();
/* Just in case no modules were loaded - fix for bug #101 */
this->BuildISupport();
+ InitializeDisabledCommands(Config->DisabledCommands, this);
- if ((stats->BoundPortCount == 0) && (found_ports > 0))
+ if ((Config->ports.size() == 0) && (found_ports > 0))
{
printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
Log(DEFAULT,"ERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?");
Exit(EXIT_STATUS_BIND);
}
- if (stats->BoundPortCount != (unsigned int)found_ports)
+ if (Config->ports.size() != (unsigned int)found_ports)
{
- printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %ld of %d client ports bound.\n\n", stats->BoundPortCount, found_ports);
- printf("The following port%s failed to bind:\n", found_ports - stats->BoundPortCount != 1 ? "s" : "");
+ printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %d of %d client ports bound.\n\n", bounditems, found_ports);
+ printf("The following port(s) failed to bind:\n");
int j = 1;
for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
{
}
}
- /* Add the listening sockets used for client inbound connections
- * to the socket engine
- */
- for (unsigned long count = 0; count < stats->BoundPortCount; count++)
+ if (!Config->nofork)
{
- if (!SE->AddFd(Config->openSockfd[count]))
+ if (kill(getppid(), SIGTERM) == -1)
{
- printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n");
- Log(DEFAULT,"EH? Could not add listener to socketengine. You screwed up, aborting.");
- Exit(EXIT_STATUS_INTERNAL);
+ printf("Error killing parent process: %s\n",strerror(errno));
+ Log(DEFAULT,"Error killing parent process: %s",strerror(errno));
}
}
- if (!Config->nofork && !do_restart)
+ if (isatty(0) && isatty(1) && isatty(2))
{
- if (kill(getppid(), SIGTERM) == -1)
+ /* We didn't start from a TTY, we must have started from a background process -
+ * e.g. we are restarting, or being launched by cron. Dont kill parent, and dont
+ * close stdin/stdout
+ */
+ if (!do_nofork)
{
- printf("Error killing parent process: %s\n",strerror(errno));
- Log(DEFAULT,"Error killing parent process: %s",strerror(errno));
+ fclose(stdin);
+ fclose(stderr);
+ fclose(stdout);
+ }
+ else
+ {
+ Log(DEFAULT,"Keeping pseudo-tty open as we are running in the foreground.");
}
-
- fclose(stdin);
- fclose(stderr);
- fclose(stdout);
}
printf("\nInspIRCd is now running!\n");
std::stringstream v;
v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES-1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
- v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32";
+ v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
Config->data005 = v.str();
FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
Config->Update005();
/* if any users was quit, take them out */
GlobalCulls.Apply();
-}
-
-bool InspIRCd::IsIdent(const char* n)
-{
- if (!n || !*n)
- return false;
-
- for (char* i = (char*)n; *i; i++)
+ /* If any inspsockets closed, remove them */
+ for (std::map<InspSocket*,InspSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
{
- if ((*i >= 'A') && (*i <= '}'))
- {
- continue;
- }
- if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
- {
- continue;
- }
- return false;
+ SE->DelFd(x->second);
+ x->second->Close();
+ delete x->second;
}
- return true;
+ SocketCull.clear();
}
-
int InspIRCd::Run()
{
while (true)
projects / user / henk / code / inspircd.git / blobdiff