From 6318d8ef0f3ab2ab5975f3a26fa39aa534bb0bf2 Mon Sep 17 00:00:00 2001 From: Bart Warmerdam Date: Mon, 16 Dec 2013 13:52:50 +0100 Subject: [PATCH 1/5] Set lock when adding new displays to the chain --- sesman/session.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sesman/session.c b/sesman/session.c index 888604da..eec36dfe 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -669,9 +669,15 @@ session_start_fork(int width, int height, int bpp, char *username, temp->item->type = type; temp->item->status = SESMAN_SESSION_STATUS_ACTIVE; + /*THREAD-FIX require chain lock */ + lock_chain_acquire(); + temp->next = g_sessions; g_sessions = temp; g_session_count++; + + /*THREAD-FIX release chain lock */ + lock_chain_release(); } return display; From 47071be4d41ed8ab02e5faa673d55e8375314fe5 Mon Sep 17 00:00:00 2001 From: Laxmikant Rashinkar Date: Sat, 1 Mar 2014 15:03:59 -0800 Subject: [PATCH 2/5] simplesound: fixed CHANSRV_PORT_STR undefined error --- sesman/chansrv/sound.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c index eb299ecc..8c76c9bc 100644 --- a/sesman/chansrv/sound.c +++ b/sesman/chansrv/sound.c @@ -1363,7 +1363,7 @@ read_raw_audio_data(void *arg) } strans->trans_data_in = sttrans_data_in; - g_snprintf(path, 255, CHANSRV_PORT_STR, g_display_num); + g_snprintf(path, 255, CHANSRV_PORT_OUT_STR, g_display_num); if (trans_connect(strans, "", path, 100) != 0) { From 86eb45c7a5b59ccd17ff00aa1c879c911a0ce732 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Sat, 1 Mar 2014 22:39:30 -0800 Subject: [PATCH 3/5] update version --- configure.ac | 4 ++-- readme.txt | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index d4807bcc..558fdb31 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script AC_PREREQ(2.59) -AC_INIT([xrdp], [0.7.0], [xrdp-devel@lists.sourceforge.net]) +AC_INIT([xrdp], [0.8.0], [xrdp-devel@lists.sourceforge.net]) AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in) AM_INIT_AUTOMAKE([1.6 foreign]) AC_PROG_CC @@ -113,7 +113,7 @@ then [#define _FILE_OFFSET_BITS 64]) fi -# checking for libpulse +# checking for libpulse if ! test -z "$enable_loadpulsemodules" then AC_CHECK_HEADER([pulse/util.h], [], diff --git a/readme.txt b/readme.txt index e4d71703..301f2c4d 100644 --- a/readme.txt +++ b/readme.txt @@ -1,9 +1,10 @@ -xrdp 0.7.0 +xrdp 0.8.0 Credits - This project is very much dependent on FreeRDP(was rdesktop), the work of - Matt Chapman and the FreeRDP team members, of which I'm a member. + This project is very much dependent on NeutrinoRDP, FreeRDP, rdesktop, and + the work of Matt Chapman and the NeutrinoRDP team members, of which I'm a + member. Mark from up 19.9 was the first to work with rdp server code. From 0a2b3a2fd7e1e55cbc9afc2b26f5be5e63c511c0 Mon Sep 17 00:00:00 2001 From: Jay Sorg Date: Sat, 1 Mar 2014 23:18:35 -0800 Subject: [PATCH 4/5] update version --- configure.ac | 4 ++-- readme.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d4807bcc..621ce4be 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script AC_PREREQ(2.59) -AC_INIT([xrdp], [0.7.0], [xrdp-devel@lists.sourceforge.net]) +AC_INIT([xrdp], [0.9.0], [xrdp-devel@lists.sourceforge.net]) AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in) AM_INIT_AUTOMAKE([1.6 foreign]) AC_PROG_CC @@ -113,7 +113,7 @@ then [#define _FILE_OFFSET_BITS 64]) fi -# checking for libpulse +# checking for libpulse if ! test -z "$enable_loadpulsemodules" then AC_CHECK_HEADER([pulse/util.h], [], diff --git a/readme.txt b/readme.txt index e4d71703..64bf5cdf 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ -xrdp 0.7.0 +xrdp 0.9.0 Credits This project is very much dependent on FreeRDP(was rdesktop), the work of From d7b49762fa6a5a44fc63446b8f66415b8c9b033f Mon Sep 17 00:00:00 2001 From: speidy Date: Tue, 22 Apr 2014 05:16:15 +0300 Subject: [PATCH 5/5] pulseaudio: let module-xrdp-source compile on CentOS6 (PA 0.9.21) --- sesman/chansrv/pulse/module-xrdp-source.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sesman/chansrv/pulse/module-xrdp-source.c b/sesman/chansrv/pulse/module-xrdp-source.c index 95465c65..1c03b069 100644 --- a/sesman/chansrv/pulse/module-xrdp-source.c +++ b/sesman/chansrv/pulse/module-xrdp-source.c @@ -369,7 +369,15 @@ int pa__init(pa_module *m) { u->source->thread_info.max_rewind = pa_usec_to_bytes(u->block_usec, &u->source->sample_spec); - if (!(u->thread = pa_thread_new("null-source", thread_func, u))) { + #if defined(PA_CHECK_VERSION) + #if PA_CHECK_VERSION(0, 9, 22) + if (!(u->thread = pa_thread_new("xrdp-source", thread_func, u))) { + #else + if (!(u->thread = pa_thread_new(thread_func, u))) { + #endif + #else + if (!(u->thread = pa_thread_new(thread_func, u))) + #endif pa_log("Failed to create thread."); goto fail; }