Revert "windows: updating close logic for server and client pipes (osquery#53)"

Nick Anderson · Nick Anderson · commit ec4ccb5d5da7 · 2018-06-03T22:13:05.000-07:00
This reverts commit cb4df96.
diff --git a/osquery/TPipe.py b/osquery/TPipe.py
@@ -32,7 +32,7 @@ def close(self):
         in the same way
         """
         if self._handle is not None:
-            win32file.CloseHandle(self._handle)
+            win32pipe.DisconnectNamedPipe(self._handle)
             self._handle = None
 
 
@@ -67,10 +67,13 @@ def open(self):
         while conns < self._max_conn_attempts:
             try:
                 h = win32file.CreateFile(
-                    self._pipe_name,
-                    win32file.GENERIC_READ | win32file.GENERIC_WRITE, 0, None,
-                    win32file.OPEN_EXISTING, win32file.FILE_FLAG_OVERLAPPED,
-                    None)
+                        self._pipe_name,
+                        win32file.GENERIC_READ | win32file.GENERIC_WRITE,
+                        0,
+                        None,
+                        win32file.OPEN_EXISTING,
+                        win32file.FILE_FLAG_OVERLAPPED,
+                        None)
             except pywintypes.error as e:
                 if e.winerror != winerror.ERROR_PIPE_BUSY:
                     raise TTransportException(
@@ -195,8 +198,8 @@ def create_named_pipe(self):
 
         self._handle = win32pipe.CreateNamedPipe(
             self._pipe_name, openMode, pipeMode,
-            win32pipe.PIPE_UNLIMITED_INSTANCES, self._buff_size,
-            self._buff_size, win32pipe.NMPWAIT_WAIT_FOREVER, saAttr)
+            win32pipe.PIPE_UNLIMITED_INSTANCES, self._buff_size, self._buff_size,
+            win32pipe.NMPWAIT_WAIT_FOREVER, saAttr)
 
         err = win32api.GetLastError()
         if self._handle.handle == winerror.ERROR_INVALID_HANDLE:
@@ -220,13 +223,3 @@ def initiate_named_connect(self):
             if ret == winerror.ERROR_PIPE_CONNECTED:
                 win32event.SetEvent(self._overlapped.hEvent)
                 break
-
-    def close(self):
-        """
-        The server must ensure to disconnect so that subsequent reconnect
-        attempts are successful
-        """
-        if self._handle is not None:
-            win32pipe.DisconnectNamedPipe(self._handle)
-            win32file.CloseHandle(self._handle)
-            self._handle = None
