--- innwebd/controld.cpp	2004/07/03 15:10:23	1.5
+++ innwebd/controld.cpp	2008/04/11 17:14:49	1.14
@@ -1,14 +1,10 @@
 /*******************************************************/
 /*                                                     */
-/*  LeafOK Innd                                        */
-/*  Copyright (C) LeafOK.com, 2003-2004                */
+/*  LeafOK Innbbsd                                     */
 /*                                                     */
-/*  Programmed by Leaf                                 */
-/*  E-mail:leaf@leafok.com  QQ:6049044                 */
+/*  Copyright (C) LeafOK.com, 2003-2008                */
 /*                                                     */
-/*  http://bbs.leafok.com                              */
-/*  http://bbs.leafok.net                              */
-/*  http://bbs.fenglin.info                            */
+/*  http://www.leafok.com                              */
 /*                                                     */
 /*******************************************************/
 
@@ -35,23 +31,20 @@ int controld::Accept(void)
 	CString out,cmd;
 	char temp[256];
 	int result;
-	HANDLE hThreadCurrent;
 
 	try
 	{
-		hThreadCurrent = GetCurrentThread();
-
 		out.Format("200 %s ready.",App_common::GetVersion());
 		this->s_send(out);
 		while(!this->thread_terminate)
 		{
-			this->GetParentThread()->GetThreadPool()->SetThreadStatus(hThreadCurrent,thread_pool::S_WAITING);
+			this->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),thread_pool::S_WAITING);
 
 			if (this->s_receive(out) == 0)  //Connection closed
 				break;
 			out.Trim();
 
-			this->GetParentThread()->GetThreadPool()->SetThreadStatus(hThreadCurrent,thread_pool::S_WORKING);
+			this->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),thread_pool::S_WORKING);
 
 			syslog << logfile::log_head << "Cmd: " << out << endl;
 
@@ -92,6 +85,8 @@ int controld::Accept(void)
 						}
 
 						this->s_send(result == 0 ? "OK" : "Failed");
+
+						syslog << logfile::log_head << "Begin " << cmd << " ... " << (result == 0 ? "OK" : "Failed") << endl;
 					}
 					else
 					{
@@ -134,6 +129,8 @@ int controld::Accept(void)
 						}
 
 						this->s_send(result == 0 ? "OK" : "Failed");
+
+						syslog << logfile::log_head << "End " << cmd << " ... " << (result == 0 ? "OK" : "Failed") << endl;
 					}
 					else
 					{
@@ -142,16 +139,16 @@ int controld::Accept(void)
 				}
 				else
 				{
-					this>s_send("501 service");
+					this->s_send("501 service");
 				}
-				contiinue;
+				continue;
 			}
 
 			if (cmd == "SHUTDOWN")
 			{
 				if (this->access.control)
 				{
-					this->_send("Shutting down ... ",falsse);
+					this->s_send("Shutting down ... ",false);
 
 					((controld*)(this->GetParentThread()))->ShutdownChild();
 
@@ -182,7 +179,7 @@ int controld::Accept(void)
 
 			if (cmd == "ACTIVE")
 			{
-				if (sscanf(out,"%*s %0s",temp) == 1)
+				if (sscanf(out,"%*s %20s",temp) == 1)
 					cmd = strupr(temp);
 				else
 					cmd = "";
@@ -195,6 +192,9 @@ int controld::Accept(void)
 						this->s_send("201 Entering native mode");
 						base_active nntpClient;
 						nntpClient.configure(this->innd_id,this->innd_name,this->innd_server,this->innd_uid,"",0,this->w_conn_str);
+
+						this->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),thread_pool::S_WAITING);
+
 						if (cmd == "POST") // Get & Post
 						{
 							nntpClient.work(true,false);
@@ -203,6 +203,9 @@ int controld::Accept(void)
 						{
 							nntpClient.work(false,true);
 						}
+
+						this->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),thread_pool::S_WORKING);
+
 						this->s_send("Entering passive mode\r\n.");
 					}
 					else
@@ -228,7 +231,9 @@ int controld::Accept(void)
 	}
 	catch(CException* e)
 	{
-		syslog << logfile::log_head << "Error in accept()" << endl;
+		char strErrMsg[1024];
+		e->GetErrorMessage(strErrMsg,1024);
+		syslog << logfile::log_head << "Error in accept() [" << strErrMsg << "]" << endl;
 		e->Delete();
 		return -1;
 	}
@@ -369,7 +374,9 @@ int controld::load_conf(const char* conf
 	}
 	catch(CException* e)
 	{
-		syslog << logfile::log_head << "Load configuration failed" << endl;
+		char strErrMsg[1024];
+		e->GetErrorMessage(strErrMsg,1024);
+		syslog << logfile::log_head << "Load configuration failed [" << strErrMsg << "]" << endl;
 		e->Delete();
 		return -1;
 	}
@@ -423,36 +430,48 @@ void controld::StartupChild(void)
 
 void controld::StartupDelay(void)
 {
+	syslog << logfile::log_head << "Startup delay for " << 
+		this->startup_delay << " seconds"<< endl;
+
 	Sleep(this->startup_delay * 1000);
 }
 
 void controld::ShutdownChild(void)
 {
-	if (this->bbsd.end() == 0)
-	{
-		syslog << logfile::log_head << "End BBSD ... OK" << endl;
-	}
-	else
+	if (this->bbsd.IsRunning())
 	{
-		syslog << logfile::log_head << "End BBSD ... Failed" << endl;
+		if (this->bbsd.end() == 0)
+		{
+			syslog << logfile::log_head << "End BBSD ... OK" << endl;
+		}
+		else
+		{
+			syslog << logfile::log_head << "End BBSD ... Failed" << endl;
+		}
 	}
 
-	if (this->innd.end() == 0)
+	if (this->innd.IsRunning())
 	{
-		syslog << logfile::log_head << "End INND ... OK" << endl;
-	}
-	else
-	{
-		syslog << logfile::log_head << "End INND ... Failed" << endl;
+		if (this->innd.end() == 0)
+		{
+			syslog << logfile::log_head << "End INND ... OK" << endl;
+		}
+		else
+		{
+			syslog << logfile::log_head << "End INND ... Failed" << endl;
+		}
 	}
 
-	if (this->outd.end() == 0)
-	{
-		syslog << logfile::log_head << "End OUTD ... OK" << endl;
-	}
-	else
+	if (this->outd.IsRunning())
 	{
-		syslog << logfile::log_head << "End OUTD ... Failed" << endl;
+		if (this->outd.end() == 0)
+		{
+			syslog << logfile::log_head << "End OUTD ... OK" << endl;
+		}
+		else
+		{
+			syslog << logfile::log_head << "End OUTD ... Failed" << endl;
+		}
 	}
 }
 
@@ -483,3 +502,8 @@ int controld::CleanupThreadPool(void)
 
 	return 0;
 }
+
+bool controld::check_priv(void)
+{
+	return this->access.control;
+}