[X2Go-Commits] [x2goserver] 15/27: x2goserver/bin/x2goresume-session: properly randomize first port, just like in x2gostartagent.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 10 00:17:58 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.

commit d4d954b0a7c8c6d94356dd1d1b3299fb107712fd
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jan 4 05:59:21 2018 +0100

    x2goserver/bin/x2goresume-session: properly randomize first port, just like in x2gostartagent.
---
 debian/changelog                  | 2 ++
 x2goserver/bin/x2goresume-session | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7f645cb..818e823 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
       zero, indicating success.
     - x2goserver/bin/x2goresume-session: remove spurious semicolon and add
       quotes on the lib path line.
+    - x2goserver/bin/x2goresume-session: properly randomize first port, just
+      like in x2gostartagent.
   * x2goserver.spec:
     - RPMify x2goserver-xsession description.
     - Remove qt4 stuff, we're not using the framework here.
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 2ac10b6..34b8f2d 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -186,7 +186,14 @@ if grep -q "|${FS_PORT}|" <<<$SYSTEM_PORTS ; then
 	FS_PORT=""
 fi
 
-SSH_PORT=30000 #First ssh port 30001
+if ! SSH_PORT="$("${X2GO_LIB_PATH}/x2gogetrandomport")"; then
+	typeset msg="Unable to get (pseudo-)randomized starting port value."
+	"${X2GO_LIB_PATH}/x2gosyslog" "${0}" "err" "${msg}"
+
+	# Make x2goclient fail.
+	echo "${msg}" >&2
+	exit "1"
+fi
 
 #Get all used in system ports from X2Go database and netstat output
 USED_PORTS="$("${X2GO_LIB_PATH}/x2gogetports" "${current_host_name}"; netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }')"

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list