mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add timeout to trans_get_wait_objs_rw

Browse Source
This commit is contained in:
Jay Sorg 2015-07-13 01:10:48 -07:00
parent 136e072513
commit 6c23b85593
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/trans.c
View File

@ -171,7 +171,7 @@ trans_get_wait_objs(struct trans *self, tbus *objs, int *count)
/*****************************************************************************/
int APP_CC
trans_get_wait_objs_rw(struct trans *self, tbus *robjs, int *rcount,
tbus *wobjs, int *wcount)
tbus *wobjs, int *wcount, int *timeout)
{
if (self == 0)
{

2
common/trans.h
View File

@ -95,7 +95,7 @@ trans_get_wait_objs(struct trans* self, tbus* objs, int* count);
int APP_CC
trans_get_wait_objs_rw(struct trans *self,
tbus *robjs, int *rcount,
tbus *wobjs, int *wcount);
tbus *wobjs, int *wcount, int *timeout);
int APP_CC
trans_check_wait_objs(struct trans* self);
int APP_CC

2
sesman/chansrv/chansrv.c
View File

@ -1184,7 +1184,7 @@ channel_thread_loop(void *in_val)
num_objs++;
trans_get_wait_objs(g_lis_trans, objs, &num_objs);
trans_get_wait_objs_rw(g_con_trans, objs, &num_objs,
wobjs, &num_wobjs);
wobjs, &num_wobjs, &timeout);
trans_get_wait_objs(g_api_lis_trans, objs, &num_objs);
if (g_api_con_trans_list != 0)

2
vnc/vnc.c
View File

@ -1407,7 +1407,7 @@ lib_mod_get_wait_objs(struct vnc *v, tbus *read_objs, int *rcount,
if (v->trans != 0)
{
trans_get_wait_objs_rw(v->trans, read_objs, rcount,
write_objs, wcount);
write_objs, wcount, timeout);
}
}

2
xrdp/xrdp_process.c
View File

@ -220,7 +220,7 @@ xrdp_process_main_loop(struct xrdp_process *self)
xrdp_wm_get_wait_objs(self->wm, robjs, &robjs_count,
wobjs, &wobjs_count, &timeout);
trans_get_wait_objs_rw(self->server_trans, robjs, &robjs_count,
wobjs, &wobjs_count);
wobjs, &wobjs_count, &timeout);
/* wait */
if (g_obj_wait(robjs, robjs_count, wobjs, wobjs_count, timeout) != 0)
{

2
xup/xup.c
View File

@ -1510,7 +1510,7 @@ lib_mod_get_wait_objs(struct mod *mod, tbus *read_objs, int *rcount,
if (mod->trans != 0)
{
trans_get_wait_objs_rw(mod->trans, read_objs, rcount,
write_objs, wcount);
write_objs, wcount, timeout);
}
}
return 0;