save and load user settings, too

diff --git a/rsbs2.pl b/rsbs2.pl
index 3b752c21187832fe1312c7479f5f4a989a6cbbda..35f836a2b2849b143f333796a6f8288c5ea0252e 100755 (executable)
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -288,19 +288,69 @@ sub usrlist {
                print "FAILED:".$res->{RESP}->{RC}."\n";
                ();
        } else {
-               foreach my $usr (@{$res->{RESP}->{USRLIST}->{USER}}) {
-                       push @users, $usr->{NAME};
+               if (ref($res->{RESP}->{USRLIST}->{USER}) eq 'ARRAY') {
+                       foreach my $usr (@{$res->{RESP}->{USRLIST}->{USER}}) {
+                               push @users, $usr->{NAME};
+                       }
+               } else {
+                       push @users, $res->{RESP}->{USRLIST}->{USER}->{NAME};
                }
        }
        @users;
 }
 
+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};
+
+       $res;
+}
+
+sub usradd {
+       my $usr = shift;
+
+       my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="usradd"><USER NAME="michael"/></REQ></RMCSEQ>';
+       my $res = _req($reqstr);
+       if ($res->{RESP}->{RC} ne '0x0') {
+               print "FAILED:".$res->{RESP}->{RC}."\n";
+       }
+}
+
+sub setusrprop {
+       my $usr = 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 $res = _req($reqstr);
+
+       my $oldval = ${res}->{RESP}->{USER}->{PROP}->{VAL};
+
+       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>';
+       $res = _req($reqstr);
+
+       if ($res->{RESP}->{RC} ne '0x0') {
+               print "Error setting ${property} to ${value}: ".$res->{RESP}->{RC}."\n";
+               undef;
+       } else {
+               print "${property}: ${oldval} -> ${value}\n" if ($verbose);
+               $oldval;
+       }
+}
+
 sub syslog_debug {
        my $destination_ip = shift;
        my $bcast = shift;
 
-       $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>';
-       $res = _req($reqstr);
+       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 $res = _req($reqstr);
        if ($res->{RESP}->{RC} ne '0x0') {
                print "FAILED:".$res->{RESP}->{RC}."\n";
                return;
@@ -348,26 +398,34 @@ sub login {
        $sid;
 }
 
-open(INIFILE,"<$ENV{HOME}/.rsbs2rc") || die("can't open config: $ENV{HOME}/.rsbs2rc: $!");
-my %Config = ();
-my @sections = ();
-while(<INIFILE>) {
-       chomp;
-
-       next if (m/^#/);
-
-       if (m/^\s*\[(.*)\]\s*$/) {
-               push @sections, $1;
-               next;
-       }
+sub read_inifile {
+       my $filename = shift;
 
-       if (@sections) {
-               if (m/^\s*(.+)\s*=\s*(.*)\s*$/) {
-                       ${$Config{$sections[$#sections]}}{$1} = $2;
+       open(INIFILE,"<${filename}") || die("can't open config: ${filename}: $!");
+       my %Ini = ();
+       my @sections = ();
+       while(<INIFILE>) {
+               chomp;
+       
+               next if (m/^#/);
+       
+               if (m/^\s*\[(.*)\]\s*$/) {
+                       push @sections, $1;
+                       next;
+               }
+       
+               if (@sections) {
+                       if (m/^\s*([^=]+)\s*=\s*(.*)\s*$/) {
+                               ${$Ini{$sections[$#sections]}}{$1} = $2;
+                       }
                }
        }
+       close(INIFILE);
+
+       %Ini;
 }
-close(INIFILE);
+
+my %Config = read_inifile("$ENV{HOME}/.rsbs2rc");
 
 my $valid_arg = 0;
 my $powup = 0;
@@ -470,7 +528,7 @@ if (!$valid_arg) {
        print STDERR "\t-load file\tload configuration from 'file'\n";
        print STDERR "\n";
        print STDERR "card-alias\tone of: ";
-       foreach my $alias (@sections) {
+       foreach my $alias (keys(%Config)) {
                print STDERR "\"${alias}\" ";
        }
        print STDERR "(see ~/.rsbs2rc)\n";
@@ -512,6 +570,7 @@ if ($save ne '') {
        LAST_IP_ADDRESS LAST_NETMASK);
 
        open (SAVEFILE, ">${save}") || die "Error opening save-file: $!\n";
+       print SAVEFILE "[global]\n";
        print STDERR "saving" if (!$verbose);
        foreach my $ts (@fw_vars) {
                next if (grep(/^${ts}$/, @dontsave));
@@ -523,22 +582,39 @@ if ($save ne '') {
                print STDERR "." if (!$verbose);
        }
        foreach my $usr (usrlist()) {
-               print STDERR "TODO: save user ${usr}\n";
+               print SAVEFILE "\n[${usr}]\n";
+               foreach my $up (@{getusrprops($usr)}) {
+                       next if ($up->{PERMS} ne 'RW');
+
+                       print SAVEFILE $up->{NAME}."=".$up->{VAL}."\n";
+               }
+               print STDERR "." if (!$verbose);
        }
        close(SAVEFILE);
        print STDERR "done\n" if (!$verbose);
 }
 
 if ($load ne '') {
-       open (LOADFILE, "<${load}") || die "Error opening load-file: $!\n";
+       my %loadfile = read_inifile("${load}");
        print STDERR "loading" if (!$verbose);
-       while(<LOADFILE>) {
-               chomp;
-               (my $p, my $v) = split(/=/, $_);
-               setprop($p, $v);
+
+       foreach my $p (keys(%{$loadfile{'global'}})) {
+               setprop($p, $loadfile{'global'}->{$p});
                print STDERR "." if (!$verbose);
        }
-       close(LOADFILE);
+
+       my @users = usrlist();
+       foreach my $usr (keys(%loadfile)) {
+               next if ($usr eq 'global');
+               if (!grep(/^${usr}$/, @users)) {
+                       print STDERR "\nAdding user \"${usr}\".\n" if ($verbose);
+                       usradd($usr);
+               }
+               foreach my $p (keys(%{$loadfile{$usr}})) {
+                       setusrprop($usr, $p, $loadfile{$usr}->{$p});
+                       print STDERR "." if (!$verbose);
+               }
+       }
        print STDERR "done\n" if (!$verbose);
        print "Settings loaded, resetting board...\n";
        my $reqstr='<?XML version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="boardreset"></REQ></RMCSEQ>';