X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/a09bedd6ac1ecdad6d0bdf9773eb30acfc175287..3f4d6039fcf53e15e439597d6115b97ccd576457:/rsbs2.pl?ds=sidebyside
diff --git a/rsbs2.pl b/rsbs2.pl
index 9654046..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);
@@ -674,21 +688,14 @@ 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) {
- open(APPLET,"|appletviewer /dev/stdin");
- print APPLET 'RSB S2 User Interface';
- print APPLET '';
- print APPLET '';
- print APPLET '';
- close(APPLET);
+ spawn_gui($url);
}
$sid = login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});