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

login changes when looking for available display

Browse Source
This commit is contained in:
jsorg71 2009-08-06 06:13:52 +00:00
parent eeac7c938a
commit c85e32446c
1 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
sesman/session.c
View File

@ -180,6 +180,53 @@ session_start_sessvc(int xpid, int wmpid, long data)
g_exit(0);
}
/******************************************************************************/
/* called with the main thread
returns boolean */
static int APP_CC
session_is_display_in_chain(int display)
{
struct session_chain* chain;
struct session_item* item;
chain = g_sessions;
while (chain != 0)
{
item = chain->item;
if (item->display == display)
{
return 1;
}
chain = chain->next;
}
return 0;
}
/******************************************************************************/
/* called with the main thread */
static int APP_CC
session_get_aval_display_from_chain(void)
{
int display;
display = 10;
lock_chain_acquire();
while ((display - 10) <= g_cfg->sess.max_sessions)
{
if (!session_is_display_in_chain(display))
{
if (!x_server_running(display))
{
lock_chain_release();
return display;
}
}
display++;
}
lock_chain_release();
return 0;
}
/******************************************************************************/
/* called with the main thread */
static int APP_CC
@ -225,21 +272,13 @@ session_start_fork(int width, int height, int bpp, char* username,
"item - user %s", username);
return 0;
}
display = 10;
/*while (x_server_running(display) && display < 50)*/
/* we search for a free display up to max_sessions */
/* we should need no more displays than this */
while (x_server_running(display))
{
display++;
if (((display - 10) > g_cfg->sess.max_sessions) || (display >= 50))
display = session_get_aval_display_from_chain();
if (display == 0)
{
g_free(temp->item);
g_free(temp);
return 0;
}
}
wmpid = 0;
pid = g_fork();
if (pid == -1)
@ -479,10 +518,6 @@ session_start(int width, int height, int bpp, char* username, char* password,
display = g_sync_result;
/* unlock mutex */
lock_sync_release();
if (display != 0)
{
g_sleep(5000);
}
return display;
}