--- sourceforge.net/trunk/rdesktop/rdpdr.c 2004/08/09 13:50:41 747 +++ sourceforge.net/trunk/rdesktop/rdpdr.c 2005/04/03 18:08:05 879 @@ -1,6 +1,6 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. - Copyright (C) Matthew Chapman 1999-2004 + Copyright (C) Matthew Chapman 1999-2005 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -61,11 +61,12 @@ extern DEVICE_FNS parallel_fns; extern DEVICE_FNS disk_fns; extern FILEINFO g_fileinfo[]; +extern BOOL g_notify_stamp; static VCHANNEL *rdpdr_channel; /* If select() times out, the request for the device with handle g_min_timeout_fd is aborted */ -HANDLE g_min_timeout_fd; +NTHANDLE g_min_timeout_fd; uint32 g_num_devices; /* Table with information about rdpdr devices */ @@ -90,7 +91,7 @@ /* Return device_id for a given handle */ int -get_device_index(HANDLE handle) +get_device_index(NTHANDLE handle) { int i; for (i = 0; i < RDPDR_MAX_DEVICES; i++) @@ -154,7 +155,7 @@ while (iorq->fd != 0) { - // create new element if needed + /* create new element if needed */ if (iorq->next == NULL) { iorq->next = @@ -227,7 +228,7 @@ int size, i; PRINTER *printerinfo; - size = 8; //static announce size + size = 8; /* static announce size */ size += g_num_devices * 0x14; for (i = 0; i < g_num_devices; i++) @@ -323,8 +324,11 @@ out_uint32_le(s, result); out_uint8p(s, buffer, length); s_mark_end(s); - /* JIF - hexdump(s->channel_hdr + 8, s->end - s->channel_hdr - 8); */ + /* JIF */ +#ifdef WITH_DEBUG_RDP5 + printf("--> rdpdr_send_completion\n"); + /* hexdump(s->channel_hdr + 8, s->end - s->channel_hdr - 8); */ +#endif channel_send(s, rdpdr_channel); } @@ -402,7 +406,7 @@ case IRP_MJ_CREATE: in_uint32_be(s, desired_access); - in_uint8s(s, 0x08); // unknown + in_uint8s(s, 0x08); /* unknown */ in_uint32_le(s, error_mode); in_uint32_le(s, share_mode); in_uint32_le(s, disposition); @@ -459,7 +463,7 @@ break; } - if (rw_blocking) // Complete read immediately + if (rw_blocking) /* Complete read immediately */ { buffer = (uint8 *) xrealloc((void *) buffer, length); if (!buffer) @@ -472,7 +476,7 @@ break; } - // Add request to table + /* Add request to table */ pst_buf = (uint8 *) xmalloc(length); if (!pst_buf) { @@ -512,13 +516,13 @@ break; } - if (rw_blocking) // Complete immediately + if (rw_blocking) /* Complete immediately */ { status = fns->write(file, s->p, length, offset, &result); break; } - // Add to table + /* Add to table */ pst_buf = (uint8 *) xmalloc(length); if (!pst_buf) { @@ -623,15 +627,25 @@ case IRP_MN_NOTIFY_CHANGE_DIRECTORY: /* JIF - unimpl("IRP major=0x%x minor=0x%x: IRP_MN_NOTIFY_CHANGE_DIRECTORY\n", major, minor); */ - status = STATUS_PENDING; // Don't send completion packet + unimpl("IRP major=0x%x minor=0x%x: IRP_MN_NOTIFY_CHANGE_DIRECTORY\n", major, minor); */ + + in_uint32_le(s, info_level); /* notify mask */ + + g_notify_stamp = True; + + status = disk_create_notify(file, info_level); + result = 0; + + if (status == STATUS_PENDING) + add_async_iorequest(device, file, id, major, length, + fns, 0, 0, NULL, 0); break; default: status = STATUS_INVALID_PARAMETER; - /* JIF - unimpl("IRP major=0x%x minor=0x%x\n", major, minor); */ + /* JIF */ + unimpl("IRP major=0x%x minor=0x%x\n", major, minor); } break; @@ -659,6 +673,17 @@ out.size = sizeof(buffer); status = fns->device_control(file, request, s, &out); result = buffer_len = out.p - out.data; + + /* Serial SERIAL_WAIT_ON_MASK */ + if (status == STATUS_PENDING) + { + if (add_async_iorequest + (device, file, id, major, length, fns, 0, 0, NULL, 0)) + { + status = STATUS_PENDING; + break; + } + } break; @@ -810,7 +835,7 @@ void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * timeout) { - uint32 select_timeout = 0; // Timeout value to be used for select() (in millisecons). + uint32 select_timeout = 0; /* Timeout value to be used for select() (in millisecons). */ struct async_iorequest *iorq; char c; @@ -827,25 +852,34 @@ reconnecting. FIXME: Real support for reconnects. */ - if ((read(iorq->fd, &c, 0) != 0) && (errno == EBADF)) - break; - FD_SET(iorq->fd, rfds); *n = MAX(*n, iorq->fd); - // Check if io request timeout is smaller than current (but not 0). + /* Check if io request timeout is smaller than current (but not 0). */ if (iorq->timeout && (select_timeout == 0 || iorq->timeout < select_timeout)) { - // Set new timeout + /* Set new timeout */ select_timeout = iorq->timeout; g_min_timeout_fd = iorq->fd; /* Remember fd */ tv->tv_sec = select_timeout / 1000; tv->tv_usec = (select_timeout % 1000) * 1000; *timeout = True; + break; + } + if (iorq->itv_timeout && iorq->partial_len > 0 + && (select_timeout == 0 + || iorq->itv_timeout < select_timeout)) + { + /* Set new timeout */ + select_timeout = iorq->itv_timeout; + g_min_timeout_fd = iorq->fd; /* Remember fd */ + tv->tv_sec = select_timeout / 1000; + tv->tv_usec = (select_timeout % 1000) * 1000; + *timeout = True; + break; } - break; case IRP_MJ_WRITE: @@ -857,6 +891,11 @@ *n = MAX(*n, iorq->fd); break; + case IRP_MJ_DEVICE_CONTROL: + if (select_timeout > 5) + select_timeout = 5; /* serial event queue */ + break; + } } @@ -881,7 +920,7 @@ } else { - // Even if NULL + /* Even if NULL */ g_iorequest = iorq->next; xfree(iorq); iorq = NULL; @@ -891,7 +930,7 @@ /* Check if select() returned with one of the rdpdr file descriptors, and complete io if it did */ void -rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out) +_rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out) { NTSTATUS status; uint32 result = 0; @@ -899,9 +938,53 @@ struct async_iorequest *iorq; struct async_iorequest *prev; uint32 req_size = 0; + uint32 buffer_len; + struct stream out; + uint8 *buffer = NULL; + if (timed_out) { + /* check serial iv_timeout */ + + iorq = g_iorequest; + prev = NULL; + while (iorq != NULL) + { + if (iorq->fd == g_min_timeout_fd) + { + if ((iorq->partial_len > 0) && + (g_rdpdr_device[iorq->device].device_type == + DEVICE_TYPE_SERIAL)) + { + + /* iv_timeout between 2 chars, send partial_len */ + /*printf("RDPDR: IVT total %u bytes read of %u\n", iorq->partial_len, iorq->length); */ + rdpdr_send_completion(iorq->device, + iorq->id, STATUS_SUCCESS, + iorq->partial_len, + iorq->buffer, iorq->partial_len); + iorq = rdpdr_remove_iorequest(prev, iorq); + return; + } + else + { + break; + } + + } + else + { + break; + } + + + prev = iorq; + if (iorq) + iorq = iorq->next; + + } + rdpdr_abort_io(g_min_timeout_fd, 0, STATUS_TIMEOUT); return; } @@ -929,7 +1012,7 @@ iorq->buffer + iorq->partial_len, req_size, iorq->offset, &result); - if (result > 0) + if ((long) result > 0) { iorq->partial_len += result; iorq->offset += result; @@ -971,7 +1054,7 @@ iorq->partial_len, req_size, iorq->offset, &result); - if (result > 0) + if ((long) result > 0) { iorq->partial_len += result; iorq->offset += result; @@ -998,6 +1081,23 @@ } } break; + case IRP_MJ_DEVICE_CONTROL: + if (serial_get_event(iorq->fd, &result)) + { + buffer = (uint8 *) xrealloc((void *) buffer, 0x14); + out.data = out.p = buffer; + out.size = sizeof(buffer); + out_uint32_le(&out, result); + result = buffer_len = out.p - out.data; + status = STATUS_SUCCESS; + rdpdr_send_completion(iorq->device, iorq->id, + status, result, buffer, + buffer_len); + xfree(buffer); + iorq = rdpdr_remove_iorequest(prev, iorq); + } + + break; } } @@ -1006,8 +1106,68 @@ iorq = iorq->next; } + /* Check notify */ + iorq = g_iorequest; + prev = NULL; + while (iorq != NULL) + { + if (iorq->fd != 0) + { + switch (iorq->major) + { + + case IRP_MJ_DIRECTORY_CONTROL: + if (g_rdpdr_device[iorq->device].device_type == + DEVICE_TYPE_DISK) + { + + if (g_notify_stamp) + { + g_notify_stamp = False; + status = disk_check_notify(iorq->fd); + if (status != STATUS_PENDING) + { + rdpdr_send_completion(iorq->device, + iorq->id, + status, 0, + NULL, 0); + iorq = rdpdr_remove_iorequest(prev, + iorq); + } + } + } + break; + + + + } + } + + prev = iorq; + if (iorq) + iorq = iorq->next; + } + } +void +rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out) +{ + fd_set dummy; + + + FD_ZERO(&dummy); + + + /* fist check event queue only, + any serial wait event must be done before read block will be sent + */ + + _rdpdr_check_fds(&dummy, &dummy, False); + _rdpdr_check_fds(rfds, wfds, timed_out); +} + + /* Abort a pending io request for a given handle and major */ BOOL rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status) @@ -1020,8 +1180,8 @@ prev = NULL; while (iorq != NULL) { - // Only remove from table when major is not set, or when correct major is supplied. - // Abort read should not abort a write io request. + /* Only remove from table when major is not set, or when correct major is supplied. + Abort read should not abort a write io request. */ if ((iorq->fd == fd) && (major == 0 || iorq->major == major)) { result = 0;