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

sesman: do reconnect to an exisitng Xorg session

Browse Source
This commit is contained in:
speidy 2014-03-22 13:36:33 +02:00
parent e840c8f335
commit 8566230442
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sesman/scp_v0.c
View File

@ -130,10 +130,10 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s)
s->domain, s->program, s->directory, s->domain, s->program, s->directory,
s->client_ip); s->client_ip);
} }
else else if (SCP_SESSION_TYPE_XORG == s->type)
{ {
/* type is SCP_SESSION_TYPE_XORG */ /* type is SCP_SESSION_TYPE_XORG */
log_message(LOG_LEVEL_INFO, "starting XOrg session..."); log_message(LOG_LEVEL_INFO, "starting Xorg session...");
display = session_start(s->width, s->height, s->bpp, s->username, display = session_start(s->width, s->height, s->bpp, s->username,
s->password, data, SESMAN_SESSION_TYPE_XORG, s->password, data, SESMAN_SESSION_TYPE_XORG,
s->domain, s->program, s->directory, s->domain, s->program, s->directory,

3
sesman/session.c
View File

@ -108,6 +108,9 @@ session_get_bydata(char *name, int width, int height, int bpp, int type)
case SCP_SESSION_TYPE_XRDP: /* 1 */ case SCP_SESSION_TYPE_XRDP: /* 1 */
type = SESMAN_SESSION_TYPE_XRDP; /* 1 */ type = SESMAN_SESSION_TYPE_XRDP; /* 1 */
break; break;
case SCP_SESSION_TYPE_XORG:
type = SESMAN_SESSION_TYPE_XORG;
break;
default: default:
lock_chain_release(); lock_chain_release();
return 0; return 0;