1 files changed, 49 insertions, 52 deletions

diff --git a/src/stable/tcpserversocket.cpp b/src/stable/serversockettcp.cpp
index b1e3461..c3750b2 100644
--- a/src/stable/tcpserversocket.cpp
+++ b/src/stable/serversockettcp.cpp
@@ -23,12 +23,13 @@
 #include <sys/types.h>
 //#include <termios.h>
 #include <fcntl.h>
-#include "bu/tcpserversocket.h"
+#include "bu/serversockettcp.h"
+#include "bu/sockettcp.h"
 
-namespace Bu { subExceptionDef( TcpServerSocketException ) }
+namespace Bu { subExceptionDef( ServerSocketTcpException ) }
 
-Bu::TcpServerSocket::TcpServerSocket( int nPort, int nPoolSize ) :
-    nPort( nPort )
+Bu::ServerSocketTcp::ServerSocketTcp( int iPort, int nPoolSize ) :
+    iPort( iPort )
 {
 #ifdef WIN32
     Bu::Winsock2::getInstance();
@@ -39,7 +40,7 @@ Bu::TcpServerSocket::TcpServerSocket( int nPort, int nPoolSize ) :
 
     /* Give the socket a name. */
     name.sin_family = AF_INET;
-    name.sin_port = bu_htons( nPort );
+    name.sin_port = bu_htons( iPort );
 
     // I think this specifies who we will accept connections from,
     // a good thing to make configurable later on
@@ -48,8 +49,8 @@ Bu::TcpServerSocket::TcpServerSocket( int nPort, int nPoolSize ) :
     startServer( name, nPoolSize );
 }
 
