mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2554 from akallabeth/event_fix 

Fix for transport event reset
This commit is contained in:
Norbert Federa 2015-04-22 11:04:37 +02:00
parent 6cd7713e12 f634e52289
commit af79c30913
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libfreerdp/core/tcp.c
View File

@ -98,21 +98,6 @@ typedef struct _WINPR_BIO_SIMPLE_SOCKET WINPR_BIO_SIMPLE_SOCKET;
static int transport_bio_simple_init(BIO* bio, SOCKET socket, int shutdown);
static int transport_bio_simple_uninit(BIO* bio);
static void transport_bio_simple_check_reset_event(BIO* bio)
{
u_long nbytes = 0;
WINPR_BIO_SIMPLE_SOCKET* ptr = (WINPR_BIO_SIMPLE_SOCKET*) bio->ptr;
#ifndef _WIN32
return;
#endif
_ioctlsocket(ptr->socket, FIONREAD, &nbytes);
if (nbytes < 1)
WSAResetEvent(ptr->hEvent);
}
long transport_bio_simple_callback(BIO* bio, int mode, const char* argp, int argi, long argl, long ret)
{
return 1;
@ -164,7 +149,6 @@ static int transport_bio_simple_read(BIO* bio, char* buf, int size)
if (status > 0)
{
transport_bio_simple_check_reset_event(bio);
return status;
}
@ -186,8 +170,6 @@ static int transport_bio_simple_read(BIO* bio, char* buf, int size)
BIO_clear_flags(bio, BIO_FLAGS_SHOULD_RETRY);
}
transport_bio_simple_check_reset_event(bio);
return -1;
}
@ -378,13 +360,13 @@ static int transport_bio_simple_init(BIO* bio, SOCKET socket, int shutdown)
bio->init = 1;
#ifdef _WIN32
ptr->hEvent = WSACreateEvent(); /* creates a manual reset event */
ptr->hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
if (!ptr->hEvent)
return 0;
/* WSAEventSelect automatically sets the socket in non-blocking mode */
WSAEventSelect(ptr->socket, ptr->hEvent, FD_READ | FD_CLOSE);
WSAEventSelect(ptr->socket, ptr->hEvent, FD_READ | FD_WRITE | FD_CLOSE);
#else
ptr->hEvent = CreateFileDescriptorEvent(NULL, FALSE, FALSE, (int) ptr->socket);