X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/3a88950737f06d296baf044920a263ab10e6fd8a..06873593de347f3e740d37a9f5416697df662847:/rsbs2.pl?ds=inline
diff --git a/rsbs2.pl b/rsbs2.pl
index 7f5cc0f..51d9c64 100755
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -148,7 +148,7 @@ 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 => '');
@@ -157,7 +157,7 @@ sub _req {
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";
@@ -170,7 +170,7 @@ sub _cmd {
sub _getprop {
my $property = shift;
- my $reqstr='';
+ my $reqstr='';
my $resp = _req($reqstr);
print "get: ${property}\n" if ($verbose);
@@ -204,7 +204,7 @@ sub setprop {
return;
}
- my $reqstr=''.$value.'';
+ my $reqstr=''.$value.'';
my $res = _req($reqstr);
if ($res->{RESP}->{RC} ne '0x0') {
@@ -228,7 +228,7 @@ 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') {
@@ -266,7 +266,7 @@ sub showprop {
}
sub board_properties {
- my $reqstr='';
+ my $reqstr='';
my $resp = _req($reqstr);
print " * Board Properties:\n";
@@ -276,14 +276,14 @@ sub board_properties {
}
sub show_boarddesc {
- my $reqstr='';
+ my $reqstr='';
my $boarddesc64 = _req($reqstr)->{RESP}->{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,7 +314,7 @@ sub usrlist {
sub getusrprops {
my $usr = shift;
- my $reqstr = '';
+ my $reqstr = '';
my $res = _req($reqstr)->{RESP}->{USER}->{PROP};
$res;
@@ -324,7 +323,7 @@ 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";
@@ -336,7 +335,7 @@ sub setusrprop {
my $property = shift;
my $value = shift;
- my $reqstr='';
+ my $reqstr='';
my $res = _req($reqstr);
my $oldval = ${res}->{RESP}->{USER}->{PROP}->{VAL};
@@ -346,7 +345,7 @@ sub setusrprop {
return;
}
- $reqstr=''.$value.'';
+ $reqstr=''.$value.'';
$res = _req($reqstr);
if ($res->{RESP}->{RC} ne '0x0') {
@@ -362,14 +361,14 @@ 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";
return;
}
- $reqstr='TRUE0x10x1FALSE';
+ $reqstr='TRUE0x10x1FALSE';
$res = _req($reqstr);
if ($res->{RESP}->{RC} ne '0x0') {
print "FAILED:".$res->{RESP}->{RC}."\n";
@@ -379,6 +378,54 @@ sub syslog_debug {
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->{RESP}->{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");
@@ -411,19 +458,23 @@ sub status {
print "COM redirection:\t" . (($bs & 0x100000) ? "ON" : "OFF") . "\n";
print "UART redirect:\t\t" . (($bs & 0x200000) ? "ON" : "OFF") . "\n";
print "UART redirect pending:\t" . (($bs & 0x400000) ? "TRUE" : "FALSE") . "\n";
+ print "Hex BoardStatus:\t${boardstatus}\n";
my $fws = hex ($boardfwstatus);
print "FW status:\t\t";
if ($fws == 3 || $fws == 32771) {
- print "WAITING\n";
+ print "WAITING";
} else {
- print "DONE\n";
+ print "DONE";
}
+ print " (${boardfwstatus})\n";
if (($fws & 0x8080) || ($fws & 0x80)) {
printf("FW error:\t\t0x%02x\n", ($fws & 0xff));
}
- print "boardstatus:\t\t${boardstatus}\n";
- print "boardfwstatus:\t\t${boardfwstatus}\n";
- print "fw upgrade progress:\t${boardfwprogress}\n";
+ if ($fws != 0) {
+ print "FW upgrade progress:\t${boardfwprogress}\n";
+ }
+ print "\nSensors:\n";
+ show_sensors();
}
sub login {
@@ -646,7 +697,7 @@ if (@sprop) {
if (@xmlsend) {
foreach my $x (@xmlsend) {
- print Dumper(_req(''.$x.''));
+ print Dumper(_req($x));
}
}