X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/7ef02e7634bc62e7d7d6f1c2a4b350bff8af434a..65d527a7b64bd23ecf054c65dfbbbc212ccb0760:/rsbs2.pl?ds=inline
diff --git a/rsbs2.pl b/rsbs2.pl
index 17f33dc..601e332 100755
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -148,35 +148,35 @@ sub _req {
$request = HTTP::Request->new(POST => "http://${host}/cgi/bin");
$request->header(Cookie => "sid=$sid");
$request->content_type('application/x-www-form-urlencoded');
- $request->content($xml);
+ $request->content(''.$xml.'');
$response = $ua->request($request);
die("Error in request: " . $response->status_line . "\n") unless ($response->is_success);
- XMLin($response->content, SuppressEmpty => '');
+ XMLin($response->content, SuppressEmpty => '')->{RESP};
}
sub _cmd {
my $cmd = shift;
- my $reqstr='';
+ my $reqstr='';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "${cmd} failed: ".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "${cmd} failed: ".$res->{RC}."\n";
undef;
}
- $res->{RESP};
+ $res;
}
sub _getprop {
my $property = shift;
- my $reqstr='';
+ my $reqstr='';
my $resp = _req($reqstr);
print "get: ${property}\n" if ($verbose);
- if ($resp->{RESP}->{RC} ne '0x0') {
- $resp->{RESP}->{RC};
+ if ($resp->{RC} ne '0x0') {
+ $resp->{RC};
} else {
$resp;
}
@@ -197,18 +197,18 @@ sub setprop {
my $property = shift;
my $value = shift;
- my $oldval = _getprop($property)->{RESP}->{PROPLIST}->{PROP}->{VAL};
+ my $oldval = _getprop($property)->{PROPLIST}->{PROP}->{VAL};
if ($value eq $oldval) {
print "${property} is already ${value}\n" if ($verbose);
return;
}
- my $reqstr=''.$value.'';
+ my $reqstr=''.$value.'';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "Error setting ${property} to ${value}: ".$res->{RC}."\n";
undef;
} else {
print "${property}: ${oldval} -> ${value}\n" if ($verbose);
@@ -228,11 +228,11 @@ sub serveraction {
setprop("SERVER_POWER_OFF_MODE", sprintf("0x%x", $pmode));
print "${action}...\n" if ($verbose);
- my $reqstr=''.$action.'';
+ my $reqstr=''.$action.'';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "FAILED:".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "FAILED:".$res->{RC}."\n";
}
}
@@ -260,30 +260,30 @@ sub powercycle {
sub showprop {
my $property = shift;
- my $phash = _getprop($property)->{RESP}->{PROPLIST}->{PROP};
+ my $phash = _getprop($property)->{PROPLIST}->{PROP};
print "${property}: " . ${phash}->{VAL} . " (" . ${phash}->{PERMS} . ")\n";
}
sub board_properties {
- my $reqstr='';
+ my $reqstr='';
my $resp = _req($reqstr);
print " * Board Properties:\n";
- foreach my $bprop (@{$resp->{RESP}->{BPROPLIST}->{BPROP}}) {
+ foreach my $bprop (@{$resp->{BPROPLIST}->{BPROP}}) {
print " * " . ${bprop}->{NAME} . ": " . ${bprop}->{VAL} . "\n";
}
}
sub show_boarddesc {
- my $reqstr='';
- my $boarddesc64 = _req($reqstr)->{RESP}->{BPROPLIST}->{BPROP}->{VAL};
+ my $reqstr='';
+ my $boarddesc64 = _req($reqstr)->{BPROPLIST}->{BPROP}->{VAL};
my $boarddesc = decode_base64($boarddesc64);
my @board = split(//, $boarddesc);
foreach my $byte (@board) {
printf ("0x%02x ", ord($byte));
-}
-print "\n";
+ }
+ print "\n";
}
sub show_all_vars {
@@ -293,20 +293,19 @@ sub show_all_vars {
}
sub usrlist {
- my $reqstr = '';
- my $res = _req($reqstr);
+ my $res = _cmd("usrlist");
my @users = ();
- if ($res->{RESP}->{RC} ne '0x0') {
- print "FAILED:".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "FAILED:".$res->{RC}."\n";
();
} else {
- if (ref($res->{RESP}->{USRLIST}->{USER}) eq 'ARRAY') {
- foreach my $usr (@{$res->{RESP}->{USRLIST}->{USER}}) {
+ if (ref($res->{USRLIST}->{USER}) eq 'ARRAY') {
+ foreach my $usr (@{$res->{USRLIST}->{USER}}) {
push @users, $usr->{NAME};
}
} else {
- push @users, $res->{RESP}->{USRLIST}->{USER}->{NAME};
+ push @users, $res->{USRLIST}->{USER}->{NAME};
}
}
@users;
@@ -315,8 +314,8 @@ sub usrlist {
sub getusrprops {
my $usr = shift;
- my $reqstr = '';
- my $res = _req($reqstr)->{RESP}->{USER}->{PROP};
+ my $reqstr = '';
+ my $res = _req($reqstr)->{USER}->{PROP};
$res;
}
@@ -324,10 +323,10 @@ sub getusrprops {
sub usradd {
my $usr = shift;
- my $reqstr='';
+ my $reqstr='';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "FAILED:".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "FAILED:".$res->{RC}."\n";
}
}
@@ -336,21 +335,21 @@ sub setusrprop {
my $property = shift;
my $value = shift;
- my $reqstr='';
+ my $reqstr='';
my $res = _req($reqstr);
- my $oldval = ${res}->{RESP}->{USER}->{PROP}->{VAL};
+ my $oldval = ${res}->{USER}->{PROP}->{VAL};
if ($value eq $oldval) {
print "${property} is already ${value}\n" if ($verbose);
return;
}
- $reqstr=''.$value.'';
+ $reqstr=''.$value.'';
$res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "Error setting ${property} to ${value}: ".$res->{RC}."\n";
undef;
} else {
print "${property}: ${oldval} -> ${value}\n" if ($verbose);
@@ -362,23 +361,71 @@ sub syslog_debug {
my $destination_ip = shift;
my $bcast = shift;
- my $reqstr=''.${destination_ip}.''.${bcast}.'FALSE';
+ my $reqstr=''.${destination_ip}.''.${bcast}.'FALSE';
my $res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "FAILED:".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "FAILED:".$res->{RC}."\n";
return;
}
- $reqstr='TRUE0x10x1FALSE';
+ $reqstr='TRUE0x10x1FALSE';
$res = _req($reqstr);
- if ($res->{RESP}->{RC} ne '0x0') {
- print "FAILED:".$res->{RESP}->{RC}."\n";
+ if ($res->{RC} ne '0x0') {
+ print "FAILED:".$res->{RC}."\n";
return;
}
print "Debug messages will be sent to ${destination_ip} (broadcast: ${bcast})\n";
}
+sub get_sensors {
+ my $slist= _cmd("sensorlist");
+ my @sensors;
+
+ if ($slist->{RC} ne '0x0') {
+ print "Error getting sensorlist: ".$slist->{RC}."\n";
+ return;
+ }
+
+ my $req = '0x1';
+ foreach my $s (@{$slist->{SENSORLIST}->{SENSOR}}) {
+ $req .= '';
+ }
+ $req .= '';
+
+ my $sprop = _req($req);
+ foreach my $s (@{$sprop->{SENSORLIST}->{SENSOR}}) {
+ my $sensor = {};
+ foreach my $sp (@{$s->{PROP}}) {
+ $sensor->{$sp->{NAME}} = $sp->{VAL};
+ }
+
+ next if (!defined($sensor->{NAME}));
+ $sensor->{VAL} = '0' if ($sensor->{VAL} eq '');
+ push @sensors, $sensor;
+ }
+ @sensors;
+}
+
+sub show_sensors {
+ my @sensors = get_sensors();
+
+ foreach my $sensor (@sensors) {
+ print $sensor->{NAME}.": ".$sensor->{VAL}.$sensor->{UNITS};
+
+ my @info = ();
+ foreach my $field qw(MIN MAX LOW_NON_CRITICAL UPPER_NON_CRITICAL LOW_CRITICAL UPPER_CRITICAL) {
+ if ($sensor->{$field} ne '') {
+ push @info, "${field}: ".$sensor->{$field}.$sensor->{UNITS};
+ }
+ }
+
+ print "\t(".join(", ",@info).")" if (@info);
+
+ print "\n";
+ }
+}
+
sub status {
my $boardstatus = _cmd("boardstatus")->{STATUS};
my $fw = _cmd("boardfwstatus");
@@ -426,6 +473,8 @@ sub status {
if ($fws != 0) {
print "FW upgrade progress:\t${boardfwprogress}\n";
}
+ print "\nSensors:\n";
+ show_sensors();
}
sub login {
@@ -648,7 +697,8 @@ if (@sprop) {
if (@xmlsend) {
foreach my $x (@xmlsend) {
- print Dumper(_req(''.$x.''));
+ $Data::Dumper::Terse = 1;
+ print Dumper(_req($x));
}
}
@@ -664,7 +714,7 @@ if ($save ne '') {
foreach my $ts (@fw_vars) {
next if (grep(/^${ts}$/, @dontsave));
- my $phash = _getprop($ts)->{RESP}->{PROPLIST}->{PROP};
+ my $phash = _getprop($ts)->{PROPLIST}->{PROP};
next if ($phash->{PERMS} ne 'RW');
print SAVEFILE "${ts}=".$phash->{VAL}."\n";