use policy-file for applet to allow remote-storage

[rsbs2] / rsbs2.pl

diff --git a/rsbs2.pl b/rsbs2.pl
index 7f5cc0f43dce141a07546bebb3e872c3b11d9fb4..c835c0dd109f2d1635cf08657687854b57885c0a 100755 (executable)
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -1,14 +1,14 @@
 #!/usr/bin/perl -w
 
 use LWP::UserAgent;
 #!/usr/bin/perl -w
 
 use LWP::UserAgent;

+use LWP::ConnCache;

 use XML::Simple;
 use Data::Dumper;
 use MIME::Base64;
 use Digest::MD5 qw(md5);
 
 use XML::Simple;
 use Data::Dumper;
 use MIME::Base64;
 use Digest::MD5 qw(md5);
 

-my $ua = LWP::UserAgent->new;
-my $sid;
-my $host;
+my $ua = LWP::UserAgent->new(cookie_jar => {});
+my $url;

 my $poweronms=200;
 my $poweroffms=5000;
 my $verbose = 0;
 my $poweronms=200;
 my $poweroffms=5000;
 my $verbose = 0;


@@ -132,7 +132,7 @@ sub _crc16 {
 sub _hash {
        my ($password, $challenge) = @_;
        my @challenge_bytes = unpack 'c16', decode_base64($challenge);
 sub _hash {
        my ($password, $challenge) = @_;
        my @challenge_bytes = unpack 'c16', decode_base64($challenge);

-       my @pwd_hash            = unpack 'c16', md5($password);
+       my @pwd_hash = unpack 'c16', md5($password);

        my @xor_bytes;
        for my $i (0..15) {
                $xor_bytes[$i] = $challenge_bytes[$i] ^ $pwd_hash[$i];
        my @xor_bytes;
        for my $i (0..15) {
                $xor_bytes[$i] = $challenge_bytes[$i] ^ $pwd_hash[$i];


@@ -145,38 +145,37 @@ sub _hash {
 
 sub _req {
        my $xml = shift;
 
 sub _req {
        my $xml = shift;

-       $request = HTTP::Request->new(POST => "http://${host}/cgi/bin");
-       $request->header(Cookie => "sid=$sid");
+       $request = HTTP::Request->new(POST => "${url}/cgi/bin");

        $request->content_type('application/x-www-form-urlencoded');
        $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);
        $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;
 
 }
 
 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);
        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;
        }
 
                undef;
        }
 

-       $res->{RESP};
+       $res;

 }
 
 sub _getprop {
        my $property = shift;
 
 }
 
 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);
        
        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;
        }
        } else {
                $resp;
        }


@@ -184,8 +183,7 @@ sub _getprop {
 
 sub logout {
        print "Logout\n" if ($verbose);
 
 sub logout {
        print "Logout\n" if ($verbose);

-       my $request = HTTP::Request->new(GET => "http://${host}/cgi/logout");
-       $request->header(Cookie => "sid=$sid");
+       my $request = HTTP::Request->new(GET => "${url}/cgi/logout");

        my $response = $ua->request($request);
        die("While trying to logout: " . $response->status_line . "\n") unless ($response->is_success);
 
        my $response = $ua->request($request);
        die("While trying to logout: " . $response->status_line . "\n") unless ($response->is_success);
 


@@ -197,18 +195,18 @@ sub setprop {
        my $property = shift;
        my $value = shift;
 
        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;
        }
        
 
        if ($value eq $oldval) {
                print "${property} is already ${value}\n" if ($verbose);
                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);
 
        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);
                undef;
        } else {
                print "${property}: ${oldval} -> ${value}\n" if ($verbose);


@@ -228,11 +226,11 @@ sub serveraction {
        setprop("SERVER_POWER_OFF_MODE", sprintf("0x%x", $pmode));
 
        print "${action}...\n" if ($verbose);
        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);
 
        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 +258,30 @@ sub powercycle {
 sub showprop {
        my $property = shift;
 
 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 {
 
        print "${property}: " . ${phash}->{VAL} . " (" . ${phash}->{PERMS} . ")\n";
 }
 
 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";
        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 {
                print " * " . ${bprop}->{NAME} . ": " . ${bprop}->{VAL} . "\n";
        }
 }
 
 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 $boarddesc64 = _req($reqstr)->{RESP}->{BPROPLIST}->{BPROP}->{VAL};
+       my $reqstr='<REQ CMD="boardpropget"><BPROPLIST><BPROP NAME="BOARD_DESCRIPTION"/></BPROPLIST></REQ>';
+       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));
        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 {
 }
 
 sub show_all_vars {


@@ -293,20 +291,19 @@ sub show_all_vars {
 }
 
 sub usrlist {
 }
 
 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 = ();
 
        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 {
                ();
        } 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, $usr->{NAME};
                        }
                } else {

-                       push @users, $res->{RESP}->{USRLIST}->{USER}->{NAME};
+                       push @users, $res->{USRLIST}->{USER}->{NAME};

                }
        }
        @users;
                }
        }
        @users;


