x2go-commits September 2011

x2go-commits@lists.x2go.org

1 participants
268 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-318-gda4800f
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via da4800f1505c62f65d8d91fbb7ad5d7de21ce2e3 (commit) from 59452aceaa5f6235e3fb6a411abf76fbf7770c69 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit da4800f1505c62f65d8d91fbb7ad5d7de21ce2e3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 17:10:38 2011 +0200 copy+paste error ----------------------------------------------------------------------- Summary of changes: x2goserver/bin/x2goruncommand | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 0e5209b..b14920f 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -128,7 +128,7 @@ else fi # stop x2godesktopsharing process gracefully... -x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate $SESSION_NAME +x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate $X2GO_SESSION kill -TERM $X2GO_AGENT_PID $X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-22-gae952c3
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via ae952c3ad02ebd5231b425cfcc13c8a6515c01d8 (commit) from afbd6ea63298d948d3543143e13ed12db7b3fddd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ae952c3ad02ebd5231b425cfcc13c8a6515c01d8 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 17:06:28 2011 +0200 remove debug code(2) ----------------------------------------------------------------------- Summary of changes: bin/x2godesktopsharing-terminate | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/bin/x2godesktopsharing-terminate b/bin/x2godesktopsharing-terminate index e2ef51a..3a14cbc 100755 --- a/bin/x2godesktopsharing-terminate +++ b/bin/x2godesktopsharing-terminate @@ -38,7 +38,7 @@ for process_id in `pidof x2godesktopsharing`; do env_of_process=${env_of_process//^@/\\n} display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2) if echo $display | grep $X2GO_DISPLAY &>/dev/null; then - echo kill -SIGTERM $process_id + kill -SIGTERM $process_id fi done hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-21-gafbd6ea
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via afbd6ea63298d948d3543143e13ed12db7b3fddd (commit) from 10d8ce59c44d6fdc17ff4823efb307a36cbfa79d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit afbd6ea63298d948d3543143e13ed12db7b3fddd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 17:04:32 2011 +0200 remove debug code ----------------------------------------------------------------------- Summary of changes: bin/x2godesktopsharing-terminate | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/x2godesktopsharing-terminate b/bin/x2godesktopsharing-terminate index 7b4d69d..e2ef51a 100755 --- a/bin/x2godesktopsharing-terminate +++ b/bin/x2godesktopsharing-terminate @@ -1,7 +1,5 @@ #!/bin/bash -set -ex - # Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org # # This program is free software; you can redistribute it and/or modify hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-317-g59452ac
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via 59452aceaa5f6235e3fb6a411abf76fbf7770c69 (commit) from 028c7499c8e11b9358f349f51b883b8e3a91479b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 59452aceaa5f6235e3fb6a411abf76fbf7770c69 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 17:02:41 2011 +0200 changelog-line-too-long fixes ----------------------------------------------------------------------- Summary of changes: debian/changelog | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d0a7e55..72acfab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,12 +80,12 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low of x2gognomebindings and moved it there (with new name: x2goumount-session-gnome). * Add x2golistmounts script to X2go server extensions. - * Add x2gofeature script and x2gofeature.d subscript for x2goserver-extensions and - x2goserver-printing. + * Add x2gofeature script and x2gofeature.d subscript for x2goserver-extensions + and x2goserver-printing. * Add x2gofeature man page. * Move x2goversion into x2goserver core package. - * Makefile update for including x2gofeature scripts into installation, minor fixes - to x2goserver core package Makefile. + * Makefile update for including x2gofeature scripts into installation, minor + fixes to x2goserver core package Makefile. * Add debug output around shadow session startup (in x2gostartagent). * Pass extra argument $USER to client-mode x2godesktopsharing, requires x2godesktopsharing (>=3.0.1.3) for it to work. @@ -93,10 +93,12 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low running in debug mode. * Change of Desktop icons for shared folders. This change is needed for parallel installation of x2gognomebindings and x2golxdebindings. - * Only remove server-side session directory if x2goruncommand has not failed. - * Syntax fix in x2golistsessions_sql, hopefully fixes broken x2gocleansessions. - * Terminate x2godesktopsharing for current session on x2goterminate-session or - when x2goruncommand is about to exit. + * Only remove server-side session directory if x2goruncommand has not + failed. + * Syntax fix in x2golistsessions_sql, hopefully fixes broken + x2gocleansessions. + * Terminate x2godesktopsharing for current session on x2goterminate-session + or when x2goruncommand is about to exit. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-20-g10d8ce5
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via 10d8ce59c44d6fdc17ff4823efb307a36cbfa79d (commit) via d1674883c091c3a532011a31bb2c17d35cb7b725 (commit) from 91df9e9278ea7dcb4bc17d1f8a934af0dfdd909d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 10d8ce59c44d6fdc17ff4823efb307a36cbfa79d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 16:50:04 2011 +0200 Add script x2godesktopsharing-terminate: detect x2godesktopsharing process of a given session and terminate that process. commit d1674883c091c3a532011a31bb2c17d35cb7b725 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 16:49:19 2011 +0200 changelog fix ----------------------------------------------------------------------- Summary of changes: bin/x2godesktopsharing-terminate | 46 +++++++++++++++++++++++ debian/changelog | 6 ++- debian/x2godesktopsharing.install | 2 + share/x2gofeature.d/x2godesktopsharing.features | 36 ++++++++++++++++++ 4 files changed, 88 insertions(+), 2 deletions(-) create mode 100755 bin/x2godesktopsharing-terminate create mode 100755 share/x2gofeature.d/x2godesktopsharing.features The diff of changes is: diff --git a/bin/x2godesktopsharing-terminate b/bin/x2godesktopsharing-terminate new file mode 100755 index 0000000..7b4d69d --- /dev/null +++ b/bin/x2godesktopsharing-terminate @@ -0,0 +1,46 @@ +#!/bin/bash + +set -ex + +# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2011 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + +if [ $# -eq 1 ]; then + SESSION_NAME=$1 +else + SESSION_NAME=$X2GO_SESSION +fi + +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + + +X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) +for process_id in `pidof x2godesktopsharing`; do + env_of_process=$(cat -A /proc/$process_id/environ) + env_of_process=${env_of_process//^@/\\n} + display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2) + if echo $display | grep $X2GO_DISPLAY &>/dev/null; then + echo kill -SIGTERM $process_id + fi +done + diff --git a/debian/changelog b/debian/changelog index 906ed53..ee8c58d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low - New upstream version (3.0.1.3): + * New upstream version (3.0.1.3): - Fix incomplete DENY statement in main.cpp. - System group for x2godesktopsharing change from x2gousers -> x2godesktopsharing. @@ -9,7 +9,9 @@ x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low - Differentiate between local and remote user, fixes display of wrong user name for remote user. - Add signal handler so that unix signals can be handled within Qt. - Depend on x2goserver (>=3.0.99.6). + - Add script x2godesktopsharing-terminate: detect x2godesktopsharing process + of a given session and terminate that process. + * Depend on x2goserver (>=3.0.99.6). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 13 Jun 2011 20:39:33 +0200 diff --git a/debian/x2godesktopsharing.install b/debian/x2godesktopsharing.install index c7444b2..1e51109 100644 --- a/debian/x2godesktopsharing.install +++ b/debian/x2godesktopsharing.install @@ -1 +1,3 @@ VERSION.x2godesktopsharing usr/share/x2go/versions +bin/* usr/bin/ +share/* usr/share/x2go/ \ No newline at end of file diff --git a/share/x2gofeature.d/x2godesktopsharing.features b/share/x2gofeature.d/x2godesktopsharing.features new file mode 100755 index 0000000..2f29612 --- /dev/null +++ b/share/x2gofeature.d/x2godesktopsharing.features @@ -0,0 +1,36 @@ +#!/bin/bash + +# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +# +# Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + +X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` + +$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" + +X2GO_FEATURE=$1 + +# check for X2go server core features +case "$X2GO_FEATURE" in + + "X2GO_DESKTOPSHARING") echo "ok"; exit 0;; + *) exit -1;; + +esac + hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-316-g028c749
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via 028c7499c8e11b9358f349f51b883b8e3a91479b (commit) via 1bff722ad44c6e7a6e49188fa10a57cef1cf198f (commit) from 5838372eb96984eb8985b34c21962e8701e22a08 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 028c7499c8e11b9358f349f51b883b8e3a91479b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 16:55:53 2011 +0200 Terminate x2godesktopsharing for current session on x2goterminate-session or when x2goruncommand is about to exit. commit 1bff722ad44c6e7a6e49188fa10a57cef1cf198f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 16:52:44 2011 +0200 Add usage to x2gofeature, exit with -1 if feature is not available, with -2 if usage has been called. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2goserver/bin/x2gofeature | 4 +++- x2goserver/bin/x2goruncommand | 3 +++ x2goserver/bin/x2goterminate-session | 3 +++ 4 files changed, 11 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ab491b5..d0a7e55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -95,6 +95,8 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low parallel installation of x2gognomebindings and x2golxdebindings. * Only remove server-side session directory if x2goruncommand has not failed. * Syntax fix in x2golistsessions_sql, hopefully fixes broken x2gocleansessions. + * Terminate x2godesktopsharing for current session on x2goterminate-session or + when x2goruncommand is about to exit. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature index 81c9245..6bb7d6a 100755 --- a/x2goserver/bin/x2gofeature +++ b/x2goserver/bin/x2gofeature @@ -20,6 +20,8 @@ # Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +[ -z $1 ] && { echo usage: "$(basename $0) <X2GO_FEATURE_NAME>"; exit -2; } + X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` X2GO_SHARE_PATH=`echo -n \$(x2gobasepath)/share/x2go` @@ -35,4 +37,4 @@ test -d $X2GO_SHARE_PATH/x2gofeature.d && { } echo "not available" -exit 0 +exit -1 diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index bd63873..0e5209b 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -127,6 +127,9 @@ else echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE fi +# stop x2godesktopsharing process gracefully... +x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate $SESSION_NAME + kill -TERM $X2GO_AGENT_PID $X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null export HOSTNAME diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session index 5b1cd23..50357f3 100755 --- a/x2goserver/bin/x2goterminate-session +++ b/x2goserver/bin/x2goterminate-session @@ -35,6 +35,9 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}` $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null +# stop x2godesktopsharing process gracefully... +x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate $SESSION_NAME + kill -TERM $X2GO_AGENT_PID &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been terminated successfully" } || { hooks/post-receive -- x2goserver.git (X2go Server) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goserver.git" (X2go Server).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-18-g91df9e9
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via 91df9e9278ea7dcb4bc17d1f8a934af0dfdd909d (commit) from 3c4601b7ec0af5717bdd9e6983e451efd1c4b67f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 91df9e9278ea7dcb4bc17d1f8a934af0dfdd909d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 15:50:17 2011 +0200 add signal handler for SIGABRT ----------------------------------------------------------------------- Summary of changes: main.cpp | 9 ++++++++- sharetray.cpp | 24 ++++++++++++++++++++++++ sharetray.h | 4 ++++ 3 files changed, 36 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/main.cpp b/main.cpp index fa54d3d..b435d48 100644 --- a/main.cpp +++ b/main.cpp @@ -83,7 +83,7 @@ void client ( const QStringList & cmd ) static int setup_unix_signal_handlers() { - struct sigaction keybint, term; + struct sigaction keybint, term, abort; keybint.sa_handler = ShareTray::keybintSignalHandler; sigemptyset(&keybint.sa_mask); @@ -100,6 +100,13 @@ static int setup_unix_signal_handlers() if (sigaction(SIGTERM, &term, 0) > 0) return 2; + abort.sa_handler = ShareTray::abortSignalHandler; + sigemptyset(&abort.sa_mask); + abort.sa_flags |= SA_RESTART; + + if (sigaction(SIGABRT, &abort, 0) > 0) + return 3; + return 0; } diff --git a/sharetray.cpp b/sharetray.cpp index 9e81db8..7c00b1e 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -40,6 +40,7 @@ //needed to not get an undefined reference to static members int ShareTray::sigkeybintFd[2]; int ShareTray::sigtermFd[2]; +int ShareTray::sigabortFd[2]; ShareTray::ShareTray() : QMainWindow() @@ -177,10 +178,15 @@ ShareTray::ShareTray() if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd)) qFatal("Couldn't create TERM socketpair"); + if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigabortFd)) + qFatal("Couldn't create ABRT socketpair"); + snKeybInt = new QSocketNotifier(sigkeybintFd[1], QSocketNotifier::Read, this); connect(snKeybInt, SIGNAL(activated(int)), this, SLOT(handleSigKeybInt())); snTerm = new QSocketNotifier(sigtermFd[1], QSocketNotifier::Read, this); connect(snTerm, SIGNAL(activated(int)), this, SLOT(handleSigTerm())); + snAbort = new QSocketNotifier(sigabortFd[1], QSocketNotifier::Read, this); + connect(snAbort, SIGNAL(activated(int)), this, SLOT(handleSigAbort())); QTimer *timer = new QTimer ( this ); connect ( timer, SIGNAL ( timeout() ), this, SLOT ( slotTimer() ) ); @@ -226,6 +232,18 @@ void ShareTray::handleSigTerm() snTerm->setEnabled(true); } +void ShareTray::handleSigAbort() +{ + snAbort->setEnabled(false); + char tmp; + ::read(sigabortFd[1], &tmp, sizeof(tmp)); + + // do Qt stuff here + slotMenuClose(); + + snAbort->setEnabled(true); +} + void ShareTray::keybintSignalHandler(int) { char a = 1; @@ -238,6 +256,12 @@ void ShareTray::termSignalHandler(int) ::write(sigtermFd[0], &a, sizeof(a)); } +void ShareTray::abortSignalHandler(int) +{ + char a = 1; + ::write(sigabortFd[0], &a, sizeof(a)); +} + void ShareTray::slotStopSharing() { if ( serverSocket ) diff --git a/sharetray.h b/sharetray.h index 4119244..c7fe8eb 100644 --- a/sharetray.h +++ b/sharetray.h @@ -36,6 +36,7 @@ public: // Unix signal handlers. static void keybintSignalHandler(int unused); static void termSignalHandler(int unused); + static void abortSignalHandler(int unused); // desktop sharing socket QString getSocketAnswer(QString message); void closeSocket(SimpleLocalSocket* sock); @@ -65,6 +66,7 @@ public slots: // Qt signal handlers. void handleSigKeybInt(); void handleSigTerm(); + void handleSigAbort(); private slots: void slotStopSharing(); void slotStartSharing(); @@ -91,8 +93,10 @@ private: // unix file sockets for signal handler communication (unix <-> Qt) static int sigkeybintFd[2]; static int sigtermFd[2]; + static int sigabortFd[2]; QSocketNotifier *snKeybInt; QSocketNotifier *snTerm; + QSocketNotifier *snAbort; }; #endif hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-17-g3c4601b
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via 3c4601b7ec0af5717bdd9e6983e451efd1c4b67f (commit) from 0720d15908712b9f3c3390e46515bdd3fcd8b550 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3c4601b7ec0af5717bdd9e6983e451efd1c4b67f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 14:55:05 2011 +0200 tab'ified sharetray.h ----------------------------------------------------------------------- Summary of changes: sharetray.h | 78 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 39 insertions(+), 39 deletions(-) The diff of changes is: diff --git a/sharetray.h b/sharetray.h index d2c2531..4119244 100644 --- a/sharetray.h +++ b/sharetray.h @@ -29,7 +29,7 @@ class QSocketNotifier; */ class ShareTray : public QMainWindow { - Q_OBJECT + Q_OBJECT public: ShareTray(); ~ShareTray(); @@ -42,52 +42,52 @@ public: // entry point for incoming connections bool acceptConnections(); private: - enum {BLACK,WHITE} current_list; - QMenu* menu; - QWidget* mainWnd; - QAction* actStart; - QAction* actStop; - QAction* actWhite; - QAction* actBlack; - QSystemTrayIcon* trayIcon; - QLocalServer* serverSocket; - QString socketFname; - QString lockFname; - MessageBox* mbox; - QStringList whiteList; - QStringList blackList; - Ui::mwnd ui; - bool menuClose; + enum {BLACK,WHITE} current_list; + QMenu* menu; + QWidget* mainWnd; + QAction* actStart; + QAction* actStop; + QAction* actWhite; + QAction* actBlack; + QSystemTrayIcon* trayIcon; + QLocalServer* serverSocket; + QString socketFname; + QString lockFname; + MessageBox* mbox; + QStringList whiteList; + QStringList blackList; + Ui::mwnd ui; + bool menuClose; protected: - void closeEvent ( QCloseEvent* event ); + void closeEvent ( QCloseEvent* event ); public slots: // Qt signal handlers. void handleSigKeybInt(); void handleSigTerm(); private slots: - void slotStopSharing(); - void slotStartSharing(); - void slotServerConnection(); - void slotCloseConnection(AccessAction* action); - void slotTimer(); - void slotWhiteList(); - void slotBlackList(); - void slotAboutQt(); - void slotAbout(); - void slotMsgClose(QAbstractButton*); - void slotMsgOkCancel(QAbstractButton* button); - void slotDelListItem(); - void slotMenuClose(); - void slotUpdateLockFile(); + void slotStopSharing(); + void slotStartSharing(); + void slotServerConnection(); + void slotCloseConnection(AccessAction* action); + void slotTimer(); + void slotWhiteList(); + void slotBlackList(); + void slotAboutQt(); + void slotAbout(); + void slotMsgClose(QAbstractButton*); + void slotMsgOkCancel(QAbstractButton* button); + void slotDelListItem(); + void slotMenuClose(); + void slotUpdateLockFile(); private: - int getAccess(QString user, QString host); - void trayMessage(QString title, QString text); - bool isProcessRunning(QString pid); - void loadSettings(); - void saveSettings(); - void setTrayIcon(); - void showList(); + int getAccess(QString user, QString host); + void trayMessage(QString title, QString text); + bool isProcessRunning(QString pid); + void loadSettings(); + void saveSettings(); + void setTrayIcon(); + void showList(); // unix file sockets for signal handler communication (unix <-> Qt) static int sigkeybintFd[2]; static int sigtermFd[2]; hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-16-g0720d15
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via 0720d15908712b9f3c3390e46515bdd3fcd8b550 (commit) from cf356157e83da59220ab7af3c8bb71f722b3e754 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0720d15908712b9f3c3390e46515bdd3fcd8b550 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 14:35:18 2011 +0200 tab'ified sharetray.cpp ----------------------------------------------------------------------- Summary of changes: sharetray.cpp | 785 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 391 insertions(+), 394 deletions(-) The diff of changes is: diff --git a/sharetray.cpp b/sharetray.cpp index 56a785c..9e81db8 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -44,132 +44,131 @@ int ShareTray::sigtermFd[2]; ShareTray::ShareTray() : QMainWindow() { - serverSocket=0l; - menuClose=false; - current_list=BLACK; - - ui.setupUi ( this ); - ui.box->setSelectionMode ( QAbstractItemView::ExtendedSelection ); - - connect ( ui.close_box,SIGNAL ( clicked ( QAbstractButton* ) ), - SLOT ( slotMsgClose ( QAbstractButton* ) ) ); - - connect ( ui.ok_cancel_box,SIGNAL ( clicked ( QAbstractButton* ) ), - SLOT ( slotMsgOkCancel ( QAbstractButton* ) ) ); - - connect ( ui.del,SIGNAL ( clicked() ), - SLOT ( slotDelListItem() ) ); - - ui.icon->setPixmap ( QPixmap ( ":icons/128x128/x2godesktopsharing.png" ) ); - - ui.text->setText ( tr ( "<b>X2GO DesktopSharing v" ) +VERSION+ - " </b >(Qt - "+qVersion() +")"+ - ui.text->text() ); - - setWindowFlags ( Qt::Dialog ); - Qt::WindowFlags flags=windowFlags(); - flags&= ~Qt::WindowTitleHint; - setWindowFlags ( flags ); - - QString dispname=getenv ( "DISPLAY" ); - socketFname=QDir::tempPath() +"/x2godesktopsharing_@"+ - getenv ( "LOGNAME" ) +"@"+dispname; - lockFname=QDir::tempPath() +"/x2godesktopsharing.lock_"+ - getenv ( "LOGNAME" ) +"@"+dispname; - if ( QFile::exists ( lockFname ) ) - { - QFile file ( lockFname ); - if ( file.open ( QIODevice::ReadOnly | QIODevice::Text ) ) - { - QTextStream in ( &file ); - if ( !in.atEnd() ) - { - QString line = in.readLine(); - file.close(); - if ( abs ( line.toUInt() - - QDateTime::currentDateTime().toTime_t() ) <5 ) - { - - QString message=QString ( - tr ( - "X2Go desktop sharing application " - "is already active for this " - "display \n" - "if this application is no longer " - "running, remove %1\n" - "and start again" ) ).arg ( lockFname ); - QMessageBox::critical ( 0l,tr ( - "Error" ),message, - QMessageBox::Ok, - QMessageBox::NoButton ); - exit ( -1 ); - } - } - } - QFile::remove ( lockFname ); - } - if ( QFile::exists ( socketFname ) ) - QFile::remove ( socketFname ); - - QTimer *lockTimer = new QTimer ( this ); - connect ( lockTimer, SIGNAL ( timeout() ), this, SLOT ( slotUpdateLockFile() ) ); - lockTimer->start ( 3000 ); - trayIcon=new QSystemTrayIcon ( this ); - setWindowIcon ( QIcon ( ":icons/22x22/x2godesktopsharing.png" ) ); - menu = new QMenu ( this ); - trayIcon->setContextMenu ( menu ); - trayIcon->setToolTip ( tr ( "X2Go desktop sharing application" ) ); - - menu->addSeparator(); - - actWhite = menu->addAction ( QIcon ( ":icons/32x32/wlist.png" ) , - tr ( "Granted users..." ) ); - actBlack = menu->addAction ( QIcon ( ":icons/32x32/blist.png" ) , - tr ( "Banned users..." ) ); - menu->addSeparator(); - - actStart = menu->addAction ( QIcon ( ":icons/32x32/share.png" ) , - tr ( "Activate desktop sharing" ) ); - - actStop = menu->addAction ( QIcon ( ":icons/32x32/stop.png" ) , - tr ( "Deactivate desktop sharing" ) ); - - menu->addSeparator(); - QAction* actAbout=menu->addAction ( - QIcon ( ":icons/32x32/x2godesktopsharing.png" ), - tr ( "About X2GO Sharing" ) ); -// -// QAction* actAboutQt=menu->addAction( -// tr("About Qt")); -// connect ( actAboutQt,SIGNAL ( triggered ( bool ) ),this, -// SLOT ( slotAboutQt() ) ); -// - connect ( actAbout,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotAbout() ) ); - - - menu->addSeparator(); - QAction* actExit = menu->addAction ( QIcon ( ":icons/32x32/exit.png" ) , - tr ( "&Quit" ) ); - - connect ( actWhite,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotWhiteList() ) ); - connect ( actBlack,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotBlackList() ) ); - - - connect ( actExit,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotMenuClose() ) ); - - connect ( actStart,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotStartSharing() ) ); - - connect ( actStop,SIGNAL ( triggered ( bool ) ),this, - SLOT ( slotStopSharing() ) ); - - - - actStop->setEnabled ( false ); + serverSocket=0l; + menuClose=false; + current_list=BLACK; + + ui.setupUi ( this ); + ui.box->setSelectionMode ( QAbstractItemView::ExtendedSelection ); + + connect ( ui.close_box,SIGNAL ( clicked ( QAbstractButton* ) ), + SLOT ( slotMsgClose ( QAbstractButton* ) ) ); + + connect ( ui.ok_cancel_box,SIGNAL ( clicked ( QAbstractButton* ) ), + SLOT ( slotMsgOkCancel ( QAbstractButton* ) ) ); + + connect ( ui.del,SIGNAL ( clicked() ), + SLOT ( slotDelListItem() ) ); + + ui.icon->setPixmap ( QPixmap ( ":icons/128x128/x2godesktopsharing.png" ) ); + + ui.text->setText ( tr ( "<b>X2GO DesktopSharing v" ) +VERSION+ + " </b >(Qt - "+qVersion() +")"+ + ui.text->text() ); + + setWindowFlags ( Qt::Dialog ); + Qt::WindowFlags flags=windowFlags(); + flags&= ~Qt::WindowTitleHint; + setWindowFlags ( flags ); + + QString dispname=getenv ( "DISPLAY" ); + socketFname=QDir::tempPath() +"/x2godesktopsharing_@"+ + getenv ( "LOGNAME" ) +"@"+dispname; + lockFname=QDir::tempPath() +"/x2godesktopsharing.lock_"+ + getenv ( "LOGNAME" ) +"@"+dispname; + if ( QFile::exists ( lockFname ) ) + { + QFile file ( lockFname ); + if ( file.open ( QIODevice::ReadOnly | QIODevice::Text ) ) + { + QTextStream in ( &file ); + if ( !in.atEnd() ) + { + QString line = in.readLine(); + file.close(); + if ( abs ( line.toUInt() - + QDateTime::currentDateTime().toTime_t() ) <5 ) + { + + QString message=QString ( + tr ( + "X2Go desktop sharing application " + "is already active for this " + "display \n" + "if this application is no longer " + "running, remove %1\n" + "and start again" ) ).arg ( lockFname ); + QMessageBox::critical ( 0l,tr ( + "Error" ),message, + QMessageBox::Ok, + QMessageBox::NoButton ); + exit ( -1 ); + } + } + } + QFile::remove ( lockFname ); + } + if ( QFile::exists ( socketFname ) ) + QFile::remove ( socketFname ); + + QTimer *lockTimer = new QTimer ( this ); + connect ( lockTimer, SIGNAL ( timeout() ), this, SLOT ( slotUpdateLockFile() ) ); + lockTimer->start ( 3000 ); + trayIcon=new QSystemTrayIcon ( this ); + setWindowIcon ( QIcon ( ":icons/22x22/x2godesktopsharing.png" ) ); + menu = new QMenu ( this ); + trayIcon->setContextMenu ( menu ); + trayIcon->setToolTip ( tr ( "X2Go desktop sharing application" ) ); + + menu->addSeparator(); + + actWhite = menu->addAction ( QIcon ( ":icons/32x32/wlist.png" ) , + tr ( "Granted users..." ) ); + actBlack = menu->addAction ( QIcon ( ":icons/32x32/blist.png" ) , + tr ( "Banned users..." ) ); + menu->addSeparator(); + + actStart = menu->addAction ( QIcon ( ":icons/32x32/share.png" ) , + tr ( "Activate desktop sharing" ) ); + + actStop = menu->addAction ( QIcon ( ":icons/32x32/stop.png" ) , + tr ( "Deactivate desktop sharing" ) ); + + menu->addSeparator(); + QAction* actAbout=menu->addAction ( + QIcon ( ":icons/32x32/x2godesktopsharing.png" ), + tr ( "About X2GO Sharing" ) ); + // + // QAction* actAboutQt=menu->addAction( + // tr("About Qt")); + // connect ( actAboutQt,SIGNAL ( triggered ( bool ) ),this, + // SLOT ( slotAboutQt() ) ); + // + connect ( actAbout,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotAbout() ) ); + + + menu->addSeparator(); + QAction* actExit = menu->addAction ( QIcon ( ":icons/32x32/exit.png" ) , + tr ( "&Quit" ) ); + + connect ( actWhite,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotWhiteList() ) ); + connect ( actBlack,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotBlackList() ) ); + + connect ( actExit,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotMenuClose() ) ); + + connect ( actStart,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotStartSharing() ) ); + + connect ( actStop,SIGNAL ( triggered ( bool ) ),this, + SLOT ( slotStopSharing() ) ); + + + + actStop->setEnabled ( false ); // unix signals (TERM, INT) are piped into a unix socket and will raise Qt events if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigkeybintFd)) @@ -183,24 +182,24 @@ ShareTray::ShareTray() snTerm = new QSocketNotifier(sigtermFd[1], QSocketNotifier::Read, this); connect(snTerm, SIGNAL(activated(int)), this, SLOT(handleSigTerm())); - QTimer *timer = new QTimer ( this ); - connect ( timer, SIGNAL ( timeout() ), this, SLOT ( slotTimer() ) ); - timer->start ( 5000 ); - loadSettings(); - setTrayIcon(); - trayIcon->show(); + QTimer *timer = new QTimer ( this ); + connect ( timer, SIGNAL ( timeout() ), this, SLOT ( slotTimer() ) ); + timer->start ( 5000 ); + loadSettings(); + setTrayIcon(); + trayIcon->show(); } ShareTray::~ShareTray() { - qDebug() <<"stopping desktop sharing"; - slotStopSharing(); - if ( QFile::exists ( lockFname ) ) - QFile::remove ( lockFname ); - qDebug() <<"lock file removed"; - saveSettings(); - qDebug() <<"settings saved"; + qDebug() <<"stopping desktop sharing"; + slotStopSharing(); + if ( QFile::exists ( lockFname ) ) + QFile::remove ( lockFname ); + qDebug() <<"lock file removed"; + saveSettings(); + qDebug() <<"settings saved"; } void ShareTray::handleSigKeybInt() @@ -241,368 +240,366 @@ void ShareTray::termSignalHandler(int) void ShareTray::slotStopSharing() { - if ( serverSocket ) - { - serverSocket->close(); - delete serverSocket; - serverSocket=0l; - } - if ( QFile::exists ( socketFname ) ) - QFile::remove ( socketFname ); - for ( int i=menu->actions().count()-STAT_ACT_COUNT-1;i>=0;--i ) - { - slotCloseConnection ( ( AccessAction* ) ( menu->actions() [i] ) ); - } - actStop->setEnabled ( false ); - actStart->setEnabled ( true ); - setTrayIcon(); + if ( serverSocket ) + { + serverSocket->close(); + delete serverSocket; + serverSocket=0l; + } + if ( QFile::exists ( socketFname ) ) + QFile::remove ( socketFname ); + for ( int i=menu->actions().count()-STAT_ACT_COUNT-1;i>=0;--i ) + { + slotCloseConnection ( ( AccessAction* ) ( menu->actions() [i] ) ); + } + actStop->setEnabled ( false ); + actStart->setEnabled ( true ); + setTrayIcon(); } void ShareTray::slotStartSharing() { - actStop->setEnabled ( true ); - actStart->setEnabled ( false ); - if ( serverSocket ) - delete serverSocket; - if ( QFile::exists ( socketFname ) ) - QFile::remove ( socketFname ); - serverSocket=new QLocalServer ( this ); - if ( serverSocket->listen ( socketFname ) ) - { - - chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid ); - QFile::setPermissions ( socketFname, - QFile::ReadOwner|QFile::WriteOwner|QFile::ReadGroup|QFile::WriteGroup ); - connect ( serverSocket,SIGNAL ( newConnection() ), - this,SLOT ( slotServerConnection() ) ); - } - else - { - QString message= - tr ( - "Can't listen on socket:" ) + socketFname; - QMessageBox::critical ( 0l,tr ( - "Error" ),message, - QMessageBox::Ok, - QMessageBox::NoButton ); - close(); - } - setTrayIcon(); + actStop->setEnabled ( true ); + actStart->setEnabled ( false ); + if ( serverSocket ) + delete serverSocket; + if ( QFile::exists ( socketFname ) ) + QFile::remove ( socketFname ); + serverSocket=new QLocalServer ( this ); + if ( serverSocket->listen ( socketFname ) ) + { + + chown ( socketFname.toAscii(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid ); + QFile::setPermissions ( socketFname, + QFile::ReadOwner|QFile::WriteOwner|QFile::ReadGroup|QFile::WriteGroup ); + connect ( serverSocket,SIGNAL ( newConnection() ), + this,SLOT ( slotServerConnection() ) ); + } + else + { + QString message= + tr ( + "Can't listen on socket:" ) + socketFname; + QMessageBox::critical ( 0l,tr ( + "Error" ),message, + QMessageBox::Ok, + QMessageBox::NoButton ); + close(); + } + setTrayIcon(); } bool ShareTray::acceptConnections() { - return actStop->isEnabled(); + return actStop->isEnabled(); } QString ShareTray::getSocketAnswer ( QString message ) { - qDebug() <<"message: "<<message; - QStringList lst=message.split ( ' ' ); - if ( lst.size() !=11 ) - { - qDebug() <<"wrong parameters"; - return "DENY"; - } - QStringList params=lst[9].split ( "XSHAD" ); - if ( params.size() !=3 ) - { - qDebug() <<"wrong parameters"; - return "DENY"; - } - QString client=lst[0]; - QString user=params[1]; - QString remote_user=lst[10]; - if ( getAccess ( remote_user, client ) ==QMessageBox::Yes ) - { - trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) ); - //start agent - QProcess proc ( this ); - lst.removeAt ( 10 );; - lst.removeAt ( 0 );; - proc.start ( "x2gostartagent",lst ); - if ( !proc.waitForFinished ( 5000 ) ) - { - return "DENY"; - } - else - { - QString output=proc.readAllStandardOutput(); - qDebug() <<"agent out: "<<output; - QStringList lines=output.split ( "\n" ); - QString pid="pid"; - if ( lines.size() >3 ) - pid=lines[2]; - qDebug() <<"agent pid: "<<pid; - AccessAction *act=new AccessAction ( - pid,remote_user,client, - QString ( tr ( "Disconnect %1(%2)" ) ).arg ( remote_user ).arg ( client ), - this ); - menu->insertAction ( menu->actions() [0],act ); - connect ( act,SIGNAL ( actionActivated ( AccessAction* ) ),this, - SLOT ( slotCloseConnection ( AccessAction* ) ) ); - trayMessage ( tr ( "Remote connection" ), - QString ( - tr ( "%1(%2) connected" ) ).arg ( remote_user ).arg ( client ) ); - setTrayIcon(); - return output; - } - } - trayMessage ( tr ( "Access denied" ),QString ( - tr ( "%1(%2): access denied" ) ).arg ( remote_user ).arg ( client ) ); - return "DENY"; + qDebug() <<"message: "<<message; + QStringList lst=message.split ( ' ' ); + if ( lst.size() !=11 ) + { + qDebug() <<"wrong parameters"; + return "DENY"; + } + QStringList params=lst[9].split ( "XSHAD" ); + if ( params.size() !=3 ) + { + qDebug() <<"wrong parameters"; + return "DENY"; + } + QString client=lst[0]; + QString user=params[1]; + QString remote_user=lst[10]; + if ( getAccess ( remote_user, client ) ==QMessageBox::Yes ) + { + trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) ); + //start agent + QProcess proc ( this ); + lst.removeAt ( 10 );; + lst.removeAt ( 0 );; + proc.start ( "x2gostartagent",lst ); + if ( !proc.waitForFinished ( 5000 ) ) + { + return "DENY"; + } + else + { + QString output=proc.readAllStandardOutput(); + qDebug() <<"agent out: "<<output; + QStringList lines=output.split ( "\n" ); + QString pid="pid"; + if ( lines.size() >3 ) + pid=lines[2]; + qDebug() <<"agent pid: "<<pid; + AccessAction *act=new AccessAction ( + pid,remote_user,client, + QString ( tr ( "Disconnect %1(%2)" ) ).arg ( remote_user ).arg ( client ), + this ); + menu->insertAction ( menu->actions() [0],act ); + connect ( act,SIGNAL ( actionActivated ( AccessAction* ) ),this, + SLOT ( slotCloseConnection ( AccessAction* ) ) ); + trayMessage ( tr ( "Remote connection" ), + QString ( + tr ( "%1(%2) connected" ) ).arg ( remote_user ).arg ( client ) ); + setTrayIcon(); + return output; + } + } + trayMessage ( tr ( "Access denied" ),QString ( + tr ( "%1(%2): access denied" ) ).arg ( remote_user ).arg ( client ) ); + return "DENY"; } void ShareTray::closeSocket ( SimpleLocalSocket* sock ) { - qDebug() <<"closing null socket"; - if ( sock ) - { - qDebug() <<"closing socket"; - delete sock; - qDebug() <<"done"; - } + qDebug() <<"closing null socket"; + if ( sock ) + { + qDebug() <<"closing socket"; + delete sock; + qDebug() <<"done"; + } } void ShareTray::slotServerConnection() { - new SimpleLocalSocket ( this,serverSocket->nextPendingConnection() ); + new SimpleLocalSocket ( this,serverSocket->nextPendingConnection() ); } void ShareTray::slotCloseConnection ( AccessAction* action ) { - kill ( action->pid().toUInt(),15 ); - menu->removeAction ( action ); - delete action; - setTrayIcon(); + kill ( action->pid().toUInt(),15 ); + menu->removeAction ( action ); + delete action; + setTrayIcon(); } int ShareTray::getAccess ( QString remote_user, QString host ) { - if ( whiteList.contains ( remote_user ) ) - return QMessageBox::Yes; - if ( blackList.contains ( remote_user ) ) - return QMessageBox::No; - - MessageBox m ( remote_user, host, this ); - m.activateWindow(); - m.raise(); - int res=m.exec(); - if ( m.isChecked() &&res==QMessageBox::Yes ) - whiteList<<remote_user; - if ( m.isChecked() &&res==QMessageBox::No ) - blackList<<remote_user; - actBlack->setEnabled ( blackList.size() >0 ); - actWhite->setEnabled ( whiteList.size() >0 ); - return res; + if ( whiteList.contains ( remote_user ) ) + return QMessageBox::Yes; + if ( blackList.contains ( remote_user ) ) + return QMessageBox::No; + + MessageBox m ( remote_user, host, this ); + m.activateWindow(); + m.raise(); + int res=m.exec(); + if ( m.isChecked() &&res==QMessageBox::Yes ) + whiteList<<remote_user; + if ( m.isChecked() &&res==QMessageBox::No ) + blackList<<remote_user; + actBlack->setEnabled ( blackList.size() >0 ); + actWhite->setEnabled ( whiteList.size() >0 ); + return res; } void ShareTray::closeEvent ( QCloseEvent* ev ) { - if ( !menuClose ) - { - ev->ignore(); - hide(); - return; - } - qDebug() <<"stopping desktop sharing"; - slotStopSharing(); - if ( QFile::exists ( lockFname ) ) - QFile::remove ( lockFname ); - qDebug() <<"lock file removed"; - saveSettings(); - qDebug() <<"settings saved"; + if ( !menuClose ) + { + ev->ignore(); + hide(); + return; + } + qDebug() <<"stopping desktop sharing"; + slotStopSharing(); + if ( QFile::exists ( lockFname ) ) + QFile::remove ( lockFname ); + qDebug() <<"lock file removed"; + saveSettings(); + qDebug() <<"settings saved"; } void ShareTray::slotTimer() { - for ( int i=menu->actions().count()-STAT_ACT_COUNT-1;i>=0;--i ) - { - AccessAction* action= ( AccessAction* ) ( menu->actions() [i] ); - if ( !isProcessRunning ( action->pid() ) ) - { - trayMessage ( tr ( "User disconnected" ), - QString ( - tr ( "%1(%2) disconnected" ) ).arg ( - action->user() ).arg ( action->host() ) ); - menu->removeAction ( action ); - delete action; - } - } - setTrayIcon(); + for ( int i=menu->actions().count()-STAT_ACT_COUNT-1;i>=0;--i ) + { + AccessAction* action= ( AccessAction* ) ( menu->actions() [i] ); + if ( !isProcessRunning ( action->pid() ) ) + { + trayMessage ( tr ( "User disconnected" ), + QString ( + tr ( "%1(%2) disconnected" ) ).arg ( + action->user() ).arg ( action->host() ) ); + menu->removeAction ( action ); + delete action; + } + } + setTrayIcon(); } void ShareTray::trayMessage ( QString title, QString text ) { - if ( !QSystemTrayIcon::supportsMessages () ) - QToolTip::showText ( geometry().topLeft(), - text ); - else - trayIcon->showMessage ( title,text ); + if ( !QSystemTrayIcon::supportsMessages () ) + QToolTip::showText ( geometry().topLeft(), + text ); + else + trayIcon->showMessage ( title,text ); } bool ShareTray::isProcessRunning ( QString pid ) { - if ( kill ( pid.toInt(),SIGCONT ) ==-1 ) - { - if ( errno==ESRCH ) - { - return false; - } - } - return true; + if ( kill ( pid.toInt(),SIGCONT ) ==-1 ) + { + if ( errno==ESRCH ) + { + return false; + } + } + return true; } void ShareTray::slotBlackList() { - current_list=BLACK; - showList(); - setWindowTitle ( tr ( "Banned users" ) ); - + current_list=BLACK; + showList(); + setWindowTitle ( tr ( "Banned users" ) ); } void ShareTray::slotWhiteList() { - current_list=WHITE; - showList(); - setWindowTitle ( tr ( "Granted users" ) ); - + current_list=WHITE; + showList(); + setWindowTitle ( tr ( "Granted users" ) ); } void ShareTray::showList() { - show(); - ui.ok_cancel_box->show(); - ui.box->show(); - ui.del->show(); - - ui.close_box->hide(); - ui.icon->hide(); - ui.text->hide(); - - QStringList* lst; - if ( current_list==BLACK ) - lst=&blackList; - else - lst=&whiteList; - lst->sort(); - ui.box->clear(); - ui.box->insertItems ( 0,*lst ); + show(); + ui.ok_cancel_box->show(); + ui.box->show(); + ui.del->show(); + + ui.close_box->hide(); + ui.icon->hide(); + ui.text->hide(); + + QStringList* lst; + if ( current_list==BLACK ) + lst=&blackList; + else + lst=&whiteList; + lst->sort(); + ui.box->clear(); + ui.box->insertItems ( 0,*lst ); } void ShareTray::loadSettings() { - QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", - QSettings::NativeFormat ); + QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", + QSettings::NativeFormat ); - blackList= st.value ( "blacklist" ).toStringList(); - whiteList= st.value ( "whitelist" ).toStringList(); + blackList= st.value ( "blacklist" ).toStringList(); + whiteList= st.value ( "whitelist" ).toStringList(); - actBlack->setEnabled ( blackList.size() >0 ); - actWhite->setEnabled ( whiteList.size() >0 ); + actBlack->setEnabled ( blackList.size() >0 ); + actWhite->setEnabled ( whiteList.size() >0 ); } void ShareTray::saveSettings() { - QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", - QSettings::NativeFormat ); + QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", + QSettings::NativeFormat ); - st.setValue ( "blacklist",blackList ); - st.setValue ( "whitelist",whiteList ); + st.setValue ( "blacklist",blackList ); + st.setValue ( "whitelist",whiteList ); } void ShareTray::setTrayIcon() { - if ( !acceptConnections() ) - { - trayIcon->setIcon ( QIcon ( ":icons/22x22/discard.png" ) ); - return; - } - if ( menu->actions().count() >STAT_ACT_COUNT ) - { - trayIcon->setIcon ( QIcon ( ":icons/22x22/view.png" ) ); - return; - } - trayIcon->setIcon ( QIcon ( ":icons/22x22/accept.png" ) ); + if ( !acceptConnections() ) + { + trayIcon->setIcon ( QIcon ( ":icons/22x22/discard.png" ) ); + return; + } + if ( menu->actions().count() >STAT_ACT_COUNT ) + { + trayIcon->setIcon ( QIcon ( ":icons/22x22/view.png" ) ); + return; + } + trayIcon->setIcon ( QIcon ( ":icons/22x22/accept.png" ) ); } void ShareTray::slotAbout() { - setWindowTitle ( tr ( "X2Go Desktop Sharing" ) ); + setWindowTitle ( tr ( "X2Go Desktop Sharing" ) ); - show(); - ui.ok_cancel_box->hide(); - ui.box->hide(); - ui.del->hide(); + show(); + ui.ok_cancel_box->hide(); + ui.box->hide(); + ui.del->hide(); - ui.close_box->show(); - ui.icon->show(); - ui.text->show(); + ui.close_box->show(); + ui.icon->show(); + ui.text->show(); } void ShareTray::slotAboutQt() { - QMessageBox::aboutQt ( 0 ); + QMessageBox::aboutQt ( 0 ); } void ShareTray::slotMsgOkCancel ( QAbstractButton* button ) { - if ( ui.ok_cancel_box->buttonRole ( button ) ==QDialogButtonBox::AcceptRole ) - { - QStringList* lst; - if ( current_list==BLACK ) - lst=&blackList; - else - lst=&whiteList; - lst->clear(); - for ( int i=ui.box->count()-1;i>=0;--i ) - { - *lst<<ui.box->item ( i )->text(); - } - } - actBlack->setEnabled ( blackList.size() >0 ); - actWhite->setEnabled ( whiteList.size() >0 ); - hide(); + if ( ui.ok_cancel_box->buttonRole ( button ) ==QDialogButtonBox::AcceptRole ) + { + QStringList* lst; + if ( current_list==BLACK ) + lst=&blackList; + else + lst=&whiteList; + lst->clear(); + for ( int i=ui.box->count()-1;i>=0;--i ) + { + *lst<<ui.box->item ( i )->text(); + } + } + actBlack->setEnabled ( blackList.size() >0 ); + actWhite->setEnabled ( whiteList.size() >0 ); + hide(); } void ShareTray::slotMsgClose ( QAbstractButton* ) { - hide(); + hide(); } void ShareTray::slotDelListItem() { - for ( int i=ui.box->count()-1;i>=0;--i ) - { - QListWidgetItem* it=ui.box->item ( i ); - if ( it->isSelected() ) - { - ui.box->takeItem ( i ); - delete it; - } - } + for ( int i=ui.box->count()-1;i>=0;--i ) + { + QListWidgetItem* it=ui.box->item ( i ); + if ( it->isSelected() ) + { + ui.box->takeItem ( i ); + delete it; + } + } } void ShareTray::slotMenuClose() { - menuClose=true; - close(); + menuClose=true; + close(); } void ShareTray::slotUpdateLockFile() { - QFile file ( lockFname ); - if ( file.open ( QIODevice::WriteOnly | QIODevice::Text ) ) - { - QTextStream out ( &file ); - out<<QDateTime::currentDateTime().toTime_t(); - } + QFile file ( lockFname ); + if ( file.open ( QIODevice::WriteOnly | QIODevice::Text ) ) + { + QTextStream out ( &file ); + out<<QDateTime::currentDateTime().toTime_t(); + } } hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

x2godesktopsharing.git - master (branch) updated: 3.0.1.2-15-gcf35615
by git-admin＠x2go.org 28 Sep '11

28 Sep '11

The branch, master has been updated via cf356157e83da59220ab7af3c8bb71f722b3e754 (commit) via 619fa9d40858791b1bf98754ed110c606c634005 (commit) via a17eb04222eac5aee009924f004df2ad6342eb34 (commit) from 37b57f64cab0f715aae80056a5c0053eafb3390d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cf356157e83da59220ab7af3c8bb71f722b3e754 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 14:21:46 2011 +0200 Add signal handler so that unix signals can be handled within Qt. commit 619fa9d40858791b1bf98754ed110c606c634005 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 13:11:00 2011 +0200 add debug code commit a17eb04222eac5aee009924f004df2ad6342eb34 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Sep 28 12:44:08 2011 +0200 tab'ified main.cpp ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + main.cpp | 197 ++++++++++++++++++++++++++++++------------------------ sharetray.cpp | 63 ++++++++++++++++- sharetray.h | 25 ++++++-- 4 files changed, 190 insertions(+), 96 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5967ad9..906ed53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ x2godesktopsharing (3.0.1.3-0~x2go1) UNRELEASED; urgency=low of group x2godesktopsharing. - Differentiate between local and remote user, fixes display of wrong user name for remote user. + - Add signal handler so that unix signals can be handled within Qt. Depend on x2goserver (>=3.0.99.6). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 13 Jun 2011 20:39:33 +0200 diff --git a/main.cpp b/main.cpp index 7917c66..fa54d3d 100644 --- a/main.cpp +++ b/main.cpp @@ -26,102 +26,123 @@ #include <QLocalSocket> #include <iostream> #include <QDir> - +#include <csignal> using namespace std; void client ( const QStringList & cmd ) { - if ( cmd.size() !=11 ) - { - cerr<<"wrong parameters"<<endl; - cout<<"DENY"; - return; - } - QStringList params=cmd[9].split ( "XSHAD" ); - if ( params.size() !=3 ) - { - cerr<<"wrong parameters"<<endl; - cout<<"DENY"; - return; - } - - cerr<<"starting x2godesktopsharing in client mode, cmd: "<< - cmd.join(" ").toAscii().data() <<std::endl; - - QString dispname=params[2]; - QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ - params[1]+"@"+dispname; - QLocalSocket sock; - sock.connectToServer ( socketName ); - if ( !sock.waitForConnected ( 3000 ) ) - { - QString message="Unable to connect: " +socketName; - cout<<"DENY"; - cerr<<message.toAscii().data() <<endl; - return; - } - sock.write ( cmd.join(" ").toAscii().data(),cmd.join(" ").toAscii().length() ); - if ( !sock.waitForReadyRead() ) - { - cout<<"DENY"; - cerr<<"Cannot write to socket: "<<socketName.toAscii().data() <<endl; - return;; - } - char buffer[256]; - int read=sock.read ( buffer,255 ); - if ( read<=0 ) - { - cout<<"DENY"; - cerr<<"Cannot read from socket: " <<socketName.toAscii().data() <<endl; - return; - } - buffer[read]=0; - cout<<buffer<<endl; + if ( cmd.size() !=11 ) + { + cerr<<"wrong parameters"<<endl; + cout<<"DENY"; + return; + } + QStringList params=cmd[9].split ( "XSHAD" ); + if ( params.size() !=3 ) + { + cerr<<"wrong parameters"<<endl; + cout<<"DENY"; + return; + } + + cerr<<"starting x2godesktopsharing in client mode, cmd: "<< + cmd.join(" ").toAscii().data() <<std::endl; + + QString dispname=params[2]; + QString socketName=QDir::tempPath() +"/x2godesktopsharing_@"+ + params[1]+"@"+dispname; + QLocalSocket sock; + sock.connectToServer ( socketName ); + if ( !sock.waitForConnected ( 3000 ) ) + { + QString message="Unable to connect: " +socketName; + cout<<"DENY"; + cerr<<message.toAscii().data() <<endl; + return; + } + sock.write ( cmd.join(" ").toAscii().data(),cmd.join(" ").toAscii().length() ); + if ( !sock.waitForReadyRead() ) + { + cout<<"DENY"; + cerr<<"Cannot write to socket: "<<socketName.toAscii().data() <<endl; + return;; + } + char buffer[256]; + int read=sock.read ( buffer,255 ); + if ( read<=0 ) + { + cout<<"DENY"; + cerr<<"Cannot read from socket: " <<socketName.toAscii().data() <<endl; + return; + } + buffer[read]=0; + cout<<buffer<<endl; +} + +static int setup_unix_signal_handlers() +{ + struct sigaction keybint, term; + + keybint.sa_handler = ShareTray::keybintSignalHandler; + sigemptyset(&keybint.sa_mask); + keybint.sa_flags = 0; + keybint.sa_flags |= SA_RESTART; + + if (sigaction(SIGINT, &keybint, 0) > 0) + return 1; + + term.sa_handler = ShareTray::termSignalHandler; + sigemptyset(&term.sa_mask); + term.sa_flags |= SA_RESTART; + + if (sigaction(SIGTERM, &term, 0) > 0) + return 2; + + return 0; } int main ( int argc, char *argv[] ) { - if ( argc>2 ) - { - QString par=argv[1]; - if ( par == "client" ) - { - QStringList cmdl; - for ( int i=2; i<argc;++i ) - cmdl<<argv[i]; - client ( cmdl ); - return 0; - } - } - - QApplication app ( argc,argv ); - QTranslator translator; - QString filename=QString ( ":/x2godesktopsharing_%1" ).arg ( - QLocale::system().name() ); - filename=filename.toLower(); - if ( !translator.load ( filename ) ) - { - qDebug ( "Can't load translator (%s) !\n", - filename.toLocal8Bit().data() ); - } - else - app.installTranslator ( &translator ); - - - QTranslator qtTranslator; - filename=QString ( ":/qt_%1" ).arg ( QLocale::system().name() ); - if ( !qtTranslator.load ( filename ) ) - { - qDebug ( "Can't load translator (%s) !\n", - filename.toLocal8Bit().data() ); - } - else - app.installTranslator ( &qtTranslator ); - ShareTray* tray=new ShareTray; - tray->hide(); - - - return app.exec(); + if ( argc>2 ) + { + QString par=argv[1]; + if ( par == "client" ) + { + QStringList cmdl; + for ( int i=2; i<argc;++i ) + cmdl<<argv[i]; + client ( cmdl ); + return 0; + } + } + + QApplication app ( argc,argv ); + QTranslator translator; + QString filename=QString ( ":/x2godesktopsharing_%1" ).arg ( + QLocale::system().name() ); + filename=filename.toLower(); + if ( !translator.load ( filename ) ) + { + qDebug ( "Can't load translator (%s) !\n", + filename.toLocal8Bit().data() ); + } + else + app.installTranslator ( &translator ); + + QTranslator qtTranslator; + filename=QString ( ":/qt_%1" ).arg ( QLocale::system().name() ); + if ( !qtTranslator.load ( filename ) ) + { + qDebug ( "Can't load translator (%s) !\n", + filename.toLocal8Bit().data() ); + } + else + app.installTranslator ( &qtTranslator ); + + ShareTray* tray=new ShareTray; + tray->hide(); + setup_unix_signal_handlers(); + return app.exec(); } diff --git a/sharetray.cpp b/sharetray.cpp index df08bf5..56a785c 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -17,10 +17,12 @@ #include <QDir> #include <QtDebug> #include <QMessageBox> +#include <QSocketNotifier> +#include <sys/socket.h> #include "simplelocalsocket.h" #include "accessaction.h" #include <sys/types.h> -#include <signal.h> +#include <csignal> #include <errno.h> #include <QToolTip> #include <QTimer> @@ -35,6 +37,10 @@ #define VERSION "3.0.1.3" +//needed to not get an undefined reference to static members +int ShareTray::sigkeybintFd[2]; +int ShareTray::sigtermFd[2]; + ShareTray::ShareTray() : QMainWindow() { @@ -165,6 +171,18 @@ ShareTray::ShareTray() actStop->setEnabled ( false ); + // unix signals (TERM, INT) are piped into a unix socket and will raise Qt events + if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigkeybintFd)) + qFatal("Couldn't create keyboard INT socketpair"); + + if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd)) + qFatal("Couldn't create TERM socketpair"); + + snKeybInt = new QSocketNotifier(sigkeybintFd[1], QSocketNotifier::Read, this); + connect(snKeybInt, SIGNAL(activated(int)), this, SLOT(handleSigKeybInt())); + snTerm = new QSocketNotifier(sigtermFd[1], QSocketNotifier::Read, this); + connect(snTerm, SIGNAL(activated(int)), this, SLOT(handleSigTerm())); + QTimer *timer = new QTimer ( this ); connect ( timer, SIGNAL ( timeout() ), this, SLOT ( slotTimer() ) ); timer->start ( 5000 ); @@ -176,12 +194,50 @@ ShareTray::ShareTray() ShareTray::~ShareTray() { + qDebug() <<"stopping desktop sharing"; slotStopSharing(); if ( QFile::exists ( lockFname ) ) QFile::remove ( lockFname ); + qDebug() <<"lock file removed"; saveSettings(); + qDebug() <<"settings saved"; } +void ShareTray::handleSigKeybInt() +{ + snKeybInt->setEnabled(false); + char tmp; + ::read(sigkeybintFd[1], &tmp, sizeof(tmp)); + + // do Qt stuff here + slotMenuClose(); + + snKeybInt->setEnabled(true); +} + +void ShareTray::handleSigTerm() +{ + snTerm->setEnabled(false); + char tmp; + ::read(sigtermFd[1], &tmp, sizeof(tmp)); + + // do Qt stuff here + slotMenuClose(); + + snTerm->setEnabled(true); +} + +void ShareTray::keybintSignalHandler(int) +{ + char a = 1; + ::write(sigkeybintFd[0], &a, sizeof(a)); +} + +void ShareTray::termSignalHandler(int) +{ + char a = 1; + ::write(sigtermFd[0], &a, sizeof(a)); +} void ShareTray::slotStopSharing() { @@ -351,10 +407,13 @@ void ShareTray::closeEvent ( QCloseEvent* ev ) hide(); return; } + qDebug() <<"stopping desktop sharing"; slotStopSharing(); if ( QFile::exists ( lockFname ) ) QFile::remove ( lockFname ); + qDebug() <<"lock file removed"; saveSettings(); + qDebug() <<"settings saved"; } void ShareTray::slotTimer() @@ -538,8 +597,6 @@ void ShareTray::slotMenuClose() close(); } - - void ShareTray::slotUpdateLockFile() { QFile file ( lockFname ); diff --git a/sharetray.h b/sharetray.h index 137ba61..d2c2531 100644 --- a/sharetray.h +++ b/sharetray.h @@ -22,6 +22,7 @@ class AccessAction; class QSystemTrayIcon; class MessageBox; class QAction; +class QSocketNotifier; /** @author Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> @@ -30,11 +31,16 @@ class ShareTray : public QMainWindow { Q_OBJECT public: - ShareTray(); - ~ShareTray(); - QString getSocketAnswer(QString message); - void closeSocket(SimpleLocalSocket* sock); - bool acceptConnections(); + ShareTray(); + ~ShareTray(); + // Unix signal handlers. + static void keybintSignalHandler(int unused); + static void termSignalHandler(int unused); + // desktop sharing socket + QString getSocketAnswer(QString message); + void closeSocket(SimpleLocalSocket* sock); + // entry point for incoming connections + bool acceptConnections(); private: enum {BLACK,WHITE} current_list; QMenu* menu; @@ -55,6 +61,10 @@ private: protected: void closeEvent ( QCloseEvent* event ); +public slots: + // Qt signal handlers. + void handleSigKeybInt(); + void handleSigTerm(); private slots: void slotStopSharing(); void slotStartSharing(); @@ -78,6 +88,11 @@ private: void saveSettings(); void setTrayIcon(); void showList(); + // unix file sockets for signal handler communication (unix <-> Qt) + static int sigkeybintFd[2]; + static int sigtermFd[2]; + QSocketNotifier *snKeybInt; + QSocketNotifier *snTerm; }; #endif hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing for X2go) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2godesktopsharing.git" (Desktop Sharing for X2go).

1 0

← Newer
1
2
3
4
5
6
7
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2011