X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/5a8d9e2ebbfa968d6ebfd9cec120de7fe856169c..e726b380eaf48b6af8b06fe28383a183f35ceace:/rsbs2.pl

diff --git a/rsbs2.pl b/rsbs2.pl
index a78ee76..a481f45 100755
--- a/rsbs2.pl
+++ b/rsbs2.pl
@@ -10,12 +10,12 @@ my $ua = LWP::UserAgent->new;
 my $sid;
 my $host;
 my $poweronms=200;
-my $poweroffms=4500;
+my $poweroffms=5000;
 my $verbose = 0;
 
 my @fw_vars = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX GATEWAY
 	IP_ADDRESS NETMASK TFTP_FIRMWARE_FILE TFTP_ADDR_FIRMWARE ENABLE_DHCP
-	ENABLE_DNS DNS_SERVER DNS_DOMAIN_NAME DHCP_CONFIGURE_DNS
+	ENABLE_DNS DNS_SERVER DNS_DOMAIN_NAME
 	ACCESS_CONTROL_SERVER_1 ACCESS_CONTROL_SERVER_2 ACCESS_CONTROL_SERVERS
 	ACPI_DISABLE_BIOS_SCAN ACPI_FORCE_RSDP_ADDRESS ACPI_FORCE_RSDT_ADDRESS
 	ACPI_RSDP_BIOS_ROM_ADDRESS ACPI_SCAN_DELAY_SECONDS AMR_AUTH_METHOD
@@ -35,10 +35,10 @@ my @fw_vars = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX GATEWAY
 	CONSOLE_VIDEO_PARAM_MODE CONTACT CONTACT_PHONE CRIT_TEMP_SHUTDOWN
 	CRIT_VOLT_SHUTDOWN DHCP_ADD_EXTENSION DHCP_ADD_SERIAL
 	DHCP_CONFIGURE_DNS DHCP_HOSTNAME_EXT DHCP_SERVER DHCP_USE_CARDNAME
-	DIAG_URL DNS_DOMAIN_NAME DNS_SERVER ENABLE_ANON_IPMI ENABLE_ANON_PCI
+	DIAG_URL ENABLE_ANON_IPMI ENABLE_ANON_PCI
 	ENABLE_ANON_WEB ENABLE_AVR_CHIP_DETECT ENABLE_BMC_AUTODETECT
 	ENABLE_BMC_TIMESYNC ENABLE_CRTC_FETCH ENABLE_DHCP ENABLE_DHCP_HOSTNAME
-	ENABLE_DNS ENABLE_DS_CONNECTIVITY ENABLE_IO_UART_DECODER ENABLE_LAN_100
+	ENABLE_DS_CONNECTIVITY ENABLE_IO_UART_DECODER ENABLE_LAN_100
 	ENABLE_LAN_AUTONEG ENABLE_LAN_FDUPLEX ENABLE_MEM_UART_DECODER
 	ENABLE_PPP ENABLE_REMOTE_FLOPPY_BOOT ENABLE_SELF_DELETE
 	ENABLE_SERIAL_DBG ETHDRIVER_SID EXPROM_BANNER EXPROM_EBDA_COMPATIBILITY
@@ -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 {
@@ -159,6 +159,8 @@ sub _getprop {
 
 	my $reqstr='<?xml version="1.0"?><?RMCXML version="1.0"?><RMCSEQ><REQ CMD="propget"><PROPLIST><PROP NAME="'.$property.'"/></PROPLIST></REQ></RMCSEQ>';
 	my $resp = _req($reqstr);
+
+	print "get: ${property}\n" if ($verbose);
 	
 	if ($resp->{RESP}->{RC} ne '0x0') {
 		$resp->{RESP}->{RC};
@@ -194,8 +196,10 @@ sub setprop {
 
 	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;
 	}
 }
 
@@ -430,7 +434,7 @@ while (defined($ARGV[0])) {
 	}
 }
 
-if (!defined(${$Config{$hostalias}}{'host'})) {
+if ($valid_arg && (!defined(${$Config{$hostalias}}{'host'}))) {
 	$valid_arg = 0;
 }
 
@@ -478,16 +482,49 @@ if (@gprop) {
 if (@sprop) {
 	foreach my $p (@sprop) {
 		(my $pr, $v) = split(/=/,$p,2);
-		setprop($pr, $v);
+		my $oldval = setprop($pr, $v);
+		if (defined($oldval)) {
+			print "${pr}: ${oldval} -> ${v}\n" if (!$verbose);
+		}
 	}
 }
 
 if ($save ne '') {
-	print "save: implement me!\n";
+	my @dontsave = qw(ENABLE_LAN_AUTONEG ENABLE_LAN_100 ENABLE_LAN_FDUPLEX
+	GATEWAY IP_ADDRESS NETMASK TFTP_FIRMWARE_FILE TFTP_ADDR_FIRMWARE
+	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 STDERR "saving" if (!$verbose);
+	foreach my $ts (@fw_vars) {
+		next if (grep(/^${ts}$/, @dontsave));
+
+		my $phash = _getprop($ts)->{RESP}->{PROPLIST}->{PROP};
+		next if ($phash->{PERMS} ne 'RW');
+		
+		print SAVEFILE "${ts}=".$phash->{VAL}."\n";
+		print STDERR "." if (!$verbose);
+	}
+	close(SAVEFILE);
+	print STDERR "done\n" if (!$verbose);
 }
 
 if ($load ne '') {
-	print "load: implement me!\n";
+	open (LOADFILE, "<${load}") || die "Error opening load-file: $!\n";
+	print STDERR "loading" if (!$verbose);
+	while(<LOADFILE>) {
+		chomp;
+		(my $p, my $v) = split(/=/, $_);
+		setprop($p, $v);
+		print STDERR "." if (!$verbose);
+	}
+	close(LOADFILE);
+	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>';
+	_req($reqstr);
+	exit(0);
 }
 
 if ($enable_debug ne '') {