Move a bundle of stuff to server.cpp from inspircd.cpp

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7546 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 82 insertions, 65 deletions

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index c56744b40..44f658427 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -173,38 +173,6 @@ const char* ExitCodes[] =
 		"Received SIGTERM", /* 15 */
 };
 
-void InspIRCd::AddServerName(const std::string &servername)
-{
-	servernamelist::iterator itr = servernames.begin();
-	for(; itr != servernames.end(); ++itr)
-		if(**itr == servername)
-			return;
-
-	string * ns = new string(servername);
-	servernames.push_back(ns);
-}
-
-const char* InspIRCd::FindServerNamePtr(const std::string &servername)
-{
-	servernamelist::iterator itr = servernames.begin();
-	for(; itr != servernames.end(); ++itr)
-		if(**itr == servername)
-			return (*itr)->c_str();
-
-	servernames.push_back(new string(servername));
-	itr = --servernames.end();
-	return (*itr)->c_str();
-}
-
-bool InspIRCd::FindServerName(const std::string &servername)
-{
-	servernamelist::iterator itr = servernames.begin();
-	for(; itr != servernames.end(); ++itr)
-		if(**itr == servername)
-			return true;
-	return false;
-}
-
 void InspIRCd::Exit(int status)
 {
 #ifdef WINDOWS
@@ -437,11 +405,6 @@ void InspIRCd::WritePID(const std::string &filename)
 	}
 }
 
-std::string InspIRCd::GetRevision()
-{
-	return REVISION;
-}
-
 InspIRCd::InspIRCd(int argc, char** argv)
 	: ModCount(-1), GlobalCulls(this)
 {
@@ -674,34 +637,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	this->WritePID(Config->PID);
 }
 
-std::string InspIRCd::GetVersionString()
-{
-	char versiondata[MAXBUF];
-	char dnsengine[] = "singlethread-object";
-
-	if (*Config->CustomVersion)
-	{
-		snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
-	}
-	else
-	{
-		snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine);
-	}
-	return versiondata;
-}
-
-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-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 ELIST=MU";
-	Config->data005 = v.str();
-	FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
-	Config->Update005();
-}
-
 void InspIRCd::DoOneIteration(bool process_module_sockets)
 {
 #ifndef WIN32
diff --git a/src/server.cpp b/src/server.cpp
index 8b1378917..003ed044f 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1 +1,83 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+
+
+std::string InspIRCd::GetVersionString()
+{
+	char versiondata[MAXBUF];
+	char dnsengine[] = "singlethread-object";
+
+	if (*Config->CustomVersion)
+	{
+		snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
+	}
+	else
+	{
+		snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine);
+	}
+	return versiondata;
+}
+
+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-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 ELIST=MU";
+	Config->data005 = v.str();
+	FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
+	Config->Update005();
+}
+
+
+std::string InspIRCd::GetRevision()
+{
+	return REVISION;
+}
+
+void InspIRCd::AddServerName(const std::string &servername)
+{
+	servernamelist::iterator itr = servernames.begin();
+	for(; itr != servernames.end(); ++itr)
+		if(**itr == servername)
+			return;
+
+	string * ns = new string(servername);
+	servernames.push_back(ns);
+}
+
+const char* InspIRCd::FindServerNamePtr(const std::string &servername)
+{
+	servernamelist::iterator itr = servernames.begin();
+	for(; itr != servernames.end(); ++itr)
+		if(**itr == servername)
+			return (*itr)->c_str();
+
+	servernames.push_back(new string(servername));
+	itr = --servernames.end();
+	return (*itr)->c_str();
+}
+
+bool InspIRCd::FindServerName(const std::string &servername)
+{
+	servernamelist::iterator itr = servernames.begin();
+	for(; itr != servernames.end(); ++itr)
+		if(**itr == servername)
+			return true;
+	return false;
+}
+