Added some more constructors to the ServerSocket, and also switched the write

function in Bu::Formatter to take a void *, what was I thinking?

1 files changed, 35 insertions, 2 deletions

diff --git a/src/serversocket.cpp b/src/serversocket.cpp
index 89fef7e..b3a8c2d 100644
--- a/src/serversocket.cpp
+++ b/src/serversocket.cpp
@@ -65,9 +65,37 @@ Bu::ServerSocket::ServerSocket(const FString &sAddr,int nPort, int nPoolSize) :
         startServer( name, nPoolSize );
 }
 
+Bu::ServerSocket::ServerSocket( int nServer, bool bInit, int nPoolSize ) :
+        nServer( nServer ),
+        nPort( 0 )
+{
+        if( bInit )
+        {
+                struct sockaddr name;
+                socklen_t namelen = sizeof(name);
+                getpeername( nServer, &name, &namelen );
+
+                initServer( *((sockaddr_in *)&name), nPoolSize );
+        }
+        else
+        {
+                FD_ZERO( &fdActive );
+                FD_SET( nServer, &fdActive );
+        }
+}
+
+Bu::ServerSocket::ServerSocket( const ServerSocket &rSrc )
+{
+        nServer = dup( rSrc.nServer );
+        nPort = rSrc.nPort;
+        FD_ZERO( &fdActive );
+        FD_SET( nServer, &fdActive );
+}
+
 Bu::ServerSocket::~ServerSocket()
 {
-        ::close( nServer );
+        if( nServer > -1 )
+                ::close( nServer );
 }
 
 void Bu::ServerSocket::startServer( struct sockaddr_in &name, int nPoolSize )
@@ -79,7 +107,7 @@ void Bu::ServerSocket::startServer( struct sockaddr_in &name, int nPoolSize )
         {
                 throw Bu::ServerSocketException("Couldn't create a listen socket.");
         }
-
+        
         int opt = 1;
         bu_setsockopt(
                         nServer,
@@ -89,6 +117,11 @@ void Bu::ServerSocket::startServer( struct sockaddr_in &name, int nPoolSize )
                         sizeof( opt )
                         );
 
+        initServer( name, nPoolSize );
+}
+
+void Bu::ServerSocket::initServer( struct sockaddr_in &name, int nPoolSize )
+{
         if( bu_bind( nServer, (struct sockaddr *) &name, sizeof(name) ) < 0 )
         {
                 throw Bu::ServerSocketException("Couldn't bind to the listen socket.");