mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using new handle cleanup structure

Browse Source
This commit is contained in:
Armin Novak 2015-03-11 17:57:01 +01:00
parent b03356f880
commit 0630ad88b5
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
winpr/libwinpr/pipe/pipe.c
View File

@ -71,10 +71,6 @@ typedef struct _NamedPipeServerSocketEntry
int references;
} NamedPipeServerSocketEntry;
static pthread_once_t pipe_initialized = PTHREAD_ONCE_INIT;
static HANDLE_CLOSE_CB _PipeHandleCloseCb;
static BOOL PipeCloseHandle(HANDLE handle);
static BOOL PipeIsHandled(HANDLE handle)
@ -90,11 +86,14 @@ static BOOL PipeIsHandled(HANDLE handle)
return TRUE;
}
static void PipeInitialize(void)
static int PipeGetFd(HANDLE handle)
{
_PipeHandleCloseCb.IsHandled = PipeIsHandled;
_PipeHandleCloseCb.CloseHandle = PipeCloseHandle;
RegisterHandleCloseCb(&_PipeHandleCloseCb);
WINPR_PIPE *pipe = (WINPR_PIPE *)handle;
if (!PipeIsHandled(handle))
return -1;
return pipe->fd;
}
BOOL PipeCloseHandle(HANDLE handle) {
@ -133,9 +132,6 @@ BOOL CreatePipe(PHANDLE hReadPipe, PHANDLE hWritePipe, LPSECURITY_ATTRIBUTES lpP
pipe_fd[0] = -1;
pipe_fd[1] = -1;
if (pthread_once(&pipe_initialized, PipeInitialize))
return FALSE;
if (pipe(pipe_fd) < 0)
{
WLog_ERR(TAG, "failed to create pipe");
@ -159,8 +155,15 @@ BOOL CreatePipe(PHANDLE hReadPipe, PHANDLE hWritePipe, LPSECURITY_ATTRIBUTES lpP
pReadPipe->fd = pipe_fd[0];
pWritePipe->fd = pipe_fd[1];
WINPR_HANDLE_SET_TYPE(pReadPipe, HANDLE_TYPE_ANONYMOUS_PIPE);
pReadPipe->cb.GetFd = PipeGetFd;
pReadPipe->cb.CloseHandle = PipeCloseHandle;
pReadPipe->cb.IsHandled = PipeIsHandled;
*((ULONG_PTR*) hReadPipe) = (ULONG_PTR) pReadPipe;
WINPR_HANDLE_SET_TYPE(pWritePipe, HANDLE_TYPE_ANONYMOUS_PIPE);
pWritePipe->cb.GetFd = PipeGetFd;
pWritePipe->cb.CloseHandle = PipeCloseHandle;
pWritePipe->cb.IsHandled = PipeIsHandled;
*((ULONG_PTR*) hWritePipe) = (ULONG_PTR) pWritePipe;
return TRUE;
}