Changeset 1833

Timestamp:

14/09/2007 22:25:42 (4 years ago)

Author:

chris

Message:

Prepend the system-required prefix to the named pipe name from the
configuration file.

Location:

box/chris/general/lib/server

Files:

• WinNamedPipeStream.cpp (modified) (8 diffs)
• WinNamedPipeStream.h (modified) (2 diffs)

box/chris/general/lib/server/WinNamedPipeStream.cpp

@@ -26 +26 @@
 
 #include "MemLeakFindOn.h"
+
+std::string WinNamedPipeStream::sPipeNamePrefix = "\\\\.\\pipe\\";
 
 // --------------------------------------------------------------------------
@@ -73 +75 @@
 //
 // Function
-//              Name:    WinNamedPipeStream::Accept(const char* Name)
+//              Name:    WinNamedPipeStream::Accept(const std::string& rName)
 //              Purpose: Creates a new named pipe with the given name,
 //                      and wait for a connection on it
@@ -79 +81 @@
 //
 // --------------------------------------------------------------------------
-void WinNamedPipeStream::Accept(const wchar_t* pName)
+void WinNamedPipeStream::Accept(const std::string& rName)
 {
         if (mSocketHandle != INVALID_HANDLE_VALUE || mIsConnected) 
@@ -86 +88 @@
         }
 
-        mSocketHandle = CreateNamedPipeW( 
-                pName,                     // pipe name 
+        std::string socket = sPipeNamePrefix + rName;
+
+        mSocketHandle = CreateNamedPipeA( 
+                socket.c_str(),            // pipe name 
                 PIPE_ACCESS_DUPLEX |       // read/write access 
                 FILE_FLAG_OVERLAPPED,      // enabled overlapped I/O
@@ -101 +105 @@
         if (mSocketHandle == INVALID_HANDLE_VALUE)
         {
-                BOX_ERROR("Failed to CreateNamedPipeW(" << pName << "): " <<
+                BOX_ERROR("Failed to CreateNamedPipeA(" << socket << "): " <<
                         GetErrorMessage(GetLastError()));
                 THROW_EXCEPTION(ServerException, SocketOpenError)
@@ -110 +114 @@
         if (!connected)
         {
-                BOX_ERROR("Failed to ConnectNamedPipe(" << pName << "): " <<
+                BOX_ERROR("Failed to ConnectNamedPipe(" << socket << "): " <<
                         GetErrorMessage(GetLastError()));
                 Close();
@@ -157 +161 @@
 //
 // Function
-//              Name:    WinNamedPipeStream::Connect(const char* Name)
+//              Name:    WinNamedPipeStream::Connect(const std::string& rName)
 //              Purpose: Opens a connection to a listening named pipe
 //              Created: 2005/12/07
 //
 // --------------------------------------------------------------------------
-void WinNamedPipeStream::Connect(const wchar_t* pName)
+void WinNamedPipeStream::Connect(const std::string& rName)
 {
         if (mSocketHandle != INVALID_HANDLE_VALUE || mIsConnected) 
@@ -168 +172 @@
                 THROW_EXCEPTION(ServerException, SocketAlreadyOpen)
         }
-        
-        mSocketHandle = CreateFileW( 
-                pName,          // pipe name 
+
+        std::string socket = sPipeNamePrefix + rName;
+        
+        mSocketHandle = CreateFileA( 
+                socket.c_str(), // pipe name 
                 GENERIC_READ |  // read and write access 
                 GENERIC_WRITE, 

box/chris/general/lib/server/WinNamedPipeStream.h

@@ -28 +28 @@
 
         // server side - create the named pipe and listen for connections
-        void Accept(const wchar_t* Name);
+        void Accept(const std::string& rName);
 
         // client side - connect to a waiting server
-        void Connect(const wchar_t* Name);
+        void Connect(const std::string& rName);
 
         // both sides
@@ -62 +62 @@
         bool mIsServer;
         bool mIsConnected;
+
+        static std::string sPipeNamePrefix;
 };