@@ -315,8 +312,8 @@ sub usrlist {
 sub getusrprops {
        my $usr = shift;
 
 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 $res = _req($reqstr)->{RESP}->{USER}->{PROP};
+       my $reqstr = '<REQ CMD="usrpropget"><USER NAME="'.$usr.'"></USER></REQ>';
+       my $res = _req($reqstr)->{USER}->{PROP};

 
        $res;
 }
 
        $res;
 }


@@ -324,10 +321,10 @@ sub getusrprops {
 sub usradd {
        my $usr = shift;
 
 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);
        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 +333,21 @@ sub setusrprop {
        my $property = shift;
        my $value = shift;
 
        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 $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;
        }
        
 
        if ($value eq $oldval) {
                print "${property} is already ${value}\n" if ($verbose);
                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);
 
        $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);
                undef;
        } else {
                print "${property}: ${oldval} -> ${value}\n" if ($verbose);


@@ -362,23 +359,71 @@ sub syslog_debug {
        my $destination_ip = shift;
        my $bcast = shift;
 
        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);
        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;
        }
 
                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);
        $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";
 }
 
                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 = '<REQ CMD="sensorpropget"><HANDLE>'.$slist->{HANDLE}.'</HANDLE><SENSORLIST>';
+       foreach my $s (@{$slist->{SENSORLIST}->{SENSOR}}) {
+               $req .= '<SENSOR KEY="'.$s->{KEY}.'"/>';
+       }
+       $req .= '</SENSORLIST></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");
 sub status {
        my $boardstatus = _cmd("boardstatus")->{STATUS};
        my $fw = _cmd("boardfwstatus");


@@ -411,26 +456,44 @@ 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 "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) {
        my $fws = hex ($boardfwstatus);
        print "FW status:\t\t";
        if ($fws == 3 || $fws == 32771) {

-               print "WAITING\n";
+               print "WAITING";

        } else {
        } else {

-               print "DONE\n";
+               print "DONE";

        }
        }

+       print " (${boardfwstatus})\n";

        if (($fws & 0x8080) || ($fws & 0x80)) {
                printf("FW error:\t\t0x%02x\n", ($fws & 0xff));
        }
        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 spawn_gui {
+       my $base = shift;
+       open(APPLET,"|appletviewer -J-Djava.security.policy=applet.policy /dev/stdin");
+       print APPLET '<HTML><HEAD><TITLE>RSB S2 User Interface</TITLE></HEAD>';
+       print APPLET '<BODY>';
+       print APPLET '<object width="640" height="480">';
+       print APPLET '<param name="code" value="com/agilent/rmc/mgui/RmcUI.class">';
+       print APPLET '<param name="codebase" value="'.$base.'/">';
+       print APPLET '<param name="archive" value="gui.jar, msa_shared.jar, msa_shared_comm.jar, msa_shared_oem.jar">';
+       print APPLET '</object>';
+       print APPLET '</BODY></HTML>';
+       close(APPLET);

 }
 
 sub login {
        my $user = shift;
        my $pass = shift;
 
 }
 
 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);
        die $response->status_line if (!($response->is_success));
 
        my $xmlin = XMLin($response->decoded_content);


