===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -r1.5 -r1.8
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2005/11/16 21:39:51	1.5
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2005/11/17 20:20:59	1.8
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: update_trango.pl,v 1.4 2005/11/16 21:13:39 andrew Exp $
+# $RedRiver: update_trango.pl,v 1.7 2005/11/17 20:09:45 andrew Exp $
 ########################################################################
 # update_trango.pl *** Updates trango foxes with a new firmware
 # 
@@ -12,16 +12,19 @@
 use Net::TFTP;
 use Fcntl ':flock'; # import LOCK_* constants
 #use YAML;
+use constant LOG_SAVE => 1;
 
 
 my $config_file = shift || 'update_trango.conf';
-my $conf = read_conf($config_file);
-
 my $max_tries = 1;
 
-my $log_file =  GetLogName('UT');
-use constant LOG_SAVE => 1;
 
+
+
+
+
+
+my $log_file =  GetLogName('UT');
 my $MYLOG;  # file handle for logging so we don't have to close and open it all the time
 END {
   if ($MYLOG) {
@@ -31,12 +34,22 @@
 }
 
 
+mylog("Reading config file '$config_file'", LOG_SAVE);
+my $conf = read_conf($config_file);
 
+mylog("  Hardware Type: $conf->{'type'}", LOG_SAVE);
+mylog("  File Name:     $conf->{'file_name'}", LOG_SAVE);
+mylog("  File Size:     $conf->{'file_size'}", LOG_SAVE);
+mylog("  File Checksum: $conf->{'file_cksum'}", LOG_SAVE);
+mylog("  FW Version:    $conf->{'ver'}", LOG_SAVE);
+mylog("  FW Checksum:   $conf->{'cksum'}", LOG_SAVE);
+mylog("", LOG_SAVE);
 
 
 
 
 
+
 foreach my $fox (@{ $conf->{'ips'} }) {
   mylog("Updating: $fox", LOG_SAVE);
 
@@ -44,14 +57,20 @@
   my $host = new Net::Telnet (Timeout => 5,
                               Prompt => '/#> *$/');
   mylog("Connecting to $fox");
-  $host->open($fox);
+  unless ( $host->open( Host => $fox, Errmode => 'return') ) {
+    mylog("Couldn't connect to $fox.  Connection timed out.", LOG_SAVE);
+    next;
+  }
   $host->dump_log('dump.log');
 
   ## Login to remote host.
-  $host->waitfor(
+  unless ($host->waitfor(
     -match => '/password: ?$/i',
     -errmode => "return",
-  ) or die "problem connecting to host ($fox): ", $host->lastline;
+  ) ) {
+    mylog("problem connecting to host ($fox): " . $host->lastline, LOG_SAVE);
+    next;
+  }
 
   my $login_banner = $host->lastline;
   my ($type, $version) = $login_banner =~ 
@@ -327,7 +346,11 @@
     next if /^#/;
     next if /^$/;
     if ($in_ip_list) {
-      push @{ $conf{'ips'} }, $_;
+      if (/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.)(\d{1,3})-(\d{1,3})/) {
+        push @{ $conf{'ips'} }, $1 . $_ for ($2..$3);
+      } else {
+        push @{ $conf{'ips'} }, $_;
+      }
     } else {
       my ($key, $val) = split /\s+/, $_, 2;
 
@@ -351,6 +374,8 @@
       if (not exists $conf{$_});
   }
 
+  #print Dump \%conf;
+  #exit;
   return \%conf;
 }