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

added x_server_running_check_ports

Browse Source
This commit is contained in:
jsorg71 2009-08-06 19:01:09 +00:00
parent c85e32446c
commit 9922d2aef6
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sesman/session.c
View File

@ -85,7 +85,7 @@ session_get_bydata(char* name, int width, int height, int bpp)
* *
*/ */
static int DEFAULT_CC static int DEFAULT_CC
x_server_running(int display) x_server_running_check_ports(int display)
{ {
char text[256]; char text[256];
int x_running; int x_running;
@ -122,6 +122,31 @@ x_server_running(int display)
return x_running; return x_running;
} }
/******************************************************************************/
/**
*
* @brief checks if there's a server running on a display
* @param display the display to check
* @return 0 if there isn't a display running, nonzero otherwise
*
*/
static int DEFAULT_CC
x_server_running(int display)
{
char text[256];
int x_running;
int sck;
g_sprintf(text, "/tmp/.X11-unix/X%d", display);
x_running = g_file_exist(text);
if (!x_running)
{
g_sprintf(text, "/tmp/.X%d-lock", display);
x_running = g_file_exist(text);
}
return x_running;
}
/******************************************************************************/ /******************************************************************************/
static void DEFAULT_CC static void DEFAULT_CC
session_start_sessvc(int xpid, int wmpid, long data) session_start_sessvc(int xpid, int wmpid, long data)
@ -215,7 +240,7 @@ session_get_aval_display_from_chain(void)
{ {
if (!session_is_display_in_chain(display)) if (!session_is_display_in_chain(display))
{ {
if (!x_server_running(display)) if (!x_server_running_check_ports(display))
{ {
lock_chain_release(); lock_chain_release();
return display; return display;