X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=f7f96983572db3da85afb4d8d3b832943ba0398e;hb=2db77cda56947d4ee0f913c8082f6607855ca713;hp=40e1d84269c99620bafcb60e0c8ca879cf07f95e;hpb=4f66a9a4c40ccab57b39eb4dd16c3f02438e3b4c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/inspircd.cpp b/src/inspircd.cpp index 40e1d8426..f7f969835 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -509,8 +509,6 @@ InspIRCd::InspIRCd(int argc, char** argv) Config->sid[2] = (char)(sid % 10 + 48); } - this->InitialiseUID(); - /* set up fake client again this time with the correct uid */ this->FakeClient = new User(this, "#INVALID"); this->FakeClient->SetFd(FD_MAGIC_NUMBER); @@ -519,7 +517,6 @@ InspIRCd::InspIRCd(int argc, char** argv) this->XLines->CheckELines(); this->XLines->ApplyLines(); - CheckDie(); int bounditems = BindPorts(true, found_ports, pl); @@ -584,34 +581,12 @@ InspIRCd::InspIRCd(int argc, char** argv) } #endif - printf("\nInspIRCd is now running as '%s'[%s]\n", Config->ServerName,Config->GetSID().c_str()); - Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s]", Config->ServerName,Config->GetSID().c_str()); + printf("\nInspIRCd is now running as '%s'[%s] with %d max open sockets\n", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); + Logs->Log("STARTUP", DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName,Config->GetSID().c_str(), SE->GetMaxFds()); this->WritePID(Config->PID); } -/* moved to a function, as UID generation can call this also */ -void InspIRCd::InitialiseUID() -{ - int i = 3; - -printf("FUCKING UID IS %s\n", current_uid); - - current_uid[0] = Config->sid[0]; - current_uid[1] = Config->sid[1]; - current_uid[2] = Config->sid[2]; - - /* Initialise UID */ - for(i = 3; i < UUID_LENGTH - 1; i++) - current_uid[i] = 'A'; - -printf("FUCKING UID IS %s %d\n", current_uid, strlen(current_uid)); - - current_uid[UUID_LENGTH] = '\0'; - -printf("FUCKING UID IS %s %d\n", current_uid, strlen(current_uid)); -} - int InspIRCd::Run() { /* See if we're supposed to be running the test suite rather than entering the mainloop */