-Bu::TcpServerSocket::TcpServerSocket(const String &sAddr,int nPort, int nPoolSize) :
-    nPort( nPort )
+Bu::ServerSocketTcp::ServerSocketTcp(const String &sAddr,int iPort, int nPoolSize) :
+    iPort( iPort )
 {
 #ifdef WIN32
     Bu::Winsock2::getInstance();
@@ -61,7 +62,7 @@ Bu::TcpServerSocket::TcpServerSocket(const String &sAddr,int nPort, int nPoolSiz
     /* Give the socket a name. */
     name.sin_family = AF_INET;
 
-    name.sin_port = bu_htons( nPort );
+    name.sin_port = bu_htons( iPort );
 
 #ifdef WIN32
     name.sin_addr.s_addr = bu_inet_addr( sAddr.getStr() );
@@ -72,9 +73,9 @@ Bu::TcpServerSocket::TcpServerSocket(const String &sAddr,int nPort, int nPoolSiz
     startServer( name, nPoolSize );
 }
 
-Bu::TcpServerSocket::TcpServerSocket( socket_t nServer, bool bInit, int nPoolSize ) :
-    nServer( nServer ),
-    nPort( 0 )
+Bu::ServerSocketTcp::ServerSocketTcp( socket_t iSocket, bool bInit, int nPoolSize ) :
+    iSocket( iSocket ),
+    iPort( 0 )
 {
 #ifdef WIN32
     Bu::Winsock2::getInstance();
@@ -84,56 +85,56 @@ Bu::TcpServerSocket::TcpServerSocket( socket_t nServer, bool bInit, int nPoolSiz
     {
         struct sockaddr name;
         socklen_t namelen = sizeof(name);
-        getpeername( nServer, &name, &namelen );
+        getpeername( iSocket, &name, &namelen );
 
         initServer( *((sockaddr_in *)&name), nPoolSize );
     }
     else
     {
         FD_ZERO( &fdActive );
-        FD_SET( nServer, &fdActive );
+        FD_SET( iSocket, &fdActive );
     }
 }
 
-Bu::TcpServerSocket::TcpServerSocket( const TcpServerSocket &rSrc )
+Bu::ServerSocketTcp::ServerSocketTcp( const ServerSocketTcp &rSrc )
 {
 #ifdef WIN32
     Bu::Winsock2::getInstance();
 #endif
 
-    nServer = dup( rSrc.nServer );
-    nPort = rSrc.nPort;
+    iSocket = dup( rSrc.iSocket );
+    iPort = rSrc.iPort;
     FD_ZERO( &fdActive );
-    FD_SET( nServer, &fdActive );
+    FD_SET( iSocket, &fdActive );
 }
 
-Bu::TcpServerSocket::~TcpServerSocket()
+Bu::ServerSocketTcp::~ServerSocketTcp()
 {
 #ifdef WIN32
-    if( nServer != INVALID_SOCKET )
+    if( iSocket != INVALID_SOCKET )
 #else
-    if( nServer > -1 )
+    if( iSocket > -1 )
 #endif
-        ::close( nServer );
+        ::close( iSocket );
 }
 
-void Bu::TcpServerSocket::startServer( struct sockaddr_in &name, int nPoolSize )
+void Bu::ServerSocketTcp::startServer( struct sockaddr_in &name, int nPoolSize )
 {
     /* Create the socket. */
-    nServer = bu_socket( PF_INET, SOCK_STREAM, 0 );
+    iSocket = bu_socket( PF_INET, SOCK_STREAM, 0 );
 
 #ifdef WIN32
-    if( nServer == INVALID_SOCKET )
+    if( iSocket == INVALID_SOCKET )
 #else
-    if( nServer < 0 )
+    if( iSocket < 0 )
 #endif
     {
-        throw Bu::TcpServerSocketException("Couldn't create a listen socket.");
+        throw Bu::ServerSocketTcpException("Couldn't create a listen socket.");
     }
     
     int opt = 1;
     bu_setsockopt(
-            nServer,
+            iSocket,
             SOL_SOCKET,
             SO_REUSEADDR,
             (char *)&opt,
@@ -143,31 +144,26 @@ void Bu::TcpServerSocket::startServer( struct sockaddr_in &name, int nPoolSize )
     initServer( name, nPoolSize );
 }
 
-void Bu::TcpServerSocket::initServer( struct sockaddr_in &name, int nPoolSize )
+void Bu::ServerSocketTcp::initServer( struct sockaddr_in &name, int nPoolSize )
 {
-    if( bu_bind( nServer, (struct sockaddr *) &name, sizeof(name) ) < 0 )
+    if( bu_bind( iSocket, (struct sockaddr *) &name, sizeof(name) ) < 0 )
     {
-        throw Bu::TcpServerSocketException("Couldn't bind to the listen socket.");
+        throw Bu::ServerSocketTcpException("Couldn't bind to the listen socket.");
     }
 
-    if( bu_listen( nServer, nPoolSize ) < 0 )
+    if( bu_listen( iSocket, nPoolSize ) < 0 )
     {
-        throw Bu::TcpServerSocketException(
+        throw Bu::ServerSocketTcpException(
             "Couldn't begin listening to the server socket."
             );
     }
 
     FD_ZERO( &fdActive );
     /* Initialize the set of active sockets. */
-    FD_SET( nServer, &fdActive );
+    FD_SET( iSocket, &fdActive );
 }
 
-int Bu::TcpServerSocket::getSocket()
-{
-    return nServer;
-}
-
-int Bu::TcpServerSocket::accept( int nTimeoutSec, int nTimeoutUSec )
+Bu::Socket *Bu::ServerSocketTcp::accept( int nTimeoutSec, int nTimeoutUSec )
 {
     fd_set fdRead = fdActive;
 
@@ -177,14 +173,14 @@ int Bu::TcpServerSocket::accept( int nTimeoutSec, int nTimeoutUSec )
     xT.tv_usec = nTimeoutUSec;  
 
     if( TEMP_FAILURE_RETRY(
-        bu_select( nServer+1, &fdRead, NULL, NULL, &xT )) < 0 )
+        bu_select( iSocket+1, &fdRead, NULL, NULL, &xT )) < 0 )
     {
-        throw Bu::TcpServerSocketException(
+        throw Bu::ServerSocketTcpException(
             "Error scanning for new connections: %s", strerror( errno )
             );
     }
 
-    if( FD_ISSET( nServer, &fdRead ) )
+    if( FD_ISSET( iSocket, &fdRead ) )
     {
         struct sockaddr_in clientname;
         socklen_t size;
@@ -192,23 +188,23 @@ int Bu::TcpServerSocket::accept( int nTimeoutSec, int nTimeoutUSec )
 
         size = sizeof( clientname );
 #ifdef WIN32
-        nClient = bu_accept( nServer, (struct sockaddr *)&clientname, &size);
+        nClient = bu_accept( iSocket, (struct sockaddr *)&clientname, &size);
 #else /* not-WIN32 */
 #ifdef __CYGWIN__
-        nClient = ::accept( nServer, (struct sockaddr *)&clientname,
+        nClient = ::accept( iSocket, (struct sockaddr *)&clientname,
                 (int *)&size
                 );
 #else /* not-cygwin */
 #ifdef __APPLE__
-        nClient = ::accept( nServer, (struct sockaddr *)&clientname, (socklen_t*)&size );
+        nClient = ::accept( iSocket, (struct sockaddr *)&clientname, (socklen_t*)&size );
 #else /* linux */
-        nClient = ::accept( nServer, (struct sockaddr *)&clientname, &size );
+        nClient = ::accept( iSocket, (struct sockaddr *)&clientname, &size );
 #endif /* __APPLE__ */
 #endif /* __CYGWIN__ */
 #endif /* WIN32 */
         if( nClient < 0 )
         {
-            throw Bu::TcpServerSocketException(
+            throw Bu::ServerSocketTcpException(
                 "Error accepting a new connection: %s", strerror( errno )
                 );
         }
@@ -227,7 +223,7 @@ int Bu::TcpServerSocket::accept( int nTimeoutSec, int nTimeoutUSec )
             flags |= O_NONBLOCK;
             if( fcntl( nClient, F_SETFL, flags ) < 0)
             {
-                throw Bu::TcpServerSocketException(
+                throw Bu::ServerSocketTcpException(
                     "Error setting option on client socket: %s",
                     strerror( errno )
                     );
@@ -244,14 +240,15 @@ int Bu::TcpServerSocket::accept( int nTimeoutSec, int nTimeoutUSec )
 #endif
         }
 
-        return nClient;
+        return new SocketTcp( nClient );
     }
 
-    return -1;
+    return NULL;
 }
 
-int Bu::TcpServerSocket::getPort()
+bool Bu::ServerSocketTcp::getFd( int &rFdOut ) const
 {
-    return nPort;
+    rFdOut = iSocket;
+    return true;
 }