Changeset 21:eb59943050c9 in xplcommon for src/xplcommon/posix/ClientSocket.h

Timestamp:

12/31/12 14:17:32 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Added the implementation of the local sockets for Win32 and it seems to work

File:

• src/xplcommon/posix/ClientSocket.h (modified) (3 diffs)

src/xplcommon/posix/ClientSocket.h

@@ -51 +51 @@
 private:
     /**
-     * The connector, if any. It is created only, if requested.
+     * The connector.
      */
-    Connector* connector;
+    Connector& connector;
 
 protected:
@@ -59 +59 @@
      * Construct the socket with the given parameters.
      */
-    ClientSocket(int domain, int type, Waiter* waiter = 0, int protocol = 0,
+    ClientSocket(int domain, int type, Connector& connector,
+                 Waiter* waiter = 0, int protocol = 0,
                  size_t readingCapacity = DEFAULT_CAPACITY,
                  size_t writingCapacity = DEFAULT_CAPACITY);
 
-public:
-    /**
-     * Destroy the socket.
-     */
-    virtual ~ClientSocket();
-
-    /**
-     * Get the connector. Use this object to connect to another socket.
-     */
-    Connector& getConnector();
-
 protected:
-    /**
-     * Create a new connector of the correct type.
-     */
-    virtual Connector* createConnector() = 0;
-
     /**
      * Handle any events on the file descriptor. If a connection is in
@@ -105 +90 @@
 //------------------------------------------------------------------------------
 
-inline ClientSocket::ClientSocket(int domain, int type, Waiter* waiter,
-                                  int protocol, size_t readingCapacity,
+inline ClientSocket::ClientSocket(int domain, int type, Connector& connector,
+                                  Waiter* waiter, int protocol,
+                                  size_t readingCapacity,
                                   size_t writingCapacity) :
     Socket(domain, type, waiter, protocol, readingCapacity, writingCapacity),
-    connector(0)
+    connector(connector)
 {
 }