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, 7 insertions, 7 deletions

diff --git a/src/server.cpp b/src/server.cpp
index 51c056a..e701a69 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -8,9 +8,9 @@
 #include "bu/server.h"
 #include <errno.h>
 #include <unistd.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"
 
 Bu::Server::Server() :
@@ -28,7 +28,7 @@ Bu::Server::~Server()
 
 void Bu::Server::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 );
@@ -36,7 +36,7 @@ void Bu::Server::addPort( int nPort, int nPoolSize )
 
 void Bu::Server::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 );
@@ -75,7 +75,7 @@ void Bu::Server::scan()
                 {
                         if( hServers.has( j ) )
                         {
-                                ServerSocket *pSrv = hServers.get( j );
+                                TcpServerSocket *pSrv = hServers.get( j );
                                 addClient( pSrv->accept(), pSrv->getPort() );
                         }
                         else
@@ -97,7 +97,7 @@ void Bu::Server::scan()
                                 {
                                         pClient->processOutput();
                                 }
-                                catch( Bu::SocketException &e )
+                                catch( Bu::TcpSocketException &e )
                                 {
                                         closeClient( j );
                                 }
@@ -136,7 +136,7 @@ void Bu::Server::addClient( int nSocket, int nPort )
         FD_SET( nSocket, &fdActive );
 
         Client *c = new Client(
-                new Bu::Socket( nSocket ),
+                new Bu::TcpSocket( nSocket ),
                 new SrvClientLinkFactory()
                 );
         hClients.insert( nSocket, c );