X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/65d527a7b64bd23ecf054c65dfbbbc212ccb0760..3f4d6039fcf53e15e439597d6115b97ccd576457:/rsbs2.pl
diff --git a/rsbs2.pl b/rsbs2.pl
index 601e332..6ce2321 100755
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -8,7 +8,7 @@ use Digest::MD5 qw(md5);
my $ua = LWP::UserAgent->new;
my $sid;
-my $host;
+my $url;
my $poweronms=200;
my $poweroffms=5000;
my $verbose = 0;
@@ -145,7 +145,7 @@ sub _hash {
sub _req {
my $xml = shift;
- $request = HTTP::Request->new(POST => "http://${host}/cgi/bin");
+ $request = HTTP::Request->new(POST => "${url}/cgi/bin");
$request->header(Cookie => "sid=$sid");
$request->content_type('application/x-www-form-urlencoded');
$request->content(''.$xml.'');
@@ -184,7 +184,7 @@ sub _getprop {
sub logout {
print "Logout\n" if ($verbose);
- my $request = HTTP::Request->new(GET => "http://${host}/cgi/logout");
+ my $request = HTTP::Request->new(GET => "${url}/cgi/logout");
$request->header(Cookie => "sid=$sid");
my $response = $ua->request($request);
die("While trying to logout: " . $response->status_line . "\n") unless ($response->is_success);
@@ -477,11 +477,25 @@ sub status {
show_sensors();
}
+sub spawn_gui {
+ my $base = shift;
+ open(APPLET,"|appletviewer /dev/stdin");
+ print APPLET 'RSB S2 User Interface';
+ print APPLET '';
+ print APPLET '';
+ print APPLET '';
+ close(APPLET);
+}
+
sub login {
my $user = shift;
my $pass = shift;
- my $response = $ua->get("http://${host}/cgi/challenge");
+ my $response = $ua->get("${url}/cgi/challenge");
die $response->status_line if (!($response->is_success));
my $xmlin = XMLin($response->decoded_content);
@@ -498,7 +512,7 @@ sub login {
my $login_hash = _hash($pass, $challenge);
print "Hash: ${login_hash}\n" if ($verbose);
- my $request = HTTP::Request->new(GET => "http://${host}/cgi/login?user=${user}&hash=${login_hash}");
+ my $request = HTTP::Request->new(GET => "${url}/cgi/login?user=${user}&hash=${login_hash}");
$request->header(Cookie => "sid=$sid");
$response = $ua->request($request);
die("While trying to login: " . $response->status_line . "\n") unless ($response->is_success);
@@ -552,6 +566,7 @@ my $enable_debug = "";
my $save = "";
my $load = "";
my $showstat = 0;
+my $gui = 0;
my $hostalias;
while (defined($ARGV[0])) {
@@ -616,6 +631,11 @@ while (defined($ARGV[0])) {
shift @ARGV;
last SWITCH;
};
+ /^-G$/ && do {
+ $gui = 1;
+ shift @ARGV;
+ last SWITCH;
+ };
/^-save$/ && do {
shift @ARGV;
$save = shift @ARGV;
@@ -650,11 +670,12 @@ if (!$valid_arg) {
print STDERR "\t-d\t\tpowerdown\n";
print STDERR "\t-c\t\tpowercycle\n";
print STDERR "\t-r\t\treset\n";
- print STDERR "\t-R\t\treset RSB S2 borad\n";
+ print STDERR "\t-R\t\treset RSB S2 board\n";
print STDERR "\t-x\t\tshow all properties, variables and settings\n";
print STDERR "\t-l IP\t\tsend SYSLOG debug messages to IP\n";
print STDERR "\t-b\t\tshow board/server status\n";
print STDERR "\t-X\t\tsend raw XML string (start with REQ tag)\n";
+ print STDERR "\t-G\t\tstart GUI in appletviewer\n";
print STDERR "\t-v\t\tverbose\n";
print STDERR "\t-save file\tsave configuration to 'file'\n";
print STDERR "\t-load file\tload configuration from 'file'\n";
@@ -667,10 +688,16 @@ if (!$valid_arg) {
exit(1);
}
-$host = ${$Config{$hostalias}}{"host"};
+my $host = ${$Config{$hostalias}}{"host"};
$poweronms = ${$Config{$hostalias}}{"poweronms"} if (defined(${$Config{$hostalias}}{"poweronms"}));
$poweroffms = ${$Config{$hostalias}}{"poweroffms"} if (defined(${$Config{$hostalias}}{"poweroffms"}));
+$url = "http://${host}";
+
+if ($gui) {
+ spawn_gui($url);
+}
+
$sid = login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});
if ($show) {