Add an overload for resolve that takes host and service separately

[libs/net.git] / source / streamsocket.h

diff --git a/source/streamsocket.h b/source/streamsocket.h
index 3ffe72aa164441f1510c383a7ca322dcdd29d4d3..8b39e91afd358214168c977e299e01bc714d3e76 100644 (file)
--- a/source/streamsocket.h
+++ b/source/streamsocket.h
@@ -1,21 +1,14 @@
 #ifndef MSP_NET_STREAMSOCKET_H_
 #define MSP_NET_STREAMSOCKET_H_
 
-#include "socket.h"
+#include "clientsocket.h"
 
 namespace Msp {
 namespace Net {
 
-class StreamSocket: public Socket
+class StreamSocket: public ClientSocket
 {
-       friend class StreamListenSocket;
-private:
-       bool connecting;
-
-public:
-       /** Emitted when the socket finishes connecting.  The argument is a
-       platform-dependent error code. */
-       sigc::signal<void, int> signal_connect_finished;
+       friend class StreamServerSocket;
 
 private:
        /// Used by StreamListenSocket to construct a new socket from accept.
@@ -30,14 +23,9 @@ public:
        If the socket is non-blocking, this function may return before the
        connection is fully established.  The caller must then use either the
        poll_connect function or an EventDispatcher to finish the process. */
-       virtual int connect(const SockAddr &);
-
-       bool is_connecting() const { return connecting; }
+       virtual bool connect(const SockAddr &);
 
-       /** Checks the status of a connection being established.  Returns 0 if the
-       connection was established successfully, 1 if it's still in progress.  If
-       the attempt finished due to an error, an exception is thrown. */
-       int poll_connect(const Time::TimeDelta &);
+       virtual bool poll_connect(const Time::TimeDelta &);
 
 private:
        void on_event(IO::PollEvent);