cleanup request generation, add sensor list function

diff --git a/rsbs2.pl b/rsbs2.pl
index 17f33dc40e2eb5f7720e15abe3192ba4215f6777..4d09c1bde6e7b9f50eabf449300f96549f671b60 100755 (executable)
--- 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 version="1.0"?><?RMCXML version="1.0"?><RMCSEQ>'.$xml.'</RMCSEQ>');
        $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='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="'.$cmd.'"></REQ></RMCSEQ>';
+       my $reqstr='<REQ CMD="'.$cmd.'"></REQ>';
        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='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="propget"><PROPLIST><PROP NAME="'.$property.'"/></PROPLIST></REQ></RMCSEQ>';
+       my $reqstr='<REQ CMD="propget"><PROPLIST><PROP NAME="'.$property.'"/></PROPLIST></REQ>';
        my $resp = _req($reqstr);
 
        print "get: ${property}\n" if ($verbose);
@@ -204,7 +204,7 @@ sub setprop {
                return;
        }
        
-       my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="propset"><PROP NAME="'.$property.'"><VAL>'.$value.'</VAL></PROP></REQ></RMCSEQ>';
+       my $reqstr='<REQ CMD="propset"><PROP NAME="'.$property.'"><VAL>'.$value.'</VAL></PROP></REQ>';
        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='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="serveraction"><ACT>'.$action.'</ACT></REQ></RMCSEQ>';
+       my $reqstr='<REQ CMD="serveraction"><ACT>'.$action.'</ACT></REQ>';
        my $res = _req($reqstr);
 
        if ($res->{RESP}->{RC} ne '0x0') {
@@ -266,7 +266,7 @@ sub showprop {
 }
 
 sub board_properties {
-       my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="boardpropget"><PROPLIST><PROP NAME=""/></PROPLIST></REQ></RMCSEQ>';
+       my $reqstr='<REQ CMD="boardpropget"><PROPLIST><PROP NAME=""/></PROPLIST></REQ>';
        my $resp = _req($reqstr);
 
        print " * Board Properties:\n";
@@ -276,7 +276,7 @@ sub board_properties {
 }
 
 sub show_boarddesc {
-       my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="boardpropget"><BPROPLIST><BPROP NAME="BOARD_DESCRIPTION"/></BPROPLIST></REQ></RMCSEQ>';
+       my $reqstr='<REQ CMD="boardpropget"><BPROPLIST><BPROP NAME="BOARD_DESCRIPTION"/></BPROPLIST></REQ>';
        my $boarddesc64 = _req($reqstr)->{RESP}->{BPROPLIST}->{BPROP}->{VAL};
        my $boarddesc = decode_base64($boarddesc64);
        my @board = split(//, $boarddesc);
@@ -293,20 +293,19 @@ sub show_all_vars {
 }
 
 sub usrlist {
-       my $reqstr = '<?XML version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="usrlist"></REQ></RMCSEQ>';
-       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 = '<?XML version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="usrpropget"><USER NAME="'.$usr.'"></USER></REQ></RMCSEQ>';
+       my $reqstr = '<REQ CMD="usrpropget"><USER NAME="'.$usr.'"></USER></REQ>';
        my $res = _req($reqstr)->{RESP}->{USER}->{PROP};
 
        $res;
@@ -324,7 +323,7 @@ sub getusrprops {
 sub usradd {
        my $usr = shift;
 
-       my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="usradd"><USER NAME="'.$usr.'"/></REQ></RMCSEQ>';
+       my $reqstr='<REQ CMD="usradd"><USER NAME="'.$usr.'"/></REQ>';
        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='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="usrpropget"><USER NAME="'.$usr.'"><PROP NAME="'.$property.'"></PROP></USER></REQ></RMCSEQ>';
+       my $reqstr='<REQ CMD="usrpropget"><USER NAME="'.$usr.'"><PROP NAME="'.$property.'"></PROP></USER></REQ>';
        my $res = _req($reqstr);
 
        my $oldval = ${res}->{RESP}->{USER}->{PROP}->{VAL};
@@ -346,7 +345,7 @@ sub setusrprop {
                return;
        }
        
-       $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="usrpropset"><USER NAME="'.$usr.'"><PROP NAME="'.$property.'"><VAL>'.$value.'</VAL></PROP></USER></REQ></RMCSEQ>';
+       $reqstr='<REQ CMD="usrpropset"><USER NAME="'.$usr.'"><PROP NAME="'.$property.'"><VAL>'.$value.'</VAL></PROP></USER></REQ>';
        $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='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="dbgmsglancfg"><IP>'.${destination_ip}.'</IP><BCAST>'.${bcast}.'</BCAST><STORE>FALSE</STORE></REQ></RMCSEQ>';
+       my $reqstr='<REQ CMD="dbgmsglancfg"><IP>'.${destination_ip}.'</IP><BCAST>'.${bcast}.'</BCAST><STORE>FALSE</STORE></REQ>';
        my $res = _req($reqstr);
        if ($res->{RESP}->{RC} ne '0x0') {
                print "FAILED:".$res->{RESP}->{RC}."\n";
                return;
        }
 
-       $reqstr='<?XML version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="dbgmsgcfg"><ON>TRUE</ON><CHANNELMASK>0x1</CHANNELMASK><MMASK>0x1</MMASK><STORE>FALSE</STORE></REQ></RMCSEQ>';
+       $reqstr='<REQ CMD="dbgmsgcfg"><ON>TRUE</ON><CHANNELMASK>0x1</CHANNELMASK><MMASK>0x1</MMASK><STORE>FALSE</STORE></REQ>';
        $res = _req($reqstr);
        if ($res->{RESP}->{RC} ne '0x0') {
                print "FAILED:".$res->{RESP}->{RC}."\n";
@@ -379,6 +378,19 @@ sub syslog_debug {
        print "Debug messages will be sent to ${destination_ip} (broadcast: ${bcast})\n";
 }
 
+sub sensors {
+       my $slist= _cmd("sensorlist");
+       my %sens = ();
+
+       if ($slist->{RC} ne '0x0') {
+               print "Error getting sensorlist: ".$slist->{RC}."\n";
+               return;
+       }
+
+       foreach my $s (@{$slist->{SENSORLIST}->{SENSOR}}) {
+       }
+}
+
 sub status {
        my $boardstatus = _cmd("boardstatus")->{STATUS};
        my $fw = _cmd("boardfwstatus");
@@ -426,6 +438,8 @@ sub status {
        if ($fws != 0) {
                print "FW upgrade progress:\t${boardfwprogress}\n";
        }
+       print "\nSensors:\n";
+       sensors();
 }
 
 sub login {
@@ -648,7 +662,7 @@ if (@sprop) {
 
 if (@xmlsend) {
        foreach my $x (@xmlsend) {
-               print Dumper(_req('<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ>'.$x.'</RMCSEQ>'));
+               print Dumper(_req($x));
        }
 }