Changeset 22:d13fbc745959 in xplcommon for src/xplcommon/win32/LocalSocket.h

Timestamp:

01/02/13 06:43:16 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Cleaned up and simplified the code

File:

• src/xplcommon/win32/LocalSocket.h (modified) (4 diffs)

src/xplcommon/win32/LocalSocket.h

@@ -51 +51 @@
 public:
     /**
-     * Create a concrete pipe name from the given user-specified name.
+     * Create a concrete pipe path from the given user-specified name.
      *
      * @param dest the destination buffer, which should be at least
      * 256 bytes long.
      */
-    static void setupName(char* dest, const char* name);
+    static void setupPath(char* dest, const char* name);
 
     /**
@@ -90 +90 @@
 protected:
     /**
-     * Connect the named pipe with the current handle of this object.
-     *
-     * @return whether the connection succeeded. If not, it may be a
-     * failure, which is then indicated, or it may be an overlapped
-     * operation which needs to wait.
+     * Connect the client socket to the server.
      */
-    bool connect(Overlapped* overlapped);
+    bool connect(const char* path);
 
     friend class LocalAcceptor;
@@ -106 +102 @@
 //------------------------------------------------------------------------------
 
-inline void LocalSocket::setupName(char* dest, const char* name)
+inline void LocalSocket::setupPath(char* dest, const char* name)
 {
     snprintf(dest, 256, "\\\\.\\pipe\\%s", name);
@@ -134 +130 @@
 //------------------------------------------------------------------------------
 
-inline bool LocalSocket::connect(Overlapped* overlapped)
+inline bool LocalSocket::connect(const char* path)
 {
-    bool result = connectNamedPipe(handle, overlapped);
-    if (!result && overlapped==0) {
+    handle = CreateFile(path, GENERIC_READ|GENERIC_WRITE,
+                        0, 0, OPEN_EXISTING,
+                        FILE_FLAG_NO_BUFFERING | FILE_FLAG_OVERLAPPED, 0);
+    if (handle==0) {
         setErrorCode(GetLastError());
     }
-    return result;
+
+    return handle!=0;
 }