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

Reset file descriptor set only, if necessary now.

Browse Source
This commit is contained in:
Armin Novak 2013-08-16 12:40:06 +02:00
parent 1a3a6c3e0f
commit 60d38daf0a
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
channels/serial/client/serial_main.c
View File

@ -340,21 +340,22 @@ static void* serial_thread_func(void* arg)
if (WAIT_OBJECT_0 == status) if (WAIT_OBJECT_0 == status)
break; break;
FD_ZERO(&serial->read_fds);
FD_ZERO(&serial->write_fds);
serial->tv.tv_sec = 0;
serial->tv.tv_usec = 0;
serial->select_timeout = 0;
if (status == WAIT_OBJECT_0 + 1) if (status == WAIT_OBJECT_0 + 1)
{ {
FD_ZERO(&serial->read_fds);
FD_ZERO(&serial->write_fds);
serial->tv.tv_sec = 0;
serial->tv.tv_usec = 0;
serial->select_timeout = 0;
if ((irp = (IRP*) Queue_Dequeue(serial->queue))) if ((irp = (IRP*) Queue_Dequeue(serial->queue)))
serial_process_irp(serial, irp); serial_process_irp(serial, irp);
continue; continue;
} }
serial_check_fds(serial); if(serial->tty)
serial_check_fds(serial);
} }
return NULL; return NULL;
@ -680,6 +681,13 @@ static BOOL serial_check_fds(SERIAL_DEVICE* serial)
if (list_size(serial->pending_irps) == 0) if (list_size(serial->pending_irps) == 0)
return 1; return 1;
FD_ZERO(&serial->read_fds);
FD_ZERO(&serial->write_fds);
serial->tv.tv_sec = 0;
serial->tv.tv_usec = 0;
serial->select_timeout = 0;
serial_set_fds(serial); serial_set_fds(serial);
DEBUG_SVC("waiting %lu %lu", serial->tv.tv_sec, serial->tv.tv_usec); DEBUG_SVC("waiting %lu %lu", serial->tv.tv_sec, serial->tv.tv_usec);