Completely redesigned Server and Client.

Like, seriously, they're almost completely different.

1 files changed, 14 insertions, 14 deletions

diff --git a/src/stable/tcpserversocket.h b/src/stable/serversockettcp.h
index d15d7bd..8e43c76 100644
--- a/src/stable/tcpserversocket.h
+++ b/src/stable/serversockettcp.h
@@ -5,12 +5,13 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#ifndef BU_TCP_SERVER_SOCKET_H
-#define BU_TCP_SERVER_SOCKET_H
+#ifndef BU_SERVER_SOCKET_TCP_H
+#define BU_SERVER_SOCKET_TCP_H
 
 #include <stdint.h>
 #include "bu/string.h"
 #include "bu/exceptionbase.h"
+#include "bu/serversocket.h"
 
 #ifdef WIN32
  #include <Winsock2.h>
@@ -20,7 +21,7 @@
 
 namespace Bu
 {
-    subExceptionDecl( TcpServerSocketException );
+    subExceptionDecl( ServerSocketTcpException );
 
     /**
      * A single tcp/ip server socket.  When created the server socket will bind
@@ -34,7 +35,7 @@ namespace Bu
      *
      *@ingroup Serving
      */
-    class TcpServerSocket
+    class ServerSocketTcp : public ServerSocket
     {
     public:
 #ifdef WIN32
@@ -42,23 +43,22 @@ namespace Bu
 #else
         typedef int socket_t;
 #endif
-        TcpServerSocket( int nPort, int nPoolSize=40 );
-        TcpServerSocket( const String &sAddr, int nPort, int nPoolSize=40 );
-        TcpServerSocket( socket_t nSocket, bool bInit, int nPoolSize=40 );
-        TcpServerSocket( const TcpServerSocket &rSrc );
-        virtual ~TcpServerSocket();
+        ServerSocketTcp( int iPort, int nPoolSize=40 );
+        ServerSocketTcp( const String &sAddr, int iPort, int nPoolSize=40 );
+        ServerSocketTcp( socket_t nSocket, bool bInit, int nPoolSize=40 );
+        ServerSocketTcp( const ServerSocketTcp &rSrc );
+        virtual ~ServerSocketTcp();
 
-        int accept( int nTimeoutSec=0, int nTimeoutUSec=0 );
-        int getSocket();
-        int getPort();
+        virtual Bu::Socket *accept( int nTimeoutSec=0, int nTimeoutUSec=0 );
+        virtual bool getFd( int &rFdOut ) const;
 
     private:
         void startServer( struct sockaddr_in &name, int nPoolSize );
         void initServer( struct sockaddr_in &name, int nPoolSize );
 
         fd_set fdActive;
-        socket_t nServer;
-        int nPort;
+        socket_t iSocket;
+        int iPort;
     };
 }