@@ -438,7 +501,7 @@ sub login {
        my $challenge = $xmlin->{CHALLENGE};
        print "Challenge: ${challenge}\n" if ($verbose);
 
        my $challenge = $xmlin->{CHALLENGE};
        print "Challenge: ${challenge}\n" if ($verbose);
 

-       $sid = $response->headers->header('Set-Cookie');
+       my $sid = $response->headers->header('Set-Cookie');

        die "No SessionID!" if (!defined($sid));
        chomp($sid);
        $sid =~ s/.*sid=(.*);.*/$1/;
        die "No SessionID!" if (!defined($sid));
        chomp($sid);
        $sid =~ s/.*sid=(.*);.*/$1/;


@@ -447,15 +510,14 @@ sub login {
        my $login_hash = _hash($pass, $challenge);
        print "Hash: ${login_hash}\n" if ($verbose);
 
        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}");
-       $request->header(Cookie => "sid=$sid");
+       my $request = HTTP::Request->new(GET => "${url}/cgi/login?user=${user}&hash=${login_hash}");

        $response = $ua->request($request);
        die("While trying to login: " . $response->status_line . "\n") unless ($response->is_success);
 
        $xmlin = XMLin($response->decoded_content);
        die "Error logging in: ".$xmlin->{RC} if ($xmlin->{RC} ne '0x0');
 
        $response = $ua->request($request);
        die("While trying to login: " . $response->status_line . "\n") unless ($response->is_success);
 
        $xmlin = XMLin($response->decoded_content);
        die "Error logging in: ".$xmlin->{RC} if ($xmlin->{RC} ne '0x0');
 

-       $sid;
+       print "Logged in\n" if ($verbose);

 }
 
 sub read_inifile {
 }
 
 sub read_inifile {


@@ -501,6 +563,7 @@ my $enable_debug = "";
 my $save = "";
 my $load = "";
 my $showstat = 0;
 my $save = "";
 my $load = "";
 my $showstat = 0;

+my $gui = 0;

 my $hostalias;
 
 while (defined($ARGV[0])) {
 my $hostalias;
 
 while (defined($ARGV[0])) {


@@ -565,6 +628,11 @@ while (defined($ARGV[0])) {
                                shift @ARGV;
                                last SWITCH;
                        };
                                shift @ARGV;
                                last SWITCH;
                        };

+               /^-G$/ && do {
+                               $gui = 1;
+                               shift @ARGV;
+                               last SWITCH;
+                       };

                /^-save$/ && do {
                                shift @ARGV;
                                $save = shift @ARGV;
                /^-save$/ && do {
                                shift @ARGV;
                                $save = shift @ARGV;


@@ -599,11 +667,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-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-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";
        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";


@@ -616,11 +685,28 @@ if (!$valid_arg) {
        exit(1);
 }
 
        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"}));
 
 $poweronms = ${$Config{$hostalias}}{"poweronms"} if (defined(${$Config{$hostalias}}{"poweronms"}));
 $poweroffms = ${$Config{$hostalias}}{"poweroffms"} if (defined(${$Config{$hostalias}}{"poweroffms"}));
 

-$sid = login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});
+my $ssl = ${$Config{$hostalias}}{"ssl"};
+my $port = ${$Config{$hostalias}}{"port"};
+
+if (defined($ssl) && (lc($ssl) eq 'yes')) {
+       $ENV{HTTPS_DEBUG} = 1;
+       $ENV{HTTPS_VERSION} = 3;
+       $port = 443 if (!defined($port));
+       $url = "https://${host}:${port}";
+} else {
+       $port = 80 if (!defined($port));
+       $url = "http://${host}:${port}";
+}
+
+if ($gui) {
+       spawn_gui($url);
+}
+
+login(${$Config{$hostalias}}{"user"}, ${$Config{$hostalias}}{"pass"});

 
 if ($show) {
        show_boarddesc();
 
 if ($show) {
        show_boarddesc();


@@ -646,7 +732,8 @@ if (@sprop) {
 
 if (@xmlsend) {
        foreach my $x (@xmlsend) {
 
 if (@xmlsend) {
        foreach my $x (@xmlsend) {

-               print Dumper(_req('<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ>'.$x.'</RMCSEQ>'));
+               $Data::Dumper::Terse = 1;
+               print Dumper(_req($x));

        }
 }
 
        }
 }
 


@@ -662,7 +749,7 @@ if ($save ne '') {
        foreach my $ts (@fw_vars) {
                next if (grep(/^${ts}$/, @dontsave));
 
        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";
                next if ($phash->{PERMS} ne 'RW');
                
                print SAVEFILE "${ts}=".$phash->{VAL}."\n";