1 files changed, 14 insertions, 12 deletions

diff --git a/src/stable/tcpsocket.h b/src/stable/sockettcp.h
index 69cc4fd..3fc14ef 100644
--- a/src/stable/tcpsocket.h
+++ b/src/stable/sockettcp.h
@@ -5,19 +5,19 @@
  * terms of the license contained in the file LICENSE.
  */
 
-#ifndef BU_TCP_SOCKET_H
-#define BU_TCP_SOCKET_H
+#ifndef BU_SOCKET_TCP_H
+#define BU_SOCKET_TCP_H
 
 #include <stdint.h>
 
 #include "bu/config.h"
-#include "bu/stream.h"
+#include "bu/socket.h"
 #include "bu/string.h"
 #include "bu/exceptionbase.h"
 
 namespace Bu
 {
-    subExceptionDeclBegin( TcpSocketException );
+    subExceptionDeclBegin( SocketTcpException );
         enum {
             cRead,
             cWrite,
@@ -41,23 +41,23 @@ namespace Bu
      * Please note that there is a condition that will occur eventually (at
      * least on *nix systems) that will trigger a SIGPIPE condition.  This
      * will terminate your program immediately unless handled properly.  Most
-     * people doing any connections with TcpSocket will want to put this in
+     * people doing any connections with SocketTcp will want to put this in
      * their program somewhere before they use it:
      *@code
      #include <signal.h>
      ...
      ...
      ...
-     sigset( SIGPIPE, SIG_IGN ); // do this before you use a Bu::TcpSocket
+     sigset( SIGPIPE, SIG_IGN ); // do this before you use a Bu::SocketTcp
      @endcode
-     * When this is done, Bu::TcpSocket will simply throw a broken pipe
+     * When this is done, Bu::SocketTcp will simply throw a broken pipe
      * exception just like every other error condition, allowing your program
      * to handle it sanely.
      *
      *@ingroup Serving
      *@ingroup Streams
      */
-    class TcpSocket : public Stream
+    class SocketTcp : public Socket
     {
     public:
 #ifdef WIN32
@@ -66,10 +66,10 @@ namespace Bu
         typedef int handle;
 #endif
 
-        TcpSocket( handle nTcpSocket );
-        TcpSocket( const String &sAddr, int nPort, int nTimeout=30,
+        SocketTcp( handle nSocketTcp );
+        SocketTcp( const String &sAddr, int nPort, int nTimeout=30,
                 bool bBlocking=true );
-        virtual ~TcpSocket();
+        virtual ~SocketTcp();
         
         virtual void close();
         virtual size read( void *pBuf, size nBytes );
@@ -111,10 +111,12 @@ namespace Bu
         virtual size getBlockSize() const;
         virtual Bu::String getLocation() const;
 
+        virtual bool getFd( int &rFdOut ) const;
+
     private:
         void setAddress();
 
-        handle nTcpSocket;
+        handle nSocketTcp;
         
         bool bActive;
         bool bBlocking;