--- innwebd/base_passive.cpp	2004/07/03 13:56:04	1.3
+++ innwebd/base_passive.cpp	2004/07/04 22:49:03	1.6
@@ -1,10 +1,10 @@
 /*******************************************************/
 /*                                                     */
-/*  LeafOK Innd                                        */
+/*  LeafOK Innbbsd                                     */
 /*  Copyright (C) LeafOK.com, 2003-2004                */
 /*                                                     */
 /*  Programmed by Leaf                                 */
-/*  E-mail:leaf@leafok.com  QQ:6049044                 */
+/*  E-mail:leaflet@leafok.com  QQ:6049044              */
 /*                                                     */
 /*  http://bbs.leafok.com                              */
 /*  http://bbs.leafok.net                              */
@@ -102,14 +102,12 @@ int base_passive::work()
 	if (this->load_priv() != 0)
 		return -1;
 
-	this->p_ThreadPool = new thread_pool(MAX_CLIENT);
+	this->SetThreadPool(new thread_pool(MAX_CLIENT));
 	if (this->p_ThreadPool->GetLastError() != 0)
 	{
 		return -1;
 	}
 
-	hThreadCurrent = GetCurrentThread();
-
 	if (this->s_connect(this->w_address,this->w_port) == 0)
 	{
 		this->Startup();
@@ -129,7 +127,7 @@ int base_passive::work()
 	
 			this->running = true;
 
-			this->GetThreadPool()->SetThreadStatus(hThreadCurrent,thread_pool::S_WAITING);
+			this->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),thread_pool::S_WAITING);
 
 			namelen = sizeof(sin);
 			if ((p->s = accept(this->s,(LPSOCKADDR)&sin,&namelen)) == INVALID_SOCKET)
@@ -141,20 +139,20 @@ int base_passive::work()
 				return -2;
 			}
 
-			this->GetThreadPool()->SetThreadStatus(hThreadCurrent,thread_pool::S_WORKING);
-
 			if (this->IsShutdown())
 			{
 				break;
 			}
 
+			this->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),tread_pool::S_WORKING);
+
 
 			strcpy(p->hostaddr,inet_ntoa(sin.sin_addr));
 			p->port = sin.sin_port;
 			p->isConnected = true;
 
 //		strcpy(p->w_conn_str,this->w_conn_str);
-			if (this->>get_priv(p)!=0)
+
 			if (this->get_priv(p)!=0)
 			{
 				p->s_send("502 Load access file failed.\r\n");
@@ -173,7 +171,7 @@ int base_passive::work()
 			if (this->GetThreadPool()->GetThreadCount() < MAX_CLIENT)
 			{
 				if (hThreadCurrent = CreateThread(NULL,0,(LPTHREAD_START_ROUTINE)base_passive::AcceptThread,(LPVOID)p,0,&ulThreadId))
-//					base_passive::uThreadCount++;
+				{
 					CloseHandle(hThreadCurrent);
 					syslog << logfile::log_head << "Create accept thread ... OK" << endl;
 				}
@@ -193,8 +191,6 @@ int base_passive::work()
 		Sleep(1000*5); // Wait several seconds for all threads to exit
 	}
 	this->s_close();
-	delete(this->p_ThreadPool);
-
 
 	this->unload_priv();
 
@@ -204,19 +200,19 @@ int base_passive::work()
 }
 
 DWORD base_passive::AcceptThread(LPVOID pParam)
-	HANDLE hThreadCurrent;
 {
 	base_passive* p;
 
 	try
 	{
-		hThreadCurrent = GetCurrentThread();
 		p = (base_passive*)pParam;
-		if (p->GetParentThread()->GetThreadPool()->AddThread(hThreadCurrent, CLOCKS_PER_SEC * 30) != 0)
+
+		p->ulMainThreadId = GetCurrentThreadId();
+
 		if (p->GetParentThread()->GetThreadPool()->AddThread(GetCurrentThreadId(), CLOCKS_PER_SEC * 30) != 0)
 		{
 			syslog << logfile::log_head << "Register thread ... Failed" << endl;
-		p->GetParentThread()->GetThreadPool()->SetThreadStatus(hThreadCurrent,thread_pool::S_WORKING);
+		}
 		p->GetParentThread()->GetThreadPool()->SetThreadStatus(GetCurrentThreadId(),thread_pool::S_WORKING);
 
 		if (p->db_env_init() == 0)
@@ -227,7 +223,7 @@ DWORD base_passive::AcceptThread(LPVOID
 		{
 			syslog << logfile::log_head << "DB_ENV_INIT failed" << endl;
 		}
-		if (p->GetParentThread()->GetThreadPool()->RemoveThread(hThreadCurrent) != 0)
+
 		if (p->GetParentThread()->GetThreadPool()->RemoveThread(GetCurrentThreadId()) != 0)
 		{
 			syslog << logfile::log_head << "Unregister thread ... Failed" << endl;