Ran indent-all.sh
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@579 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Peter Åstrand
parent
113a0b179a
commit
a9a863db41
@ -12,7 +12,8 @@
|
||||
|
||||
extern RDPDR_DEVICE g_rdpdr_device[];
|
||||
|
||||
PARALLEL_DEVICE * get_parallel_data(HANDLE handle)
|
||||
PARALLEL_DEVICE *
|
||||
get_parallel_data(HANDLE handle)
|
||||
{
|
||||
int index;
|
||||
|
||||
|
||||
@ -4,7 +4,8 @@
|
||||
|
||||
extern RDPDR_DEVICE g_rdpdr_device[];
|
||||
|
||||
PRINTER * get_printer_data(HANDLE handle)
|
||||
PRINTER *
|
||||
get_printer_data(HANDLE handle)
|
||||
{
|
||||
int index;
|
||||
|
||||
|
||||
@ -83,7 +83,8 @@ printercache_load_blob(char *printer_name, uint8 ** data)
|
||||
if (home == NULL)
|
||||
return 0;
|
||||
|
||||
path = (char *) xmalloc(strlen(home) + sizeof("/.rdesktop/rdpdr/") + strlen(printer_name) + sizeof("/AutoPrinterCacheData"));
|
||||
path = (char *) xmalloc(strlen(home) + sizeof("/.rdesktop/rdpdr/") + strlen(printer_name) +
|
||||
sizeof("/AutoPrinterCacheData"));
|
||||
sprintf(path, "%s/.rdesktop/rdpdr/%s/AutoPrinterCacheData", home, printer_name);
|
||||
|
||||
fd = open(path, O_RDONLY);
|
||||
@ -116,7 +117,8 @@ printercache_save_blob(char *printer_name, uint8 * data, uint32 length)
|
||||
if (!printercache_mkdir(home, printer_name))
|
||||
return;
|
||||
|
||||
path = (char *) xmalloc(strlen(home) + sizeof("/.rdesktop/rdpdr/") + strlen(printer_name) + sizeof("/AutoPrinterCacheData"));
|
||||
path = (char *) xmalloc(strlen(home) + sizeof("/.rdesktop/rdpdr/") + strlen(printer_name) +
|
||||
sizeof("/AutoPrinterCacheData"));
|
||||
sprintf(path, "%s/.rdesktop/rdpdr/%s/AutoPrinterCacheData", home, printer_name);
|
||||
|
||||
fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600);
|
||||
|
||||
2
proto.h
2
proto.h
@ -69,7 +69,7 @@ void error(char *format, ...);
|
||||
void warning(char *format, ...);
|
||||
void unimpl(char *format, ...);
|
||||
void hexdump(unsigned char *p, unsigned int len);
|
||||
void toupper_str(char* p);
|
||||
void toupper_str(char *p);
|
||||
char *ltoa(long N, int base);
|
||||
int load_licence(unsigned char **data);
|
||||
void save_licence(unsigned char *data, int length);
|
||||
|
||||
31
rdesktop.c
31
rdesktop.c
@ -118,14 +118,18 @@ usage(char *program)
|
||||
fprintf(stderr, " -N: enable numlock syncronization\n");
|
||||
fprintf(stderr, " -a: connection colour depth\n");
|
||||
fprintf(stderr, " -r: enable specified device redirection (this flag can be repeated)\n");
|
||||
fprintf(stderr, " '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n");
|
||||
fprintf(stderr,
|
||||
" '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n");
|
||||
fprintf(stderr, " or COM1=/dev/ttyS0,COM2=/dev/ttyS1\n");
|
||||
fprintf(stderr, " '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n");
|
||||
fprintf(stderr,
|
||||
" '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n");
|
||||
fprintf(stderr, " or A=/mnt/floppy,D=/mnt/cdrom'\n");
|
||||
fprintf(stderr, " '-r lptport:LPT1=/dev/lp0': enable parallel redirection of /dev/lp0 to LPT1\n");
|
||||
fprintf(stderr,
|
||||
" '-r lptport:LPT1=/dev/lp0': enable parallel redirection of /dev/lp0 to LPT1\n");
|
||||
fprintf(stderr, " or LPT1=/dev/lp0,LPT2=/dev/lp1\n");
|
||||
fprintf(stderr, " '-r printer:mydeskjet': enable printer redirection\n");
|
||||
fprintf(stderr, " or mydeskjet:\"HP Laserjet IIIP\" to enter server driver as well\n");
|
||||
fprintf(stderr,
|
||||
" or mydeskjet:\"HP Laserjet IIIP\" to enter server driver as well\n");
|
||||
fprintf(stderr, " '-r sound': enable sound redirection\n");
|
||||
fprintf(stderr, " -0: attach to console\n");
|
||||
fprintf(stderr, " -4: use RDP version 4\n");
|
||||
@ -758,24 +762,24 @@ next_arg(char *src, char needle)
|
||||
|
||||
p = src;
|
||||
/* skip escaped needles */
|
||||
while( (nextval = strchr(p, needle) ) )
|
||||
while ((nextval = strchr(p, needle)))
|
||||
{
|
||||
mvp = nextval - 1;
|
||||
/* found backslashed needle */
|
||||
if( *mvp == '\\' && (mvp > src) )
|
||||
if (*mvp == '\\' && (mvp > src))
|
||||
{
|
||||
/* move string one to the left */
|
||||
while( *(mvp+1) != (char)0x00 )
|
||||
while (*(mvp + 1) != (char) 0x00)
|
||||
{
|
||||
*mvp = *(mvp+1);
|
||||
*mvp = *(mvp + 1);
|
||||
*mvp++;
|
||||
}
|
||||
*mvp = (char)0x00;
|
||||
*mvp = (char) 0x00;
|
||||
p = nextval;
|
||||
}
|
||||
else
|
||||
{
|
||||
p = nextval +1;
|
||||
p = nextval + 1;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -795,10 +799,11 @@ next_arg(char *src, char needle)
|
||||
|
||||
|
||||
void
|
||||
toupper_str(char* p)
|
||||
toupper_str(char *p)
|
||||
{
|
||||
while( *p ){
|
||||
if( (*p >= 'a') && (*p <= 'z') )
|
||||
while (*p)
|
||||
{
|
||||
if ((*p >= 'a') && (*p <= 'z'))
|
||||
*p = toupper((int) *p);
|
||||
p++;
|
||||
}
|
||||
|
||||
5
rdpdr.c
5
rdpdr.c
@ -661,7 +661,10 @@ rdpdr_init()
|
||||
{
|
||||
if (g_num_devices > 0)
|
||||
{
|
||||
rdpdr_channel = channel_register("rdpdr", CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_COMPRESS_RDP, rdpdr_process);
|
||||
rdpdr_channel =
|
||||
channel_register("rdpdr",
|
||||
CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_COMPRESS_RDP,
|
||||
rdpdr_process);
|
||||
}
|
||||
|
||||
return (rdpdr_channel != NULL);
|
||||
|
||||
14
secure.c
14
secure.c
@ -628,16 +628,16 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
|
||||
uint32 certcount;
|
||||
|
||||
DEBUG_RDP5(("We're going for the RDP5-style encryption\n"));
|
||||
in_uint32_le(s, certcount); /* Number of certificates */
|
||||
in_uint32_le(s, certcount); /* Number of certificates */
|
||||
|
||||
if(certcount < 2)
|
||||
if (certcount < 2)
|
||||
{
|
||||
error("Server didn't send enough X509 certificates\n");
|
||||
return False;
|
||||
}
|
||||
|
||||
for(; certcount > 2; certcount--)
|
||||
{ /* ignore all the certificates between the root and the signing CA */
|
||||
for (; certcount > 2; certcount--)
|
||||
{ /* ignore all the certificates between the root and the signing CA */
|
||||
uint32 ignorelen;
|
||||
X509 *ignorecert;
|
||||
|
||||
@ -647,13 +647,13 @@ sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
|
||||
DEBUG_RDP5(("Ignored Certificate length is %d\n", ignorelen));
|
||||
ignorecert = d2i_X509(NULL, &(s->p), ignorelen);
|
||||
|
||||
if(ignorecert == NULL)
|
||||
{ /* XXX: error out? */
|
||||
if (ignorecert == NULL)
|
||||
{ /* XXX: error out? */
|
||||
DEBUG_RDP5(("got a bad cert: this will probably screw up the rest of the communication\n"));
|
||||
}
|
||||
|
||||
#ifdef WITH_DEBUG_RDP5
|
||||
DEBUG_RDP5(("cert #%d (ignored):\n",certcount));
|
||||
DEBUG_RDP5(("cert #%d (ignored):\n", certcount));
|
||||
X509_print_fp(stdout, ignorecert);
|
||||
#endif
|
||||
}
|
||||
|
||||
365
serial.c
365
serial.c
@ -53,7 +53,7 @@
|
||||
#define ODD_PARITY 1
|
||||
#define EVEN_PARITY 2
|
||||
|
||||
extern RDPDR_DEVICE g_rdpdr_device[];
|
||||
extern RDPDR_DEVICE g_rdpdr_device[];
|
||||
|
||||
int serial_fd;
|
||||
struct termios termios;
|
||||
@ -64,95 +64,137 @@ uint32 queue_in_size, queue_out_size;
|
||||
uint32 wait_mask;
|
||||
uint8 stop_bits, parity, word_length;
|
||||
|
||||
SERIAL_DEVICE
|
||||
*get_serial_info(HANDLE handle)
|
||||
SERIAL_DEVICE * get_serial_info(HANDLE handle)
|
||||
{
|
||||
int index;
|
||||
int index;
|
||||
|
||||
for (index = 0; index < RDPDR_MAX_DEVICES; index++)
|
||||
{
|
||||
if (handle == g_rdpdr_device[index].handle)
|
||||
return (SERIAL_DEVICE *) g_rdpdr_device[index].pdevice_data;
|
||||
}
|
||||
return NULL;
|
||||
for (index = 0; index < RDPDR_MAX_DEVICES; index++)
|
||||
{
|
||||
if (handle == g_rdpdr_device[index].handle)
|
||||
return (SERIAL_DEVICE *) g_rdpdr_device[index].pdevice_data;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
BOOL
|
||||
get_termios(SERIAL_DEVICE *pser_inf, HANDLE serial_fd)
|
||||
get_termios(SERIAL_DEVICE * pser_inf, HANDLE serial_fd)
|
||||
{
|
||||
speed_t speed;
|
||||
struct termios *ptermios;
|
||||
speed_t speed;
|
||||
struct termios *ptermios;
|
||||
|
||||
ptermios = pser_inf->ptermios;
|
||||
ptermios = pser_inf->ptermios;
|
||||
|
||||
if (tcgetattr(serial_fd, ptermios) == -1)
|
||||
return False;
|
||||
if (tcgetattr(serial_fd, ptermios) == -1)
|
||||
return False;
|
||||
|
||||
speed = cfgetispeed(ptermios);
|
||||
switch (speed)
|
||||
{
|
||||
speed = cfgetispeed(ptermios);
|
||||
switch (speed)
|
||||
{
|
||||
#ifdef B75
|
||||
case B75: pser_inf->baud_rate = 75; break;
|
||||
case B75:
|
||||
pser_inf->baud_rate = 75;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B110
|
||||
case B110: pser_inf->baud_rate = 110; break;
|
||||
case B110:
|
||||
pser_inf->baud_rate = 110;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B134
|
||||
case B134: pser_inf->baud_rate = 134; break;
|
||||
case B134:
|
||||
pser_inf->baud_rate = 134;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B150
|
||||
case B150: pser_inf->baud_rate = 150; break;
|
||||
case B150:
|
||||
pser_inf->baud_rate = 150;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B300
|
||||
case B300: pser_inf->baud_rate = 300; break;
|
||||
case B300:
|
||||
pser_inf->baud_rate = 300;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B600
|
||||
case B600: pser_inf->baud_rate = 600; break;
|
||||
case B600:
|
||||
pser_inf->baud_rate = 600;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B1200
|
||||
case B1200: pser_inf->baud_rate = 1200; break;
|
||||
case B1200:
|
||||
pser_inf->baud_rate = 1200;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B1800
|
||||
case B1800: pser_inf->baud_rate = 1800; break;
|
||||
case B1800:
|
||||
pser_inf->baud_rate = 1800;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B2400
|
||||
case B2400: pser_inf->baud_rate = 2400; break;
|
||||
case B2400:
|
||||
pser_inf->baud_rate = 2400;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B4800
|
||||
case B4800: pser_inf->baud_rate = 4800; break;
|
||||
case B4800:
|
||||
pser_inf->baud_rate = 4800;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B9600
|
||||
case B9600: pser_inf->baud_rate = 9600; break;
|
||||
case B9600:
|
||||
pser_inf->baud_rate = 9600;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B19200
|
||||
case B19200: pser_inf->baud_rate = 19200; break;
|
||||
case B19200:
|
||||
pser_inf->baud_rate = 19200;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B38400
|
||||
case B38400: pser_inf->baud_rate = 38400; break;
|
||||
case B38400:
|
||||
pser_inf->baud_rate = 38400;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B57600
|
||||
case B57600: pser_inf->baud_rate = 57600; break;
|
||||
case B57600:
|
||||
pser_inf->baud_rate = 57600;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B115200
|
||||
case B115200: pser_inf->baud_rate = 115200; break;
|
||||
case B115200:
|
||||
pser_inf->baud_rate = 115200;
|
||||
break;
|
||||
#endif
|
||||
default: pser_inf->baud_rate = 0; break;
|
||||
}
|
||||
default:
|
||||
pser_inf->baud_rate = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
speed = cfgetospeed(ptermios);
|
||||
pser_inf->dtr = (speed == B0) ? 0 : 1;
|
||||
speed = cfgetospeed(ptermios);
|
||||
pser_inf->dtr = (speed == B0) ? 0 : 1;
|
||||
|
||||
pser_inf->stop_bits = (ptermios->c_cflag & CSTOPB) ? STOP_BITS_2 : STOP_BITS_1;
|
||||
pser_inf->parity = (ptermios->c_cflag & PARENB) ? ((ptermios->c_cflag & PARODD) ? ODD_PARITY : EVEN_PARITY) : NO_PARITY;
|
||||
switch (ptermios->c_cflag & CSIZE)
|
||||
{
|
||||
case CS5: pser_inf->word_length = 5; break;
|
||||
case CS6: pser_inf->word_length = 6; break;
|
||||
case CS7: pser_inf->word_length = 7; break;
|
||||
default: pser_inf->word_length = 8; break;
|
||||
}
|
||||
pser_inf->stop_bits = (ptermios->c_cflag & CSTOPB) ? STOP_BITS_2 : STOP_BITS_1;
|
||||
pser_inf->parity =
|
||||
(ptermios->
|
||||
c_cflag & PARENB) ? ((ptermios->
|
||||
c_cflag & PARODD) ? ODD_PARITY : EVEN_PARITY) : NO_PARITY;
|
||||
switch (ptermios->c_cflag & CSIZE)
|
||||
{
|
||||
case CS5:
|
||||
pser_inf->word_length = 5;
|
||||
break;
|
||||
case CS6:
|
||||
pser_inf->word_length = 6;
|
||||
break;
|
||||
case CS7:
|
||||
pser_inf->word_length = 7;
|
||||
break;
|
||||
default:
|
||||
pser_inf->word_length = 8;
|
||||
break;
|
||||
}
|
||||
|
||||
return True;
|
||||
return True;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -163,51 +205,83 @@ set_termios(void)
|
||||
switch (baud_rate)
|
||||
{
|
||||
#ifdef B75
|
||||
case 75: speed = B75;break;
|
||||
case 75:
|
||||
speed = B75;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B110
|
||||
case 110: speed = B110;break;
|
||||
case 110:
|
||||
speed = B110;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B134
|
||||
case 134: speed = B134;break;
|
||||
case 134:
|
||||
speed = B134;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B150
|
||||
case 150: speed = B150;break;
|
||||
case 150:
|
||||
speed = B150;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B300
|
||||
case 300: speed = B300;break;
|
||||
case 300:
|
||||
speed = B300;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B600
|
||||
case 600: speed = B600;break;
|
||||
case 600:
|
||||
speed = B600;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B1200
|
||||
case 1200: speed = B1200;break;
|
||||
case 1200:
|
||||
speed = B1200;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B1800
|
||||
case 1800: speed = B1800;break;
|
||||
case 1800:
|
||||
speed = B1800;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B2400
|
||||
case 2400: speed = B2400;break;
|
||||
case 2400:
|
||||
speed = B2400;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B4800
|
||||
case 4800: speed = B4800;break;
|
||||
case 4800:
|
||||
speed = B4800;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B9600
|
||||
case 9600: speed = B9600;break;
|
||||
case 9600:
|
||||
speed = B9600;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B19200
|
||||
case 19200: speed = B19200;break;
|
||||
case 19200:
|
||||
speed = B19200;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B38400
|
||||
case 38400: speed = B38400;break;
|
||||
case 38400:
|
||||
speed = B38400;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B57600
|
||||
case 57600: speed = B57600;break;
|
||||
case 57600:
|
||||
speed = B57600;
|
||||
break;
|
||||
#endif
|
||||
#ifdef B115200
|
||||
case 115200: speed = B115200;break;
|
||||
case 115200:
|
||||
speed = B115200;
|
||||
break;
|
||||
#endif
|
||||
default: speed = B0;break;
|
||||
default:
|
||||
speed = B0;
|
||||
break;
|
||||
}
|
||||
|
||||
/* on systems with separate ispeed and ospeed, we can remember the speed
|
||||
@ -256,9 +330,9 @@ set_termios(void)
|
||||
/* when it arrives to this function. */
|
||||
/* :com1=/dev/ttyS0,com2=/dev/ttyS1 */
|
||||
int
|
||||
serial_enum_devices(int *id, char* optarg)
|
||||
serial_enum_devices(int *id, char *optarg)
|
||||
{
|
||||
SERIAL_DEVICE* pser_inf;
|
||||
SERIAL_DEVICE *pser_inf;
|
||||
|
||||
char *pos = optarg;
|
||||
char *pos2;
|
||||
@ -280,7 +354,8 @@ serial_enum_devices(int *id, char* optarg)
|
||||
|
||||
g_rdpdr_device[*id].local_path = xmalloc(strlen(pos2) + 1);
|
||||
strcpy(g_rdpdr_device[*id].local_path, pos2);
|
||||
printf("SERIAL %s to %s\n", g_rdpdr_device[*id].name, g_rdpdr_device[*id].local_path);
|
||||
printf("SERIAL %s to %s\n", g_rdpdr_device[*id].name,
|
||||
g_rdpdr_device[*id].local_path);
|
||||
// set device type
|
||||
g_rdpdr_device[*id].device_type = DEVICE_TYPE_SERIAL;
|
||||
g_rdpdr_device[*id].pdevice_data = (void *) pser_inf;
|
||||
@ -293,35 +368,34 @@ serial_enum_devices(int *id, char* optarg)
|
||||
}
|
||||
|
||||
NTSTATUS
|
||||
serial_create(uint32 device_id, uint32 access, uint32 share_mode, uint32 disposition, uint32 flags_and_attributes, char *filename, HANDLE *handle)
|
||||
serial_create(uint32 device_id, uint32 access, uint32 share_mode, uint32 disposition,
|
||||
uint32 flags_and_attributes, char *filename, HANDLE * handle)
|
||||
{
|
||||
HANDLE serial_fd;
|
||||
SERIAL_DEVICE *pser_inf;
|
||||
struct termios *ptermios;
|
||||
HANDLE serial_fd;
|
||||
SERIAL_DEVICE *pser_inf;
|
||||
struct termios *ptermios;
|
||||
|
||||
pser_inf = (SERIAL_DEVICE *) g_rdpdr_device[device_id].pdevice_data;
|
||||
ptermios = pser_inf->ptermios;
|
||||
serial_fd = open(g_rdpdr_device[device_id].local_path, O_RDWR | O_NOCTTY);
|
||||
pser_inf = (SERIAL_DEVICE *) g_rdpdr_device[device_id].pdevice_data;
|
||||
ptermios = pser_inf->ptermios;
|
||||
serial_fd = open(g_rdpdr_device[device_id].local_path, O_RDWR | O_NOCTTY);
|
||||
|
||||
if (serial_fd == -1)
|
||||
return STATUS_ACCESS_DENIED;
|
||||
if (serial_fd == -1)
|
||||
return STATUS_ACCESS_DENIED;
|
||||
|
||||
if (!get_termios(pser_inf, serial_fd ))
|
||||
return STATUS_ACCESS_DENIED;
|
||||
if (!get_termios(pser_inf, serial_fd))
|
||||
return STATUS_ACCESS_DENIED;
|
||||
|
||||
// Store handle for later use
|
||||
g_rdpdr_device[device_id].handle = serial_fd;
|
||||
g_rdpdr_device[device_id].handle = serial_fd;
|
||||
|
||||
/* some sane information */
|
||||
printf("INFO: SERIAL %s to %s\nINFO: speed %u baud, stop bits %u, parity %u, word length %u bits, dtr %u\n",
|
||||
g_rdpdr_device[device_id].name, g_rdpdr_device[device_id].local_path,
|
||||
pser_inf->baud_rate, pser_inf->stop_bits, pser_inf->parity, pser_inf->word_length, pser_inf->dtr );
|
||||
printf("INFO: use stty to change settings\n" );
|
||||
printf("INFO: SERIAL %s to %s\nINFO: speed %u baud, stop bits %u, parity %u, word length %u bits, dtr %u\n", g_rdpdr_device[device_id].name, g_rdpdr_device[device_id].local_path, pser_inf->baud_rate, pser_inf->stop_bits, pser_inf->parity, pser_inf->word_length, pser_inf->dtr);
|
||||
printf("INFO: use stty to change settings\n");
|
||||
|
||||
//tcgetattr(serial_fd, pser_inf->ptermios);
|
||||
|
||||
*handle = serial_fd;
|
||||
return STATUS_SUCCESS;
|
||||
*handle = serial_fd;
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static NTSTATUS
|
||||
@ -332,51 +406,53 @@ serial_close(HANDLE handle)
|
||||
}
|
||||
|
||||
NTSTATUS
|
||||
serial_read(HANDLE handle, uint8 *data, uint32 length, uint32 offset, uint32 *result)
|
||||
serial_read(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
|
||||
{
|
||||
long timeout;
|
||||
SERIAL_DEVICE *pser_inf;
|
||||
struct termios *ptermios;
|
||||
long timeout;
|
||||
SERIAL_DEVICE *pser_inf;
|
||||
struct termios *ptermios;
|
||||
|
||||
timeout = 0;
|
||||
pser_inf = get_serial_info(handle);
|
||||
ptermios = pser_inf->ptermios;
|
||||
timeout = 0;
|
||||
pser_inf = get_serial_info(handle);
|
||||
ptermios = pser_inf->ptermios;
|
||||
|
||||
// Set timeouts kind of like the windows serial timeout parameters. Multiply timeout
|
||||
// with requested read size
|
||||
if (pser_inf->read_total_timeout_multiplier | pser_inf->read_total_timeout_constant)
|
||||
{
|
||||
timeout = (pser_inf->read_total_timeout_multiplier * length + pser_inf->read_total_timeout_constant + 99) / 100;
|
||||
}
|
||||
else if (pser_inf->read_interval_timeout)
|
||||
{
|
||||
timeout = (pser_inf->read_interval_timeout * length + 99) / 100;
|
||||
}
|
||||
// Set timeouts kind of like the windows serial timeout parameters. Multiply timeout
|
||||
// with requested read size
|
||||
if (pser_inf->read_total_timeout_multiplier | pser_inf->read_total_timeout_constant)
|
||||
{
|
||||
timeout =
|
||||
(pser_inf->read_total_timeout_multiplier * length +
|
||||
pser_inf->read_total_timeout_constant + 99) / 100;
|
||||
}
|
||||
else if (pser_inf->read_interval_timeout)
|
||||
{
|
||||
timeout = (pser_inf->read_interval_timeout * length + 99) / 100;
|
||||
}
|
||||
|
||||
// If a timeout is set, do a blocking read, which times out after some time.
|
||||
// It will make rdesktop less responsive, but it will improve serial performance, by not
|
||||
// reading one character at a time.
|
||||
if (timeout == 0)
|
||||
{
|
||||
ptermios->c_cc[VTIME] = 0;
|
||||
ptermios->c_cc[VMIN] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
ptermios->c_cc[VTIME] = timeout;
|
||||
ptermios->c_cc[VMIN] = 1;
|
||||
}
|
||||
tcsetattr(handle, TCSANOW, ptermios);
|
||||
// If a timeout is set, do a blocking read, which times out after some time.
|
||||
// It will make rdesktop less responsive, but it will improve serial performance, by not
|
||||
// reading one character at a time.
|
||||
if (timeout == 0)
|
||||
{
|
||||
ptermios->c_cc[VTIME] = 0;
|
||||
ptermios->c_cc[VMIN] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
ptermios->c_cc[VTIME] = timeout;
|
||||
ptermios->c_cc[VMIN] = 1;
|
||||
}
|
||||
tcsetattr(handle, TCSANOW, ptermios);
|
||||
|
||||
*result = read(handle, data, length);
|
||||
return STATUS_SUCCESS;
|
||||
*result = read(handle, data, length);
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
NTSTATUS
|
||||
serial_write(HANDLE handle, uint8 *data, uint32 length, uint32 offset, uint32 *result)
|
||||
serial_write(HANDLE handle, uint8 * data, uint32 length, uint32 offset, uint32 * result)
|
||||
{
|
||||
*result = write(handle, data, length);
|
||||
return STATUS_SUCCESS;
|
||||
*result = write(handle, data, length);
|
||||
return STATUS_SUCCESS;
|
||||
}
|
||||
|
||||
static NTSTATUS
|
||||
@ -469,14 +545,19 @@ serial_device_control(HANDLE handle, uint32 request, STREAM in, STREAM out)
|
||||
break;
|
||||
case SERIAL_PURGE:
|
||||
|
||||
printf("SERIAL_PURGE\n");
|
||||
in_uint32(in, purge_mask);
|
||||
if (purge_mask & 0x04) flush_mask |= TCOFLUSH;
|
||||
if (purge_mask & 0x08) flush_mask |= TCIFLUSH;
|
||||
if (flush_mask != 0) tcflush(handle, flush_mask);
|
||||
if (purge_mask & 0x01) rdpdr_abort_io(handle, 4, STATUS_CANCELLED);
|
||||
if (purge_mask & 0x02) rdpdr_abort_io(handle, 3, STATUS_CANCELLED);
|
||||
break;
|
||||
printf("SERIAL_PURGE\n");
|
||||
in_uint32(in, purge_mask);
|
||||
if (purge_mask & 0x04)
|
||||
flush_mask |= TCOFLUSH;
|
||||
if (purge_mask & 0x08)
|
||||
flush_mask |= TCIFLUSH;
|
||||
if (flush_mask != 0)
|
||||
tcflush(handle, flush_mask);
|
||||
if (purge_mask & 0x01)
|
||||
rdpdr_abort_io(handle, 4, STATUS_CANCELLED);
|
||||
if (purge_mask & 0x02)
|
||||
rdpdr_abort_io(handle, 3, STATUS_CANCELLED);
|
||||
break;
|
||||
|
||||
case SERIAL_RESET_DEVICE:
|
||||
case SERIAL_SET_BREAK_OFF:
|
||||
@ -498,23 +579,25 @@ serial_device_control(HANDLE handle, uint32 request, STREAM in, STREAM out)
|
||||
|
||||
/* Read timeout for a given file descripter (device) when adding fd's to select() */
|
||||
BOOL
|
||||
serial_get_timeout(uint32 handle, uint32 length, uint32 *timeout, uint32 *itv_timeout)
|
||||
serial_get_timeout(uint32 handle, uint32 length, uint32 * timeout, uint32 * itv_timeout)
|
||||
{
|
||||
int index;
|
||||
SERIAL_DEVICE *pser_inf;
|
||||
int index;
|
||||
SERIAL_DEVICE *pser_inf;
|
||||
|
||||
index = get_device_index(handle);
|
||||
index = get_device_index(handle);
|
||||
|
||||
if (g_rdpdr_device[index].device_type != DEVICE_TYPE_SERIAL)
|
||||
{
|
||||
return False;
|
||||
}
|
||||
if (g_rdpdr_device[index].device_type != DEVICE_TYPE_SERIAL)
|
||||
{
|
||||
return False;
|
||||
}
|
||||
|
||||
pser_inf = (SERIAL_DEVICE *) g_rdpdr_device[index].pdevice_data;
|
||||
pser_inf = (SERIAL_DEVICE *) g_rdpdr_device[index].pdevice_data;
|
||||
|
||||
*timeout = pser_inf->read_total_timeout_multiplier * length + pser_inf->read_total_timeout_constant;
|
||||
*itv_timeout = pser_inf->read_interval_timeout;
|
||||
return True;
|
||||
*timeout =
|
||||
pser_inf->read_total_timeout_multiplier * length +
|
||||
pser_inf->read_total_timeout_constant;
|
||||
*itv_timeout = pser_inf->read_interval_timeout;
|
||||
return True;
|
||||
}
|
||||
|
||||
DEVICE_FNS serial_fns = {
|
||||
|
||||
87
types.h
87
types.h
@ -140,73 +140,66 @@ typedef uint32 HANDLE;
|
||||
|
||||
typedef struct _DEVICE_FNS
|
||||
{
|
||||
NTSTATUS (*create)(uint32 device, uint32 desired_access, uint32 share_mode, uint32 create_disposition, uint32 flags_and_attributes, char *filename, HANDLE *handle);
|
||||
NTSTATUS (*close)(HANDLE handle);
|
||||
NTSTATUS (*read)(HANDLE handle, uint8 *data, uint32 length, uint32 offset, uint32 *result);
|
||||
NTSTATUS (*write)(HANDLE handle, uint8 *data, uint32 length, uint32 offset, uint32 *result);
|
||||
NTSTATUS (*device_control)(HANDLE handle, uint32 request, STREAM in, STREAM out);
|
||||
NTSTATUS(*create) (uint32 device, uint32 desired_access, uint32 share_mode,
|
||||
uint32 create_disposition, uint32 flags_and_attributes, char *filename,
|
||||
HANDLE * handle);
|
||||
NTSTATUS(*close) (HANDLE handle);
|
||||
NTSTATUS(*read) (HANDLE handle, uint8 * data, uint32 length, uint32 offset,
|
||||
uint32 * result);
|
||||
NTSTATUS(*write) (HANDLE handle, uint8 * data, uint32 length, uint32 offset,
|
||||
uint32 * result);
|
||||
NTSTATUS(*device_control) (HANDLE handle, uint32 request, STREAM in, STREAM out);
|
||||
}
|
||||
DEVICE_FNS;
|
||||
|
||||
|
||||
typedef struct rdpdr_device_info
|
||||
{
|
||||
uint32 device_type;
|
||||
HANDLE handle;
|
||||
char name[8];
|
||||
char *local_path;
|
||||
void *pdevice_data;
|
||||
uint32 device_type;
|
||||
HANDLE handle;
|
||||
char name[8];
|
||||
char *local_path;
|
||||
void *pdevice_data;
|
||||
}
|
||||
RDPDR_DEVICE;
|
||||
|
||||
typedef struct rdpdr_serial_device_info
|
||||
{
|
||||
int dtr;
|
||||
uint32 baud_rate,
|
||||
queue_in_size,
|
||||
queue_out_size,
|
||||
wait_mask,
|
||||
read_interval_timeout,
|
||||
read_total_timeout_multiplier,
|
||||
read_total_timeout_constant,
|
||||
write_total_timeout_multiplier,
|
||||
write_total_timeout_constant,
|
||||
posix_wait_mask;
|
||||
uint8 stop_bits,
|
||||
parity,
|
||||
word_length;
|
||||
struct termios *ptermios,
|
||||
*pold_termios;
|
||||
int dtr;
|
||||
uint32 baud_rate,
|
||||
queue_in_size,
|
||||
queue_out_size,
|
||||
wait_mask,
|
||||
read_interval_timeout,
|
||||
read_total_timeout_multiplier,
|
||||
read_total_timeout_constant,
|
||||
write_total_timeout_multiplier, write_total_timeout_constant, posix_wait_mask;
|
||||
uint8 stop_bits, parity, word_length;
|
||||
struct termios *ptermios, *pold_termios;
|
||||
}
|
||||
SERIAL_DEVICE;
|
||||
|
||||
typedef struct rdpdr_parallel_device_info
|
||||
{
|
||||
char *driver,
|
||||
*printer;
|
||||
uint32 queue_in_size,
|
||||
queue_out_size,
|
||||
wait_mask,
|
||||
read_interval_timeout,
|
||||
read_total_timeout_multiplier,
|
||||
read_total_timeout_constant,
|
||||
write_total_timeout_multiplier,
|
||||
write_total_timeout_constant,
|
||||
posix_wait_mask,
|
||||
bloblen;
|
||||
uint8 *blob;
|
||||
char *driver, *printer;
|
||||
uint32 queue_in_size,
|
||||
queue_out_size,
|
||||
wait_mask,
|
||||
read_interval_timeout,
|
||||
read_total_timeout_multiplier,
|
||||
read_total_timeout_constant,
|
||||
write_total_timeout_multiplier,
|
||||
write_total_timeout_constant, posix_wait_mask, bloblen;
|
||||
uint8 *blob;
|
||||
}
|
||||
PARALLEL_DEVICE;
|
||||
|
||||
typedef struct rdpdr_printer_info
|
||||
{
|
||||
FILE *printer_fp;
|
||||
char *driver,
|
||||
*printer;
|
||||
uint32 bloblen;
|
||||
uint8 *blob;
|
||||
BOOL default_printer;
|
||||
FILE *printer_fp;
|
||||
char *driver, *printer;
|
||||
uint32 bloblen;
|
||||
uint8 *blob;
|
||||
BOOL default_printer;
|
||||
}
|
||||
PRINTER;
|
||||
|
||||
|
||||
|
||||
12
xwin.c
12
xwin.c
@ -731,7 +731,7 @@ ui_init(void)
|
||||
TrueColorVisual = True;
|
||||
}
|
||||
|
||||
if ((g_server_bpp == 8) && ((! TrueColorVisual) || (g_depth <= 8)))
|
||||
if ((g_server_bpp == 8) && ((!TrueColorVisual) || (g_depth <= 8)))
|
||||
{
|
||||
/* we use a colourmap, so the default visual should do */
|
||||
g_visual = DefaultVisualOfScreen(g_screen);
|
||||
@ -783,7 +783,9 @@ ui_init(void)
|
||||
|
||||
if (!g_owncolmap)
|
||||
{
|
||||
g_xcolmap = XCreateColormap(g_display,RootWindowOfScreen(g_screen),g_visual,AllocNone);
|
||||
g_xcolmap =
|
||||
XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual,
|
||||
AllocNone);
|
||||
if (g_depth <= 8)
|
||||
warning("Screen depth is 8 bits or lower: you may want to use -C for a private colourmap\n");
|
||||
}
|
||||
@ -849,7 +851,7 @@ ui_deinit(void)
|
||||
{
|
||||
if (g_IM != NULL)
|
||||
XCloseIM(g_IM);
|
||||
|
||||
|
||||
if (g_null_cursor != NULL)
|
||||
ui_destroy_cursor(g_null_cursor);
|
||||
|
||||
@ -894,9 +896,7 @@ ui_create_window(void)
|
||||
|
||||
if ((g_ownbackstore) && (g_backstore == NULL))
|
||||
{
|
||||
g_backstore =
|
||||
XCreatePixmap(g_display, g_wnd, g_width, g_height,
|
||||
g_depth);
|
||||
g_backstore = XCreatePixmap(g_display, g_wnd, g_width, g_height, g_depth);
|
||||
|
||||
/* clear to prevent rubbish being exposed at startup */
|
||||
XSetForeground(g_display, g_gc, BlackPixelOfScreen(g_screen));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user