x2go-commits September 2011

x2go-commits@lists.x2go.org

1 participants
268 discussions

nxcomp.git - upstream (branch) updated: upstream/3.5.0-1-1-g447a08c
by git-admin＠x2go.org 30 Sep '11

30 Sep '11

The branch, upstream has been updated via 447a08c0e8540b34704abbff0126f3f4875d29d8 (commit) from f01fa8f0ac73c86195391bfcded155176354e25a (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 447a08c0e8540b34704abbff0126f3f4875d29d8 Author: Oleksandr Shneyder <oleksandr.shneyder(a)… [View More]

1 0

nxcomp.git - master (branch) updated: 3.5.0-1-1-g33c85f1
by git-admin＠x2go.org 30 Sep '11

30 Sep '11

The branch, master has been updated via 33c85f1f71c4272f98ef8377122a8b4fcd1537c6 (commit) from 9b101cdb548e24c1ef85317ff1e0d828c22cf881 (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 33c85f1f71c4272f98ef8377122a8b4fcd1537c6 Author: Oleksandr Shneyder <oleksandr.shneyder(a)… [View More]treuchtlingen.de> Date: Fri Sep 30 15:05:57 2011 +0200 New upstream version ----------------------------------------------------------------------- Summary of changes: CHANGELOG | 4 ++++ Proxy.cpp | 17 +++++++++++++++++ debian/changelog | 7 +++++++ 3 files changed, 28 insertions(+), 0 deletions(-) mode change 100755 => 100644 debian/rules The diff of changes is: diff --git a/CHANGELOG b/CHANGELOG index df10c85..b7ef0d9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,9 @@ ChangeLog: +nxcomp-3.5.0-2 + +- Fixed TR11H02398. Solved a race condition when creating channels. + nxcomp-3.5.0-1 - Opened the 3.5.0 branch based on nxcomp-3.4.0-7. diff --git a/Proxy.cpp b/Proxy.cpp index f88259f..3b4df7e 100644 --- a/Proxy.cpp +++ b/Proxy.cpp @@ -1626,6 +1626,23 @@ int Proxy::handleControlFromProxy(const unsigned char *message) int channelId = *(message + 2); // + // Check if the channel has been dropped. + // + + if (channels_[channelId] != NULL && + (channels_[channelId] -> getDrop() == 1 || + channels_[channelId] -> getClosing() == 1)) + { + #ifdef TEST + *logofs << "Proxy: Dropping the descriptor FD#" + << getFd(channelId) << " channel ID#" + << channelId << ".\n" << logofs_flush; + #endif + + handleDrop(channelId); + } + + // // Check if the channel is in the valid // range. // diff --git a/debian/changelog b/debian/changelog index c655982..d74b58e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nxcomp (3.5.0-2-0~x2go1) UNRELEASED; urgency=low + + [ Oleksandr Shneyder ] + * New upstream version + + -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Fri, 30 Sep 2011 15:02:59 +0200 + nxcomp (3.5.0-1-0~x2go2) unstable; urgency=low [ Reinhard Tartler ] diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 hooks/post-receive -- nxcomp.git (NX comp library) 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 "nxcomp.git" (NX comp library). [View Less]

1 0

nxcomp.git - master (branch) updated: 3.4.0.8-16-g9b101cd
by git-admin＠x2go.org 30 Sep '11

30 Sep '11

The branch, master has been updated via 9b101cdb548e24c1ef85317ff1e0d828c22cf881 (commit) from 876aca68c9793fed59da450c85ad31edad61b56a (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 9b101cdb548e24c1ef85317ff1e0d828c22cf881 Author: Oleksandr Shneyder <oleksandr.shneyder(a)… [View More]

1 0

pinentry-x2go.git - master (branch) updated: 0.7.5.0-5-g0ad6ab3
by git-admin＠x2go.org 30 Sep '11

30 Sep '11

The branch, master has been updated via 0ad6ab3032675318094db7a91f5cfc90086ab7ee (commit) from 5211f3a90760a40ede5c0062b19fdde123058ae8 (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 0ad6ab3032675318094db7a91f5cfc90086ab7ee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-330-g0cc9122
by git-admin＠x2go.org 30 Sep '11

30 Sep '11

The branch, master has been updated via 0cc91226797b9ceb25b9961c664f015eb947a006 (commit) from 92047718334612a8ad2b9edbc01fddf2d6cef6b5 (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 0cc91226797b9ceb25b9961c664f015eb947a006 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-329-g9204771
by git-admin＠x2go.org 30 Sep '11

30 Sep '11

The branch, master has been updated via 92047718334612a8ad2b9edbc01fddf2d6cef6b5 (commit) from 476ccd664dc6541eecf5c0622a8cf8888f150bd0 (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 92047718334612a8ad2b9edbc01fddf2d6cef6b5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-328-g476ccd6
by git-admin＠x2go.org 30 Sep '11

30 Sep '11

The branch, master has been updated via 476ccd664dc6541eecf5c0622a8cf8888f150bd0 (commit) via 1e92e3caaf6e134fec90cca2959787edeccb338a (commit) from b232c13e3c724b0071e5d98ebc8aff645017c0d7 (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 476ccd664dc6541eecf5c0622a8cf8888f150bd0 … [View More]Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 30 09:11:34 2011 +0200 Make digits at the beginning of X2go server extension scripts a must, not a suggestion. Contributed by Morty. commit 1e92e3caaf6e134fec90cca2959787edeccb338a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Sep 30 08:54:16 2011 +0200 X2go server extensions have to completely quiet, diverting stdout/stderr to /dev/null. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ .../bin/x2goserver-run-extensions | 4 ++-- .../man/man8/x2goserver-run-extensions.8 | 15 +++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 51bf9c8..ce61352 100644 --- a/debian/changelog +++ b/debian/changelog @@ -106,6 +106,12 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low * Adapt to renaming of x2godesktopsharing scripts. * Provide man page for x2goserver-run-extensions that explains the new plug-in mechanism of x2goserver. + * X2go server extensions have to completely quiet, diverting stdout/stderr to + /dev/null. + + [ Moritz Strübe ] + * Make digits at the beginning of X2go server extension scripts a must, not a + suggestion. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index f938171..9c309d8 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -31,9 +31,9 @@ X2GO_SESSION=$1 X2GO_MODALITY=$2 # scan extensions and execute them -ls $X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/* | sort | while read x2go_extension; do +ls $X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/* | egrep "^[0-9]{3}_[:alnum:]+" | sort | while read x2go_extension; do $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" - $x2go_extension $X2GO_SESSION && { + $x2go_extension $X2GO_SESSION &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully" } || { $X2GO_LIB_PATH/x2gosyslog "$0" "warn" "$x2go_extension$(basename $0) for session $X2GO_SESSION returned a non-zero exit code, continuing..." diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 index 1bb6b46..2a5ad19 100644 --- a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -66,14 +66,17 @@ The following table shows the available modalities, the calling scripts and the fail-terminate extensions/fail-terminate.d/ \fIIMPORTANT:\fR When providing X2go Server extensions by this mechanism, please pretty well make sure that these extension scripts of yours that you place -in either of the above folders do under no circumstance fail during execution. +in either of the above folders do under no circumstance fail during execution. Return codes are ignored and failures are therefore not (yet) propagated. .SH EXECUTION OF EXTENSIONS Scripts (or binaries) that have been placed into one of the pre/post/fail modality folders (see above) are executed in alpha-numerical sorting order. -So best practice probably is prepending extension file names with digits to make sure they get executed in the wanted order: - - 0010_x2goserver-statistics - 0020_x2goserver-mail-notify - 0021_x2goserver-monitoring +.PP +Extensions will only get executed if their file names start with three digits. +This restriction is there to make sure that X2go Server extensions get executed in the correct/wanted order: +.PP +For example: + 010_x2goserver-statistics + 020_x2goserver-mail-notify + 021_x2goserver-monitoring etc.pp. .SH RETURN VALUES As exitcode \fBx2goserver-run-extensions\fR always returns 0 and pretends to be permanently happy :-). 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). [View Less]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-326-gb232c13
by git-admin＠x2go.org 30 Sep '11

30 Sep '11

The branch, master has been updated via b232c13e3c724b0071e5d98ebc8aff645017c0d7 (commit) from 5b22e17c13c76b133db6d6891b831a2d7b2a6709 (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 b232c13e3c724b0071e5d98ebc8aff645017c0d7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-325-g5b22e17
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via 5b22e17c13c76b133db6d6891b831a2d7b2a6709 (commit) from 752b012f49930a86ed9f7555a049cfd17312c291 (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 5b22e17c13c76b133db6d6891b831a2d7b2a6709 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Thu Sep 29 23:06:57 2011 +0200 Provide man page for x2goserver-run-extensions that explains the new plug-in mechanism of x2goserver. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 + .../man/man8/x2goserver-run-extensions.8 | 77 ++++++++++++++++++++ 2 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 x2goserver-extensions/man/man8/x2goserver-run-extensions.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e881700..51bf9c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -104,6 +104,8 @@ x2goserver (3.0.99.6-0~x2go1) UNRELEASED; urgency=low * Provide pluggable X2go extension system for main X2go server functions. * Adapt to renaming of x2godesktopsharing scripts. + * Provide man page for x2goserver-run-extensions that explains the new plug-in + mechanism of x2goserver. [ Ivan Kabaivanov ] * Makefile fix around man page installation in x2goserver-compat package. diff --git a/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 new file mode 100644 index 0000000..e7b8a0b --- /dev/null +++ b/x2goserver-extensions/man/man8/x2goserver-run-extensions.8 @@ -0,0 +1,77 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2goserver-run-extensions 8 "Sep 2011" "Version 3.0.99.x" "X2go Server Tool" +.SH NAME +x2goserver-run-extensions \- Run X2go Server Extensions +.SH SYNOPSIS +'nh +.fi +.ad l +x2goserver-run-extensions <session_id> <modality> + +.SH DESCRIPTION +\fBx2goserver-run-extensions\fR is called from within a number of X2go Server core scripts. +.PP +\fIWARNING:\fR Do not call it directly unless you really know what you are doing. +.PP +\fBx2goserver-run-extensions\fR executes scripts that have been +provided by third-party X2go extension packages. +.PP +What this man page is about is not the script usage itself but the way of how to provide X2go server +extensions and features without the need to change the core X2go server scripts. +.SH MODALITIES +\fBx2goserver-run-extensions\fR is called with user privileges, as first cmd line argument the session ID is provided +as the second cmd line argument a (what we call it) modality is provided. +.PP +This modality tells \fBx2goserver-run-extensions\fR at what stage of an X2go +session startup, resumption, suspension or termination the calling script currently is at. +.PP +Calling X2go Server core scripts currently are: \fBx2gostartagent(8)\fR, \fBx2goruncommand(8)\fR, \fBx2goresume-session(8)\fR, +\fBx2gosuspend-session(8)\fR or \fBx2goterminate-session(8)\fR. +.PP +The modality names all refer to a sub-directory of the path: + + \fI<INSTALL_PREFIX>/lib/x2go/extensions\fR, + +where <INSTALL_PREFIX> mostly is /usr on commonly-used GNU/Linux systems. +.PP +In any of these sub-directories third-party X2go extension packages can place scripts or binaries that will then get executed by the core X2go server +commands, either before or after the essential functionality (e.g. x2goagent startup, x2goagent suspension, x2goagent resumption, etc.) or on failure of that +essential functionality. +.PP +The following table shows the available modalities, the calling scripts and the location where to place third-party extension scripts: + + + CALLING SCRIPT MODALITY NAMES EXTENSION SCRIPTS LOCATION + -------------- --------------- -------------------------- + x2gostartagent pre-start extensions/pre-start.d/ + post-start extensions/post-start.d/ + fail-start extensions/fail-start.d/ + x2goruncommand pre-runcommand extensions/pre-runcommand.d/ + post-runcommand extensions/post-runcommand.d/ + fail-runcommand extensions/fail-runcommand.d/ + x2goresume-session pre-resume extensions/pre-resume.d/ + post-resume extensions/post-resume.d/ + fail-resume extensions/fail-resume.d/ + x2gosuspend-session pre-suspend extensions/pre-suspend.d/ + post-suspend extensions/post-suspend.d/ + fail-suspend extensions/fail-suspend.d/ + x2goterminate-session pre-terminate extensions/pre-terminate.d/ + post-terminate extensions/post-terminate.d/ + fail-terminate extensions/fail-terminate.d/ + +\fIIMPORTANT:\fR When providing X2go Server extensions by this mechanism, please pretty well make sure that these extension scripts of yours that you place +in either of the above folders do under no circumstance fail during execution. + +.SH RETURN VALUES +As exitcode \fBx2goserver-run-extensions\fR always returns 0 and pretends to be permanently happy :-). +.SH SEE ALSO +\fBx2gostartagent(8)\fR, \fBx2goruncommand(8)\fR, \fBx2goresume-session(8)\fR, \fBx2gosuspend-session(8)\fR and \fBx2goterminate-session(8)\fR. +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project +(http://www.x2go.org). 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). [View Less]

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.6-54-g8015f61
by git-admin＠x2go.org 29 Sep '11

29 Sep '11

The branch, master has been updated via 8015f61d9854d63eb29bc5a3eb1eae4e9aa99768 (commit) from e1fac985554f168d0a4b82739b0a0e36eb275dca (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 8015f61d9854d63eb29bc5a3eb1eae4e9aa99768 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2011