move disk info define to types.h
extract aio remove handle errors in aio read / write function that checks if handle is ok - seems windows cant keep track of them huh - volker milde git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@626 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
parent
b754bba21c
commit
351edec7e5
11
disk.c
11
disk.c
@ -133,16 +133,7 @@
|
|||||||
|
|
||||||
extern RDPDR_DEVICE g_rdpdr_device[];
|
extern RDPDR_DEVICE g_rdpdr_device[];
|
||||||
|
|
||||||
struct fileinfo
|
FILEINFO g_fileinfo[MAX_OPEN_FILES];
|
||||||
{
|
|
||||||
uint32 device_id, flags_and_attributes;
|
|
||||||
char path[256];
|
|
||||||
DIR *pdir;
|
|
||||||
struct dirent *pdirent;
|
|
||||||
char pattern[64];
|
|
||||||
BOOL delete_on_close;
|
|
||||||
}
|
|
||||||
g_fileinfo[MAX_OPEN_FILES];
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
124
rdpdr.c
124
rdpdr.c
@ -1,6 +1,7 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
#include <dirent.h> /* opendir, closedir, readdir */
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include "rdesktop.h"
|
#include "rdesktop.h"
|
||||||
|
|
||||||
@ -28,6 +29,7 @@ extern DEVICE_FNS serial_fns;
|
|||||||
extern DEVICE_FNS printer_fns;
|
extern DEVICE_FNS printer_fns;
|
||||||
extern DEVICE_FNS parallel_fns;
|
extern DEVICE_FNS parallel_fns;
|
||||||
extern DEVICE_FNS disk_fns;
|
extern DEVICE_FNS disk_fns;
|
||||||
|
extern FILEINFO g_fileinfo[];
|
||||||
|
|
||||||
static VCHANNEL *rdpdr_channel;
|
static VCHANNEL *rdpdr_channel;
|
||||||
|
|
||||||
@ -79,6 +81,26 @@ convert_to_unix_filename(char *filename)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BOOL
|
||||||
|
rdpdr_handle_ok(int device, int handle)
|
||||||
|
{
|
||||||
|
switch (g_rdpdr_device[device].device_type)
|
||||||
|
{
|
||||||
|
case DEVICE_TYPE_PARALLEL:
|
||||||
|
case DEVICE_TYPE_SERIAL:
|
||||||
|
case DEVICE_TYPE_PRINTER:
|
||||||
|
case DEVICE_TYPE_SCARD:
|
||||||
|
if (g_rdpdr_device[device].handle != handle)
|
||||||
|
return False;
|
||||||
|
break;
|
||||||
|
case DEVICE_TYPE_DISK:
|
||||||
|
if (g_fileinfo[handle].device_id != device)
|
||||||
|
return False;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return True;
|
||||||
|
}
|
||||||
|
|
||||||
/* Add a new io request to the table containing pending io requests so it won't block rdesktop */
|
/* Add a new io request to the table containing pending io requests so it won't block rdesktop */
|
||||||
BOOL
|
BOOL
|
||||||
add_async_iorequest(uint32 device, uint32 file, uint32 id, uint32 major, uint32 length,
|
add_async_iorequest(uint32 device, uint32 file, uint32 id, uint32 major, uint32 length,
|
||||||
@ -391,6 +413,12 @@ rdpdr_process_irp(STREAM s)
|
|||||||
#if WITH_DEBUG_RDP5
|
#if WITH_DEBUG_RDP5
|
||||||
DEBUG(("RDPDR IRP Read (length: %d, offset: %d)\n", length, offset));
|
DEBUG(("RDPDR IRP Read (length: %d, offset: %d)\n", length, offset));
|
||||||
#endif
|
#endif
|
||||||
|
if (!rdpdr_handle_ok(device, file))
|
||||||
|
{
|
||||||
|
status = STATUS_INVALID_HANDLE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (rw_blocking) // Complete read immediately
|
if (rw_blocking) // Complete read immediately
|
||||||
{
|
{
|
||||||
buffer = (uint8 *) xrealloc((void *) buffer, length);
|
buffer = (uint8 *) xrealloc((void *) buffer, length);
|
||||||
@ -438,6 +466,12 @@ rdpdr_process_irp(STREAM s)
|
|||||||
#if WITH_DEBUG_RDP5
|
#if WITH_DEBUG_RDP5
|
||||||
DEBUG(("RDPDR IRP Write (length: %d)\n", result));
|
DEBUG(("RDPDR IRP Write (length: %d)\n", result));
|
||||||
#endif
|
#endif
|
||||||
|
if (!rdpdr_handle_ok(device, file))
|
||||||
|
{
|
||||||
|
status = STATUS_INVALID_HANDLE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
if (rw_blocking) // Complete immediately
|
if (rw_blocking) // Complete immediately
|
||||||
{
|
{
|
||||||
status = fns->write(file, s->p, length, offset, &result);
|
status = fns->write(file, s->p, length, offset, &result);
|
||||||
@ -757,6 +791,29 @@ rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, BOOL * t
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct async_iorequest *
|
||||||
|
rdpdr_remove_iorequest(struct async_iorequest *prev, struct async_iorequest *iorq)
|
||||||
|
{
|
||||||
|
if (!iorq)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
if (iorq->buffer)
|
||||||
|
xfree(iorq->buffer);
|
||||||
|
if (prev)
|
||||||
|
{
|
||||||
|
prev->next = iorq->next;
|
||||||
|
xfree(iorq);
|
||||||
|
iorq = prev->next;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Even if NULL
|
||||||
|
g_iorequest = iorq->next;
|
||||||
|
xfree(iorq);
|
||||||
|
iorq = NULL;
|
||||||
|
}
|
||||||
|
return iorq;
|
||||||
|
}
|
||||||
|
|
||||||
/* Check if select() returned with one of the rdpdr file descriptors, and complete io if it did */
|
/* Check if select() returned with one of the rdpdr file descriptors, and complete io if it did */
|
||||||
void
|
void
|
||||||
@ -797,9 +854,12 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
|
|||||||
status = fns->read(iorq->fd,
|
status = fns->read(iorq->fd,
|
||||||
iorq->buffer + iorq->partial_len,
|
iorq->buffer + iorq->partial_len,
|
||||||
req_size, iorq->offset, &result);
|
req_size, iorq->offset, &result);
|
||||||
iorq->partial_len += result;
|
|
||||||
iorq->offset += result;
|
|
||||||
|
|
||||||
|
if (result > 0)
|
||||||
|
{
|
||||||
|
iorq->partial_len += result;
|
||||||
|
iorq->offset += result;
|
||||||
|
}
|
||||||
#if WITH_DEBUG_RDP5
|
#if WITH_DEBUG_RDP5
|
||||||
DEBUG(("RDPDR: %d bytes of data read\n", result));
|
DEBUG(("RDPDR: %d bytes of data read\n", result));
|
||||||
#endif
|
#endif
|
||||||
@ -811,28 +871,12 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
|
|||||||
#if WITH_DEBUG_RDP5
|
#if WITH_DEBUG_RDP5
|
||||||
DEBUG(("RDPDR: AIO total %u bytes read of %u\n", iorq->partial_len, iorq->length));
|
DEBUG(("RDPDR: AIO total %u bytes read of %u\n", iorq->partial_len, iorq->length));
|
||||||
#endif
|
#endif
|
||||||
/* send the data */
|
|
||||||
status = STATUS_SUCCESS;
|
|
||||||
rdpdr_send_completion(iorq->device,
|
rdpdr_send_completion(iorq->device,
|
||||||
iorq->id, status,
|
iorq->id, status,
|
||||||
iorq->partial_len,
|
iorq->partial_len,
|
||||||
iorq->buffer,
|
iorq->buffer,
|
||||||
iorq->partial_len);
|
iorq->partial_len);
|
||||||
xfree(iorq->buffer);
|
iorq = rdpdr_remove_iorequest(prev, iorq);
|
||||||
iorq->fd = 0;
|
|
||||||
if (prev != NULL)
|
|
||||||
{
|
|
||||||
prev->next = iorq->next;
|
|
||||||
xfree(iorq);
|
|
||||||
iorq = prev->next;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Even if NULL
|
|
||||||
g_iorequest = iorq->next;
|
|
||||||
xfree(iorq);
|
|
||||||
iorq = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -852,8 +896,13 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
|
|||||||
iorq->buffer +
|
iorq->buffer +
|
||||||
iorq->partial_len, req_size,
|
iorq->partial_len, req_size,
|
||||||
iorq->offset, &result);
|
iorq->offset, &result);
|
||||||
iorq->partial_len += result;
|
|
||||||
iorq->offset += result;
|
if (result > 0)
|
||||||
|
{
|
||||||
|
iorq->partial_len += result;
|
||||||
|
iorq->offset += result;
|
||||||
|
}
|
||||||
|
|
||||||
#if WITH_DEBUG_RDP5
|
#if WITH_DEBUG_RDP5
|
||||||
DEBUG(("RDPDR: %d bytes of data written\n",
|
DEBUG(("RDPDR: %d bytes of data written\n",
|
||||||
result));
|
result));
|
||||||
@ -866,28 +915,12 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
|
|||||||
#if WITH_DEBUG_RDP5
|
#if WITH_DEBUG_RDP5
|
||||||
DEBUG(("RDPDR: AIO total %u bytes written of %u\n", iorq->partial_len, iorq->length));
|
DEBUG(("RDPDR: AIO total %u bytes written of %u\n", iorq->partial_len, iorq->length));
|
||||||
#endif
|
#endif
|
||||||
/* send a status success */
|
|
||||||
status = STATUS_SUCCESS;
|
|
||||||
rdpdr_send_completion(iorq->device,
|
rdpdr_send_completion(iorq->device,
|
||||||
iorq->id, status,
|
iorq->id, status,
|
||||||
iorq->partial_len,
|
iorq->partial_len,
|
||||||
(uint8 *) "", 1);
|
(uint8 *) "", 1);
|
||||||
|
|
||||||
xfree(iorq->buffer);
|
iorq = rdpdr_remove_iorequest(prev, iorq);
|
||||||
iorq->fd = 0;
|
|
||||||
if (prev != NULL)
|
|
||||||
{
|
|
||||||
prev->next = iorq->next;
|
|
||||||
xfree(iorq);
|
|
||||||
iorq = prev->next;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Even if NULL
|
|
||||||
g_iorequest = iorq->next;
|
|
||||||
xfree(iorq);
|
|
||||||
iorq = NULL;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -920,19 +953,8 @@ rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status)
|
|||||||
result = 0;
|
result = 0;
|
||||||
rdpdr_send_completion(iorq->device, iorq->id, status, result, (uint8 *) "",
|
rdpdr_send_completion(iorq->device, iorq->id, status, result, (uint8 *) "",
|
||||||
1);
|
1);
|
||||||
xfree(iorq->buffer);
|
|
||||||
iorq->fd = 0;
|
iorq = rdpdr_remove_iorequest(prev, iorq);
|
||||||
if (prev != NULL)
|
|
||||||
{
|
|
||||||
prev->next = iorq->next;
|
|
||||||
xfree(iorq);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Even if NULL
|
|
||||||
g_iorequest = iorq->next;
|
|
||||||
xfree(iorq);
|
|
||||||
}
|
|
||||||
return True;
|
return True;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
12
types.h
12
types.h
@ -166,6 +166,7 @@ RDPDR_DEVICE;
|
|||||||
typedef struct rdpdr_serial_device_info
|
typedef struct rdpdr_serial_device_info
|
||||||
{
|
{
|
||||||
int dtr;
|
int dtr;
|
||||||
|
int rts;
|
||||||
uint32 baud_rate,
|
uint32 baud_rate,
|
||||||
queue_in_size,
|
queue_in_size,
|
||||||
queue_out_size,
|
queue_out_size,
|
||||||
@ -203,3 +204,14 @@ typedef struct rdpdr_printer_info
|
|||||||
BOOL default_printer;
|
BOOL default_printer;
|
||||||
}
|
}
|
||||||
PRINTER;
|
PRINTER;
|
||||||
|
|
||||||
|
typedef struct fileinfo
|
||||||
|
{
|
||||||
|
uint32 device_id, flags_and_attributes;
|
||||||
|
char path[256];
|
||||||
|
DIR *pdir;
|
||||||
|
struct dirent *pdirent;
|
||||||
|
char pattern[64];
|
||||||
|
BOOL delete_on_close;
|
||||||
|
}
|
||||||
|
FILEINFO;
|
||||||
|
Loading…
Reference in New Issue
Block a user