From 883650700fcd9e0bb90de5c307e7e4e845725312 Mon Sep 17 00:00:00 2001 From: Laxmikant Rashinkar Date: Sat, 8 Mar 2014 16:41:37 -0800 Subject: added support for using Xorg driver model --- sesman/scp_v0.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'sesman/scp_v0.c') diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c index aeaa22ee..cf5aa047 100644 --- a/sesman/scp_v0.c +++ b/sesman/scp_v0.c @@ -122,12 +122,21 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) s->domain, s->program, s->directory, s->client_ip); } - else + else if (SCP_SESSION_TYPE_XRDP == s->type) { log_message(LOG_LEVEL_INFO, "starting X11rdp session..."); display = session_start(s->width, s->height, s->bpp, s->username, s->password, data, SESMAN_SESSION_TYPE_XRDP, s->domain, s->program, s->directory, + s->client_ip); + } + else + { + /* type is SCP_SESSION_TYPE_XORG */ + log_message(LOG_LEVEL_INFO, "starting XOrg session..."); + display = session_start(s->width, s->height, s->bpp, s->username, + s->password, data, SESMAN_SESSION_TYPE_XORG, + s->domain, s->program, s->directory, s->client_ip); } } -- cgit v1.2.1 From 8566230442e5d4d2cbdfdc298bf5fcd8b62e3dd9 Mon Sep 17 00:00:00 2001 From: speidy Date: Sat, 22 Mar 2014 13:36:33 +0200 Subject: sesman: do reconnect to an exisitng Xorg session --- sesman/scp_v0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sesman/scp_v0.c') diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c index cf5aa047..9e7d9083 100644 --- a/sesman/scp_v0.c +++ b/sesman/scp_v0.c @@ -130,10 +130,10 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) s->domain, s->program, s->directory, s->client_ip); } - else + else if (SCP_SESSION_TYPE_XORG == s->type) { /* 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, s->password, data, SESMAN_SESSION_TYPE_XORG, s->domain, s->program, s->directory, -- cgit v1.2.1 From 1934c9ea00cb4cb35a2561273c8df8339c8023a1 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Sun, 20 Apr 2014 00:42:19 -0700 Subject: sesman: more options for session lookup from Fredy Paquet --- sesman/scp_v0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sesman/scp_v0.c') diff --git a/sesman/scp_v0.c b/sesman/scp_v0.c index 9e7d9083..ce528d46 100644 --- a/sesman/scp_v0.c +++ b/sesman/scp_v0.c @@ -74,7 +74,7 @@ scp_v0_process(struct SCP_CONNECTION *c, struct SCP_SESSION *s) else if (data) { s_item = session_get_bydata(s->username, s->width, s->height, - s->bpp, s->type); + s->bpp, s->type, s->client_ip); if (s_item != 0) { -- cgit v1.2.1