[X2Go-Commits] [x2goserver] 01/01: finalize teki integration
git-admin at x2go.org
git-admin at x2go.org
Sun Apr 27 10:28:40 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch telekinesis
in repository x2goserver.
commit 88f7403c54bed69dfb915b1d29b3c1c116d365ee
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Apr 27 10:18:36 2014 +0200
finalize teki integration
---
X2Go/Server/DB.pm | 16 ++++++++++------
X2Go/Server/DB/SQLite3.pm | 12 ++++++------
X2Go/Utils.pm | 6 ++++++
x2goserver/bin/x2gostartagent | 4 ++--
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/X2Go/Server/DB.pm b/X2Go/Server/DB.pm
index 4682cc4..18bba34 100644
--- a/X2Go/Server/DB.pm
+++ b/X2Go/Server/DB.pm
@@ -240,20 +240,22 @@ sub db_createsession
my $gr_port=shift or die"argument \"gr_port\" missed";
my $snd_port=shift or die"argument \"snd_port\" missed";
my $fs_port=shift or die"argument \"fs_port\" missed";
+ my $tekictrl_port=shift or die"argument \"tekictrl_port\" missed";
+ my $tekidata_port=shift or die"argument \"tekidata_port\" missed";
my $sid=shift or die "argument \"session_id\" missed";
if ($backend eq 'postgres')
{
- X2Go::Server::DB::PostgreSQL::db_createsession($cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $sid);
+ X2Go::Server::DB::PostgreSQL::db_createsession($cookie, $pid, $client, $gr_port, $snd_port, $fs_port, $tekictrl_port, $tekidata_port, $sid);
}
if ($backend eq 'sqlite')
{
- my $err= system_capture_merged_output("$x2go_lib_path/libx2go-server-db-sqlite3-wrapper", "createsession", "$cookie", "$pid", "$client", "$gr_port", "$snd_port", "$fs_port", "$sid");
+ my $err= system_capture_merged_output("$x2go_lib_path/libx2go-server-db-sqlite3-wrapper", "createsession", "$cookie", "$pid", "$client", "$gr_port", "$snd_port", "$fs_port", "$tekictrl_port", "$tekidata_port", "$sid");
if ($err ne "ok")
{
die $err;
}
}
- syslog('debug', "db_createsession called, session ID: $sid, cookie: $cookie, client: $client, pid: $pid, graphics port: $gr_port, sound port: $snd_port, file sharing port: $fs_port");
+ syslog('debug', "db_createsession called, session ID: $sid, cookie: $cookie, client: $client, pid: $pid, graphics port: $gr_port, sound port: $snd_port, file sharing port: $fs_port. telekinesis ctrl port: $tekictrl_port, telekinesis data port: $tekidata_port");
}
sub db_createshadowsession
@@ -325,15 +327,17 @@ sub db_resume
my $gr_port=shift or die "argument \"gr_port\" missed";
my $snd_port=shift or die "argument \"snd_port\" missed";
my $fs_port=shift or die "argument \"fs_port\" missed";
+ my $tekictrl_port=shift or die"argument \"tekictrl_port\" missed";
+ my $tekidata_port=shift or die"argument \"tekidata_port\" missed";
if ($backend eq 'postgres')
{
- X2Go::Server::DB::PostgreSQL::db_resume($client, $sid, $gr_port, $snd_port, $fs_port);
+ X2Go::Server::DB::PostgreSQL::db_resume($client, $sid, $gr_port, $snd_port, $fs_port, $tekictrl_port, $tekidata_port);
}
if ($backend eq 'sqlite')
{
- system_capture_merged_output("$x2go_lib_path/libx2go-server-db-sqlite3-wrapper", "resume", "$client", "$sid", "$gr_port", "$snd_port", "$fs_port");
+ system_capture_merged_output("$x2go_lib_path/libx2go-server-db-sqlite3-wrapper", "resume", "$client", "$sid", "$gr_port", "$snd_port", "$fs_port", "$tekictrl_port", "$tekidata_port");
}
- syslog('debug', "db_resume called, session ID: $sid, client: $client, gr_port: $gr_port, sound_port: $snd_port, fs_port: $fs_port");
+ syslog('debug', "db_resume called, session ID: $sid, client: $client, gr_port: $gr_port, sound_port: $snd_port, fs_port: $fs_port, telekinesis ctrl port: $tekictrl_port, telekinesis data port: $tekidata_port");
}
sub db_changestatus
diff --git a/X2Go/Server/DB/SQLite3.pm b/X2Go/Server/DB/SQLite3.pm
index dacc3bc..788e45e 100644
--- a/X2Go/Server/DB/SQLite3.pm
+++ b/X2Go/Server/DB/SQLite3.pm
@@ -261,10 +261,10 @@ sub db_createsession
$snd_port = sanitizer('num', $snd_port) or die "argument \"snd_port\" malformed";
my $fs_port=shift or die"argument \"fs_port\" missed";
$fs_port = sanitizer('num', $fs_port) or die "argument \"fs_port\" malformed";
- my $tekictrl_port=shift or die"argument \"tekictrl_port\" missed";
- $tekictrl_port = sanitizer('num', $tekictrl_port) or die "argument \"tekictrl_port\" malformed";
- my $tekidata_port=shift or die"argument \"tekidata_port\" missed";
- $tekidata_port = sanitizer('num', $tekidata_port) or die "argument \"tekidata_port\" malformed";
+ my $tekictrl_port=shift or die "argument \"tekictrl_port\" missed";
+ $tekictrl_port = sanitizer('pnnum', $tekictrl_port) or die "argument \"tekictrl_port\" malformed";
+ my $tekidata_port=shift or die "argument \"tekidata_port\" missed";
+ $tekidata_port = sanitizer('pnnum', $tekidata_port) or die "argument \"tekidata_port\" malformed";
my $sid=shift or die "argument \"session_id\" missed";
$sid = sanitizer('pnixusername', $sid) or die "argument \"session_id\" malformed";
check_user($sid);
@@ -363,9 +363,9 @@ sub db_resume
my $fs_port=shift or die "argument \"fs_port\" missed";
$fs_port = sanitizer('num', $fs_port) or die "argument \"fs_port\" malformed";
my $tekictrl_port=shift or die"argument \"tekictrl_port\" missed";
- $tekictrl_port = sanitizer('num', $tekictrl_port) or die "argument \"tekictrl_port\" malformed";
+ $tekictrl_port = sanitizer('pnnum', $tekictrl_port) or die "argument \"tekictrl_port\" malformed";
my $tekidata_port=shift or die"argument \"tekidata_port\" missed";
- $tekidata_port = sanitizer('num', $tekidata_port) or die "argument \"tekidata_port\" malformed";
+ $tekidata_port = sanitizer('pnnum', $tekidata_port) or die "argument \"tekidata_port\" malformed";
check_user($sid);
my $sth=$dbh->prepare("update sessions set last_time=datetime('now','localtime'),status='R',
client=?,gr_port=?,sound_port=?,fs_port=?,tekictrl_port=?,tekidata_port=? where session_id = ? and uname=?");
diff --git a/X2Go/Utils.pm b/X2Go/Utils.pm
index 7f647cc..4f8a82c 100644
--- a/X2Go/Utils.pm
+++ b/X2Go/Utils.pm
@@ -106,6 +106,12 @@ sub sanitizer {
$string = $1;
return $string;
} else {return 0;}
+ } elsif ($type eq "pnnum") {
+ $string =~ s/[^0-9\+\-]//g;
+ if ($string =~ /^([0-9\+\-]*)$/) {
+ $string = $1;
+ return $string;
+ } else {return 0;}
} elsif ($type eq "anumazcsdaus") {
$string =~ s/[^a-zA-Z0-9\_\-]//g;
if ($string =~ /^([a-zA-Z0-9\_\-]*)$/) {
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 76f123c..984281a 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -188,8 +188,8 @@ while [ "$OUTPUT" != "inserted" ]; do
done
if [ "x$X2GO_TELEKINESIS_ENABLED" == "x0" ]; then
- TEKICTRL_PORT="0"
- TEKIDATA_PORT="0"
+ TEKICTRL_PORT="-1"
+ TEKIDATA_PORT="-1"
fi
while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ] || [ "$TEKICTRL_PORT" == "" ] || [ "$TEKIDATA_PORT" == "" ]; do
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list