kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move disk info define to types.h

Browse Source 
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:
Peter Kallden 2004-03-04 08:24:40 +00:00
parent b754bba21c
commit 351edec7e5
3 changed files with 86 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
disk.c
View File

@ -133,16 +133,7 @@
extern RDPDR_DEVICE g_rdpdr_device[];
struct fileinfo
{
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];
FILEINFO g_fileinfo[MAX_OPEN_FILES];
typedef struct
{

118
rdpdr.c
View File

@ -1,6 +1,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/time.h>
#include <dirent.h> /* opendir, closedir, readdir */
#include <time.h>
#include "rdesktop.h"
@ -28,6 +29,7 @@ extern DEVICE_FNS serial_fns;
extern DEVICE_FNS printer_fns;
extern DEVICE_FNS parallel_fns;
extern DEVICE_FNS disk_fns;
extern FILEINFO g_fileinfo[];
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 */
BOOL
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
DEBUG(("RDPDR IRP Read (length: %d, offset: %d)\n", length, offset));
#endif
if (!rdpdr_handle_ok(device, file))
{
status = STATUS_INVALID_HANDLE;
break;
}
if (rw_blocking) // Complete read immediately
{
buffer = (uint8 *) xrealloc((void *) buffer, length);
@ -438,6 +466,12 @@ rdpdr_process_irp(STREAM s)
#if WITH_DEBUG_RDP5
DEBUG(("RDPDR IRP Write (length: %d)\n", result));
#endif
if (!rdpdr_handle_ok(device, file))
{
status = STATUS_INVALID_HANDLE;
break;
}
if (rw_blocking) // Complete immediately
{
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 */
void
@ -797,9 +854,12 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
status = fns->read(iorq->fd,
iorq->buffer + iorq->partial_len,
req_size, iorq->offset, &result);
if (result > 0)
{
iorq->partial_len += result;
iorq->offset += result;
}
#if WITH_DEBUG_RDP5
DEBUG(("RDPDR: %d bytes of data read\n", result));
#endif
@ -811,28 +871,12 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
#if WITH_DEBUG_RDP5
DEBUG(("RDPDR: AIO total %u bytes read of %u\n", iorq->partial_len, iorq->length));
#endif
/* send the data */
status = STATUS_SUCCESS;
rdpdr_send_completion(iorq->device,
iorq->id, status,
iorq->partial_len,
iorq->buffer,
iorq->partial_len);
xfree(iorq->buffer);
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;
}
iorq = rdpdr_remove_iorequest(prev, iorq);
}
}
break;
@ -852,8 +896,13 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
iorq->buffer +
iorq->partial_len, req_size,
iorq->offset, &result);
if (result > 0)
{
iorq->partial_len += result;
iorq->offset += result;
}
#if WITH_DEBUG_RDP5
DEBUG(("RDPDR: %d bytes of data written\n",
result));
@ -866,28 +915,12 @@ rdpdr_check_fds(fd_set * rfds, fd_set * wfds, BOOL timed_out)
#if WITH_DEBUG_RDP5
DEBUG(("RDPDR: AIO total %u bytes written of %u\n", iorq->partial_len, iorq->length));
#endif
/* send a status success */
status = STATUS_SUCCESS;
rdpdr_send_completion(iorq->device,
iorq->id, status,
iorq->partial_len,
(uint8 *) "", 1);
xfree(iorq->buffer);
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;
}
iorq = rdpdr_remove_iorequest(prev, iorq);
}
}
break;
@ -920,19 +953,8 @@ rdpdr_abort_io(uint32 fd, uint32 major, NTSTATUS status)
result = 0;
rdpdr_send_completion(iorq->device, iorq->id, status, result, (uint8 *) "",
1);
xfree(iorq->buffer);
iorq->fd = 0;
if (prev != NULL)
{
prev->next = iorq->next;
xfree(iorq);
}
else
{
// Even if NULL
g_iorequest = iorq->next;
xfree(iorq);
}
iorq = rdpdr_remove_iorequest(prev, iorq);
return True;
}

12
types.h
View File

@ -166,6 +166,7 @@ RDPDR_DEVICE;
typedef struct rdpdr_serial_device_info
{
int dtr;
int rts;
uint32 baud_rate,
queue_in_size,
queue_out_size,
@ -203,3 +204,14 @@ typedef struct rdpdr_printer_info
BOOL default_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;