X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=1a12b7039cbe27df6bf22cc782c71bd7c7d5cdb2;hb=db07867e945deb72ce103f796e20104a27c5f68a;hp=003ad1203459235a66acebec33199c511cdd2616;hpb=858cc30b984210a60f2b0650562b424140f83fe8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 003ad1203..1a12b7039 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1,19 +1,19 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/* ---------------------------------------------------------------------
+ * 
+ *              +------------------------------------+
+ *              | Inspire Internet Relay Chat Daemon |
+ *              +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
+ *         InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                             E-mail:
+ *                      <brain@chatspike.net>
+ *                      <Craig@chatspike.net>
  *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 2 (two) ONLY.
+ *  Written by Craig Edwards, Craig McLure, and others.
+ *  This program is free but copyrighted software; you can redistribute
+ *  it and/or modify it under the terms of the GNU General Public
+ *  License as published by the Free Software Foundation, version 2
+ *  (two) ONLY.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -141,11 +141,11 @@ void Exit(int status)
 	exit (status);
 }
 
-void Start()
+void InspIRCd::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("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special\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");
 }
@@ -167,7 +167,7 @@ void Rehash(int status)
 	FOREACH_MOD(I_OnRehash,OnRehash(""));
 }
 
-void SetSignals()
+void InspIRCd::SetSignals()
 {
 	signal (SIGALRM, SIG_IGN);
 	signal (SIGHUP, Rehash);
@@ -176,7 +176,7 @@ void SetSignals()
 	signal (SIGSEGV, Error);
 }
 
-bool DaemonSeed()
+bool InspIRCd::DaemonSeed()
 {
 	int childpid;
 	if ((childpid = fork ()) < 0)
@@ -207,7 +207,7 @@ bool DaemonSeed()
 	return true;
 }
 
-void WritePID(const std::string &filename)
+void InspIRCd::WritePID(const std::string &filename)
 {
 	std::ofstream outfile(filename.c_str());
 	if (outfile.is_open())
@@ -244,7 +244,7 @@ void InspIRCd::MakeLowerMap()
 
 InspIRCd::InspIRCd(int argc, char** argv)
 {
-	Start();
+	this->Start();
 	module_sockets.clear();
 	this->startup_time = time(NULL);
 	srand(time(NULL));
@@ -317,10 +317,10 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	memset(&Config->implement_lists,0,sizeof(Config->implement_lists));
 
 	printf("\n");
-	SetSignals();
+	this->SetSignals();
 	if (!Config->nofork)
 	{
-		if (!DaemonSeed())
+		if (!this->DaemonSeed())
 		{
 			printf("ERROR: could not go into daemon mode. Shutting down.\n");
 			Exit(ERROR);
@@ -361,7 +361,7 @@ char* InspIRCd::ModuleError()
 	return MODERR;
 }
 
-void InspIRCd::erase_factory(int j)
+void InspIRCd::EraseFactory(int j)
 {
 	int v = 0;
 	for (std::vector<ircd_module*>::iterator t = factory.begin(); t != factory.end(); t++)
@@ -376,7 +376,7 @@ void InspIRCd::erase_factory(int j)
 	}
 }
 
-void InspIRCd::erase_module(int j)
+void InspIRCd::EraseModule(int j)
 {
 	int v1 = 0;
 	for (std::vector<Module*>::iterator m = modules.begin(); m!= modules.end(); m++)
@@ -537,9 +537,9 @@ bool InspIRCd::UnloadModule(const char* filename)
 
 			// found the module
 			log(DEBUG,"Deleting module...");
-			erase_module(j);
+			this->EraseModule(j);
 			log(DEBUG,"Erasing module entry...");
-			erase_factory(j);
+			this->EraseFactory(j);
 			log(DEBUG,"Removing dependent commands...");
 			Parser->RemoveCommands(filename);
 			log(DEFAULT,"Module %s unloaded",filename);
@@ -815,12 +815,12 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 	      
 				if ((s) && (!s->Poll()))
 				{
-					log(DEBUG,"inspircd.cpp: Socket poll returned false, close and bail");
+					log(DEBUG,"Socket poll returned false, close and bail");
 					SE->DelFd(s->GetFd());
 					socket_ref[activefds[activefd]] = NULL;
 					for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
 					{
-						s_del = (InspSocket*)*a;
+						s_del = *a;
 						if ((s_del) && (s_del->GetFd() == activefds[activefd]))
 						{
 							module_sockets.erase(a);
@@ -873,7 +873,7 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 					{
 						try
 						{
-							Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, (char*)inet_ntoa(client.sin_addr), in_port);
+							Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, inet_ntoa(client.sin_addr), in_port);
 						}
 						catch (ModuleException& modexcept)
 						{
@@ -931,7 +931,7 @@ int InspIRCd::Run()
 	for (int count = 0; count < stats->BoundPortCount; count++)
 		SE->AddFd(openSockfd[count],true,X_LISTEN);
 
-	WritePID(Config->PID);
+	this->WritePID(Config->PID);
 
 	/* main loop, this never returns */
 	expire_run = false;