From 6cf3fc6b36e2046c36b729530117572ba44aafd7 Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sat, 2 Jun 2007 22:21:55 +0000
Subject: Change the behaviour of insp in windows to keep its window open, with
 some status text in the title bar. It also clears the screen now on startup,
 see the wrapper for what a nasty amount of code it is to do such a simple
 thing to a windows console :( Also, add somewhat of a hack to cut down on
 allocation time taken to map windows fd to a posix style fd in iocp engine.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7217 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/inspircd.cpp          | 36 +++++++++++++++---------------------
 src/socketengine_iocp.cpp |  2 +-
 2 files changed, 16 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 7066385ef..9e1d753b3 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -386,12 +386,12 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
 	struct option longopts[] =
 	{
-		{ "nofork",	no_argument,		&do_nofork,	1	},
-		{ "logfile",	required_argument,	NULL,		'f'	},
-		{ "config",	required_argument,	NULL,		'c'	},
-		{ "debug",	no_argument,		&do_debug,	1	},
-		{ "nolog",	no_argument,		&do_nolog,	1	},
-		{ "runasroot",	no_argument,		&do_root,	1	},
+		{ "nofork",		no_argument,		&do_nofork,		1	},
+		{ "logfile",	required_argument,	NULL,			'f'	},
+		{ "config",		required_argument,	NULL,			'c'	},
+		{ "debug",		no_argument,		&do_debug,		1	},
+		{ "nolog",		no_argument,		&do_nolog,		1	},
+		{ "runasroot",	no_argument,		&do_root,		1	},
 		{ "version",	no_argument,		&do_version,	1	},
 		{ 0, 0, 0, 0 }
 	};
@@ -557,14 +557,8 @@ InspIRCd::InspIRCd(int argc, char** argv)
 	this->WritePID(Config->PID);
 
 #ifdef WINDOWS
-	InitIPC();
-	
+	InitIPC();	
 	g_starting = false;
-
-	// remove the console if in no-fork
-	if(!Config->nofork)
-		FreeConsole();
-
 #endif
 }
 
@@ -985,14 +979,11 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
 #else
 		CheckIPC(this);
 
-		if(Config->nofork)
-		{
-			uptime = Time() - startup_time;
-			stime = gmtime(&uptime);
-			snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u",
-				LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec);
-			SetConsoleTitle(window_title);
-		}
+		uptime = Time() - startup_time;
+		stime = gmtime(&uptime);
+		snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u",
+			LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec);
+		SetConsoleTitle(window_title);
 #endif
 	}
 
@@ -1036,6 +1027,9 @@ int InspIRCd::Run()
 
 int main(int argc, char** argv)
 {
+#ifdef WINDOWS
+	ClearConsole();
+#endif
 	SI = new InspIRCd(argc, argv);
 	SI->Run();
 	delete SI;
diff --git a/src/socketengine_iocp.cpp b/src/socketengine_iocp.cpp
index 96e824899..58ce36177 100644
--- a/src/socketengine_iocp.cpp
+++ b/src/socketengine_iocp.cpp
@@ -32,7 +32,7 @@ IOCPEngine::~IOCPEngine()
 
 bool IOCPEngine::AddFd(EventHandler* eh)
 {
-	int fake_fd = GenerateFd();
+	int fake_fd = GenerateFd(eh->GetFd());
 	int is_accept = 0;
 	int opt_len = sizeof(int);
 	if(fake_fd < 0)
-- 
cgit v1.2.3