Merged in the core branch. This is a major update that fixes many things, and

changes many others, including source files that were deleted and renamed.

Before doing this update, I reccomend a full clean, or even a fresh checkout.

Things to note, most outstanding about this update:
 - Bu::Socket was changed to Bu::TcpSocket and the default mode is blocking.
 - All templatized container classes are SharedCore now, which is good, but
   SharedCore is inherently non-reentrant safe.  However, all SharedCore classes
   have a "clone" function that return a non-shared copy of the object, safe for
   passing into a reentrant safe function accessing shared memory.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/itoserver.cpp b/src/itoserver.cpp
index a1d804a..ea737bf 100644
--- a/src/itoserver.cpp
+++ b/src/itoserver.cpp
@@ -7,9 +7,9 @@
 
 #include "bu/itoserver.h"
 #include <errno.h>
-#include "bu/serversocket.h"
+#include "bu/tcpserversocket.h"
 #include "bu/client.h"
-#include "bu/socket.h"
+#include "bu/tcpsocket.h"
 
 #include "bu/config.h"
 
@@ -41,7 +41,7 @@ Bu::ItoServer::~ItoServer()
 
 void Bu::ItoServer::addPort( int nPort, int nPoolSize )
 {
-        ServerSocket *s = new ServerSocket( nPort, nPoolSize );
+        TcpServerSocket *s = new TcpServerSocket( nPort, nPoolSize );
         int nSocket = s->getSocket();
         FD_SET( nSocket, &fdActive );
         hServers.insert( nSocket, s );
@@ -49,7 +49,7 @@ void Bu::ItoServer::addPort( int nPort, int nPoolSize )
 
 void Bu::ItoServer::addPort( const FString &sAddr, int nPort, int nPoolSize )
 {
-        ServerSocket *s = new ServerSocket( sAddr, nPort, nPoolSize );
+        TcpServerSocket *s = new TcpServerSocket( sAddr, nPort, nPoolSize );
         int nSocket = s->getSocket();
         FD_SET( nSocket, &fdActive );
         hServers.insert( nSocket, s );
@@ -92,7 +92,7 @@ void Bu::ItoServer::run()
                 {
                         if( FD_ISSET( i.getKey(), &fdRead ) )
                         {
-                                ServerSocket *pSrv = i.getValue();
+                                TcpServerSocket *pSrv = i.getValue();
                                 addClient( pSrv->accept(), pSrv->getPort() );
                         }
                 }
@@ -126,7 +126,7 @@ Bu::ItoServer::ItoClient::ItoClient( ItoServer &rSrv, int iSocket, int iPort,
         FD_SET( iSocket, &fdActive );
 
         pClient = new Client(
-                new Bu::Socket( iSocket ),
+                new Bu::TcpSocket( iSocket ),
                 new SrvClientLinkFactory( rSrv )
                 );
 }