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

- Remove force flag from rdpdr_init()

Browse Source 
- Changes to always start the rdpdr channel
  due assumtions that this channel is supposed
  to always be up and running.



git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1607 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Henrik Andersson 2011-01-03 13:12:17 +00:00
parent 6920eadf7f
commit 161b4f215a
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proto.h
View File

@ -158,7 +158,7 @@ int get_device_index(RD_NTHANDLE handle);
void convert_to_unix_filename(char *filename); void convert_to_unix_filename(char *filename);
void rdpdr_send_completion(uint32 device, uint32 id, uint32 status, uint32 result, uint8 * buffer, void rdpdr_send_completion(uint32 device, uint32 id, uint32 status, uint32 result, uint8 * buffer,
uint32 length); uint32 length);
RD_BOOL rdpdr_init(RD_BOOL force); RD_BOOL rdpdr_init();
void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, RD_BOOL * timeout); void rdpdr_add_fds(int *n, fd_set * rfds, fd_set * wfds, struct timeval *tv, RD_BOOL * timeout);
struct async_iorequest *rdpdr_remove_iorequest(struct async_iorequest *prev, struct async_iorequest *rdpdr_remove_iorequest(struct async_iorequest *prev,
struct async_iorequest *iorq); struct async_iorequest *iorq);

7
rdesktop.c
View File

@ -461,7 +461,6 @@ main(int argc, char *argv[])
char *locale = NULL; char *locale = NULL;
int username_option = 0; int username_option = 0;
RD_BOOL geometry_option = False; RD_BOOL geometry_option = False;
RD_BOOL force_rdpdr = False;
#ifdef WITH_RDPSND #ifdef WITH_RDPSND
char *rdpsnd_optarg = NULL; char *rdpsnd_optarg = NULL;
#endif #endif
@ -958,18 +957,14 @@ main(int argc, char *argv[])
if (g_rdpsnd) if (g_rdpsnd)
{ {
if (!rdpsnd_init(rdpsnd_optarg)) if (!rdpsnd_init(rdpsnd_optarg))
{
warning("Initializing sound-support failed!\n"); warning("Initializing sound-support failed!\n");
} }
else
force_rdpdr = True;
}
#endif #endif
if (g_lspci_enabled) if (g_lspci_enabled)
lspci_init(); lspci_init();
rdpdr_init (force_rdpdr); rdpdr_init();
while (1) while (1)
{ {

5
rdpdr.c
View File

@ -838,15 +838,12 @@ rdpdr_process(STREAM s)
} }
RD_BOOL RD_BOOL
rdpdr_init(RD_BOOL force) rdpdr_init()
{
if (g_num_devices > 0 || force)
{ {
rdpdr_channel = rdpdr_channel =
channel_register("rdpdr", channel_register("rdpdr",
CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_COMPRESS_RDP, CHANNEL_OPTION_INITIALIZED | CHANNEL_OPTION_COMPRESS_RDP,
rdpdr_process); rdpdr_process);
}
return (rdpdr_channel != NULL); return (rdpdr_channel != NULL);
} }