X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/75085d94afa9ad53ae3ac294af7119712b4789e7..c9427cf83b4389d0a3f03844c55ae990d5bec6f3:/rsbs2.pl
diff --git a/rsbs2.pl b/rsbs2.pl
index 2d7ec2a..debcc87 100755
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -151,7 +151,7 @@ sub _req {
$request->content($xml);
$response = $ua->request($request);
die("Error in request: " . $response->status_line . "\n") unless ($response->is_success);
- XMLin($response->content);
+ XMLin($response->content, SuppressEmpty => '');
}
sub _getprop {
@@ -279,12 +279,78 @@ sub show_all_vars {
}
}
+sub usrlist {
+ my $reqstr = '';
+ my $res = _req($reqstr);
+ my @users = ();
+
+ if ($res->{RESP}->{RC} ne '0x0') {
+ print "FAILED:".$res->{RESP}->{RC}."\n";
+ ();
+ } else {
+ 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 = '';
+ my $res = _req($reqstr)->{RESP}->{USER}->{PROP};
+
+ $res;
+}
+
+sub usradd {
+ my $usr = shift;
+
+ my $reqstr='';
+ 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='';
+ 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=''.$value.'';
+ $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=''.${destination_ip}.''.${bcast}.'FALSE';
- $res = _req($reqstr);
+ my $reqstr=''.${destination_ip}.''.${bcast}.'FALSE';
+ my $res = _req($reqstr);
if ($res->{RESP}->{RC} ne '0x0') {
print "FAILED:".$res->{RESP}->{RC}."\n";
return;
@@ -332,26 +398,34 @@ sub login {
$sid;
}
-open(INIFILE,"<$ENV{HOME}/.rsbs2rc") || die("can't open config: $ENV{HOME}/.rsbs2rc: $!");
-my %Config = ();
-my @sections = ();
-while() {
- chomp;
+sub read_inifile {
+ my $filename = shift;
- next if (m/^#/);
-
- if (m/^\s*\[(.*)\]\s*$/) {
- push @sections, $1;
- next;
- }
-
- 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() {
+ 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;
@@ -434,7 +508,7 @@ while (defined($ARGV[0])) {
}
}
-if ($valid_arg && (!defined(${$Config{$hostalias}}{'host'}))) {
+if ($valid_arg && (!defined($Config{$hostalias}))) {
$valid_arg = 0;
}
@@ -454,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";
@@ -492,15 +566,11 @@ if (@sprop) {
if ($save ne '') {
my @dontsave = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX
GATEWAY IP_ADDRESS NETMASK TFTP_FIRMWARE_FILE TFTP_ADDR_FIRMWARE
- ENABLE_DHCP HELP_LOCATION HELP_LOCATION PPP_PORT PPP2_INIT PPP2_PORT
- SERVER_ID SNMP_SERVER_1 SNMP_SERVER_2 SNMP_SERVER_3 SNMP_SERVER_4
- SNMP_SERVER_5 SNMP_SERVER_6 SNMP_SERVER_7 SERVER_AD_NAME
- SERVER_AD_NAME2 SERVER_AD_NAME3 SERVER_AD_NAME4 SERVER_MAC_ADDRESS
- SERVER_MAC_ADDRESS2 SERVER_MAC_ADDRESS3 SERVER_MAC_ADDRESS4
- MAC_ADDRESS LAST_CARD_NAME LAST_ENABLE_DHCP LAST_GATEWAY
+ ENABLE_DHCP MAC_ADDRESS LAST_CARD_NAME LAST_ENABLE_DHCP LAST_GATEWAY
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));
@@ -511,20 +581,40 @@ if ($save ne '') {
print SAVEFILE "${ts}=".$phash->{VAL}."\n";
print STDERR "." if (!$verbose);
}
+ foreach my $usr (usrlist()) {
+ 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() {
- 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='';