===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.3
retrieving revision 1.7
diff -u -r1.3 -r1.7
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2005/11/16 20:48:48	1.3
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2005/11/17 20:09:45	1.7
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: update_trango.pl,v 1.2 2005/11/16 05:26:37 andrew Exp $
+# $RedRiver: update_trango.pl,v 1.6 2005/11/17 00:40:06 andrew Exp $
 ########################################################################
 # update_trango.pl *** Updates trango foxes with a new firmware
 # 
@@ -10,71 +10,95 @@
 
 use Net::Telnet;
 use Net::TFTP;
+use Fcntl ':flock'; # import LOCK_* constants
 #use YAML;
 
 
-my $config_file = shift || 'fox53.conf';
+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 $MYLOG;  # file handle for logging so we don't have to close and open it all the time
+END {
+  if ($MYLOG) {
+    mylog("Closing log ($log_file)");
+    close $MYLOG;
+  }
+}
 
 
 
 
+
+
+
+
 foreach my $fox (@{ $conf->{'ips'} }) {
-  print STDERR "Updating: $fox\n";
+  mylog("Updating: $fox", LOG_SAVE);
 
   ## Connect and login.
   my $host = new Net::Telnet (Timeout => 5,
                               Prompt => '/#> *$/');
-  print "Connecting to $fox\n";
-  $host->open($fox);
+  mylog("Connecting to $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 =~ 
     /Welcome to Trango Broadband Wireless (\w+)-(.+)$/i;
 
   if ($type ne $conf->{'type'}) {
-    print STDERR "Wrong type of unit ('$type' should be '$conf->{'type'}')\n";
+    mylog("Wrong type of unit ('$type' should be '$conf->{'type'}')", LOG_SAVE);
     $host->close;
     next;
   }
 
   if ($version eq $conf->{'ver'}) {
-    print STDERR "Already up to date with firmware version '$version'\n";
+    mylog("Already up to date with firmware version '$version'", LOG_SAVE);
     $host->close;
     next;
   }
 
-  print "Logging in\n";
+  mylog("Logging in");
   $host->print($conf->{'password'});
-  $host->waitfor(
+  unless ($host->waitfor(
     -match => $host->prompt,
     -errmode => "return",
-  ) or die "login ($fox) failed: ", $host->lastline;
+  ) ) {
+    mylog("login ($fox) failed: " . $host->lastline);
+    next;
+  }
 
 
-  print "Sending commands\n";
+  mylog("Sending commands");
   ## Send commands
   if ( upload($host, $fox, $conf->{'file_name'}) ) {
-    print "Rebooting\n";
+    mylog("Rebooting");
     $host->print("reboot\n");
     $host->getline;
   } else {
-    print "Exiting\n";
+    mylog("Exiting");
     $host->print("exit\n");
     $host->getline;
   }
   $host->close;
+  mylog("", LOG_SAVE);
 }
 
 sub upload
@@ -83,31 +107,31 @@
   my $fox  = shift;
   my $file = shift;
 
-  print "Getting current version\n";
+  mylog("Getting current version");
   my $ver = get_ver($host);
 
   if (
     $ver->{'Firmware Version'}  eq $conf->{'ver'} && 
     $ver->{'Firmware Checksum'} eq $conf->{'cksum'}
   ) {
-    print STDERR "Already updated!";
+    mylog("Already updated!", LOG_SAVE);
     return 1;
   }
 
   my $try = 0;
   while (1) {
     if ($try >= $max_tries) {
-      print STDERR "Couldn't update in $max_tries tries!";
+      mylog("Couldn't update in $max_tries tries!");
       return undef;
     }
     $try++;
 
     #sysinfo($host);
     
-    print "Enabling TFTPd\n";
+    mylog("Enabling TFTPd");
     enable_tftpd($host) || die "Couldn't enable tftpd";
 
-    print "Uploading file\n";
+    mylog("Uploading file ($file)");
     # use tftp to push the file up
     my $tftp = Net::TFTP->new($fox, Mode => 'octet');
 
@@ -120,25 +144,31 @@
     #my @lines = $host->getlines;
     #print Dump \@lines;
     
-    print "Checking upload\n";
+    mylog("Checking upload ($conf->{'file_cksum'})");
     my $results = check_tftpd($host);
     # check the 'File Length' against ???
     if ( $results->{'File Checksum'} ne $conf->{'file_cksum'}) {
-      print STDERR "File checksum does not match config file!";
+      mylog("File checksum does not match config file!", LOG_SAVE);
       next;
-    }
+    } 
+    mylog("File checksum ($results->{'File Checksum'}) " . 
+          "matches ($conf->{'file_cksum'})");
 
     if ($results->{'File Length'}   !~ /^$conf->{'file_size'} bytes/) {
-      print STDERR "File length does not match config file!";
+      mylog("File length does not match config file!", LOG_SAVE);
       next;
     }
+    mylog("File length ($results->{'File Length'}) " . 
+          "matches ($conf->{'file_size'})");
 
     if ( uc($results->{'File Name'}) ne uc($conf->{'file_name'}) ) {
-      print STDERR "File name does not match config file!";
+      mylog("File name does not match config file!", LOG_SAVE);
       next;
     }
+    mylog("File name ($results->{'File Name'}) " . 
+          "matches ($conf->{'file_name'})");
 
-    print "Updating flash\n";
+    mylog("Updating flash (new checksum '$conf->{'cksum'}')");
     $results = updateflash(
       $host, $ver->{'Firmware Checksum'}, $conf->{'cksum'}
     ) or die "Couldn't update flash: " . $host->lastline;
@@ -146,11 +176,13 @@
       defined $results->{'Checksum'} && 
       $results->{'Checksum'} eq $conf->{'cksum'}
     ) {
-      print STDERR "Saved checksum does not match config file!";
+      mylog("Saved checksum does not match config file!", LOG_SAVE);
       next;
     }
