From 9ab87f39d7fc37e52d742d38b191eed9128d4b5b Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Thu, 7 Feb 2008 19:01:12 +0000
Subject: Wowee, I think all this new stuff works, Conduit I don't need now, so
 it's not done yet.  The Client class now supports a function called getLink()
 which returns a ClientLink object.  This object may then be passed off to any
 other class and called to send messages to that client object. It is
 threadsafe if ItoServer is being used, and not for Server.  Sending a message
 via a ClientLink calls the onMessage function on the assosiated protocol.

Note that sending messages from within protocol event handlers or functions they
call, while safe, may be slow and it's reccomended that you avoid this.
---
 src/itoserver.cpp | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

(limited to 'src/itoserver.cpp')

diff --git a/src/itoserver.cpp b/src/itoserver.cpp
index 7426e8a..db5ae04 100644
--- a/src/itoserver.cpp
+++ b/src/itoserver.cpp
@@ -127,7 +127,8 @@ Bu::ItoServer::ItoClient::ItoClient( ItoServer &rSrv, int iSocket, int iPort,
 	FD_SET( iSocket, &fdActive );
 
 	pClient = new Client(
-		new Bu::Socket( iSocket )
+		new Bu::Socket( iSocket ),
+		new SrvClientLinkFactory( rSrv )
 		);
 }
 
@@ -137,7 +138,10 @@ Bu::ItoServer::ItoClient::~ItoClient()
 
 void *Bu::ItoServer::ItoClient::run()
 {
+	imProto.lock();
 	rSrv.onNewConnection( pClient, iPort );
+	pClient->processOutput();
+	imProto.unlock();
 
 	for(;;)
 	{
@@ -151,14 +155,29 @@ void *Bu::ItoServer::ItoClient::run()
 			throw ExceptionBase("Error attempting to scan open connections.");
 		}
 
+		while( !qMsg.isEmpty() )
+		{
+			imProto.lock();
+			Bu::FString *pMsg = qMsg.dequeue();
+			pClient->onMessage( *pMsg );
+			delete pMsg;
+			pClient->processOutput();
+			imProto.unlock();
+		}
+
 		if( FD_ISSET( iSocket, &fdRead ) )
 		{
+			imProto.lock();
 			pClient->processInput();
+			imProto.unlock();
 			if( !pClient->isOpen() )
 			{
+				imProto.lock();
 				rSrv.onClosedConnection( pClient );
+				imProto.unlock();
 
 				rSrv.clientCleanup( iSocket );
+				
 				return NULL;
 			}
 		}
@@ -166,9 +185,55 @@ void *Bu::ItoServer::ItoClient::run()
 		// Now we just try to write all the pending data on the socket.
 		// this could be done better eventually, if we care about the socket
 		// wanting to accept writes (using a select).
+		imProto.lock();
 		pClient->processOutput();
+		imProto.unlock();
 	}
 
 	return NULL;
 }
 
+Bu::ItoServer::SrvClientLink::SrvClientLink( ItoClient *pClient ) :
+	pClient( pClient )
+{
+}
+
+Bu::ItoServer::SrvClientLink::~SrvClientLink()
+{
+}
+
+void Bu::ItoServer::SrvClientLink::sendMsg( const Bu::FString &sMsg )
+{
+	if( !pClient->imProto.trylock() )
+	{
+		pClient->pClient->onMessage( sMsg );
+		pClient->pClient->processOutput();
+		pClient->imProto.unlock();
+	}
+	else
+	{
+		Bu::FString *pMsg = new Bu::FString( sMsg );
+		pClient->qMsg.enqueue( pMsg );
+	}
+}
+
+Bu::ItoServer::SrvClientLinkFactory::SrvClientLinkFactory(
+		Bu::ItoServer &rSrv ) :
+	rSrv( rSrv )
+{
+}
+
+Bu::ItoServer::SrvClientLinkFactory::~SrvClientLinkFactory()
+{
+}
+
+Bu::ClientLink *Bu::ItoServer::SrvClientLinkFactory::createLink(
+		Bu::Client *pClient )
+{
+	rSrv.imClients.lock();
+	ItoClient *pCli = rSrv.hClients.get( *pClient->getSocket() );
+	rSrv.imClients.unlock();
+
+	return new SrvClientLink( pCli );
+}
+
-- 
cgit v1.2.3