+    mylog("Uploaded checksum ($results->{'Checksum'}) " . 
+          "matches ($conf->{'cksum'})");
     
-    print STDERR "Successfully updated!\n";
+    mylog("Successfully updated!", LOG_SAVE);
     return 1;
   }
 }
@@ -301,7 +333,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;
 
@@ -325,5 +361,66 @@
       if (not exists $conf{$_});
   }
 
+  #print Dump \%conf;
+  #exit;
   return \%conf;
+}
+
+sub mylog
+{
+  my $thing = shift;
+  chomp $thing;
+  my $save = shift;
+
+  print $thing, "\n";
+
+  if (defined $save && $save == LOG_SAVE) {
+    unless ($MYLOG) {
+      open ($MYLOG, '>>', $log_file) 
+        or die "Couldn't open logfile!\n";
+      my $ofh = select $MYLOG;
+      $|=1;
+      select $ofh;
+      mylog("Opened log ($log_file)");
+    }
+
+    flock($MYLOG, LOCK_EX);
+    print $MYLOG (scalar gmtime), "\t", $thing, "\n" 
+      or die "Couldn't print to MYLOG: $!";
+    flock($MYLOG, LOCK_UN);
+  }
+}
+
+sub GetLogName
+{
+  my $prefix  = shift || die "Invalid prefix passed for log";
+
+  my $logdate = GetLogDate();
+  my $logver  = 0;
+  my $logname;
+
+  do {
+    $logname = $prefix . $logdate . sprintf("%02d", $logver) . '.log';
+    $logver++;
+  } until (not -e $logname);
+
+  return $logname;
+}
+
+sub GetLogDate
+{
+  my ($sec,$min,$hour,$mday,$mon,$year,,,) = localtime();
+
+  $mon++;
+  $year += 1900;
+
+  if ($min  < 10) { $min  = "0$min"  }
+  if ($sec  < 10) { $sec  = "0$sec"  }
+  if ($hour < 10) { $hour = "0$hour" }
+  if ($mday < 10) { $mday = "0$mday" }
+  if ($mon  < 10) { $mon  = "0$mon"  }
+
+  my $time = $year . $mon . $mday;
+
+  return $time;
 }