===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2005/11/16 05:26:37	1.2
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2005/11/16 20:48:48	1.3
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: update_trango.pl,v 1.1 2005/11/16 03:28:42 andrew Exp $
+# $RedRiver: update_trango.pl,v 1.2 2005/11/16 05:26:37 andrew Exp $
 ########################################################################
 # update_trango.pl *** Updates trango foxes with a new firmware
 # 
@@ -10,33 +10,26 @@
 
 use Net::Telnet;
 use Net::TFTP;
-use YAML;
+#use YAML;
 
-my @Foxes = (
-  '10.100.3.8',
-#  '10.100.3.11',
-#  '10.100.3.12',
-#  '10.100.3.13',
-);
 
-my $password = 'password';
+my $config_file = shift || 'fox53.conf';
+my $conf = read_conf($config_file);
 
-my $new_file  = 'fsu53_2p0a2H0003D05101403.s19';
-my $new_ver   = 'FSU 1p06H0003D04111001';
-my $new_cksum = 'x1D28DCC4';
+my $max_tries = 1;
 
-my $max_tries = 3;
 
 
 
 
 
+foreach my $fox (@{ $conf->{'ips'} }) {
+  print STDERR "Updating: $fox\n";
 
-foreach my $fox (@Foxes) {
-  print "getting temp from Fox: $fox\n";
   ## Connect and login.
   my $host = new Net::Telnet (Timeout => 5,
                               Prompt => '/#> *$/');
+  print "Connecting to $fox\n";
   $host->open($fox);
   $host->dump_log('dump.log');
 
@@ -45,18 +38,41 @@
     -match => '/password: ?$/i',
     -errmode => "return",
   ) or die "problem connecting to host ($fox): ", $host->lastline;
-  $host->print($password);
+
+  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";
+    $host->close;
+    next;
+  }
+
+  if ($version eq $conf->{'ver'}) {
+    print STDERR "Already up to date with firmware version '$version'\n";
+    $host->close;
+    next;
+  }
+
+  print "Logging in\n";
+  $host->print($conf->{'password'});
   $host->waitfor(
     -match => $host->prompt,
     -errmode => "return",
   ) or die "login ($fox) failed: ", $host->lastline;
-  
 
+
+  print "Sending commands\n";
   ## Send commands
-  if ( upload($host, $new_file) ) {
-    $host->send('reboot');
+  if ( upload($host, $fox, $conf->{'file_name'}) ) {
+    print "Rebooting\n";
+    $host->print("reboot\n");
+    $host->getline;
   } else {
-    $host->send('exit');
+    print "Exiting\n";
+    $host->print("exit\n");
+    $host->getline;
   }
   $host->close;
 }
@@ -64,46 +80,78 @@
 sub upload
 {
   my $host = shift;
+  my $fox  = shift;
   my $file = shift;
+
+  print "Getting current version\n";
   my $ver = get_ver($host);
 
   if (
-    $ver->{'Firmware Version'} eq $new_ver && 
-    $ver->{'Checksum'}         eq $new_cksum
+    $ver->{'Firmware Version'}  eq $conf->{'ver'} && 
+    $ver->{'Firmware Checksum'} eq $conf->{'cksum'}
   ) {
-    print "Already updated!";
+    print STDERR "Already updated!";
     return 1;
   }
 
   my $try = 0;
   while (1) {
+    if ($try >= $max_tries) {
+      print STDERR "Couldn't update in $max_tries tries!";
+      return undef;
+    }
     $try++;
 
+    #sysinfo($host);
+    
+    print "Enabling TFTPd\n";
     enable_tftpd($host) || die "Couldn't enable tftpd";
 
+    print "Uploading file\n";
     # use tftp to push the file up
+    my $tftp = Net::TFTP->new($fox, Mode => 'octet');
 
+    $tftp->put($file, $file) 
+      or die "Error uploading: " . $tftp->error;
+
     # waitfor some sort of output
     # make sure it says 'Success.' otherwise error
+    #print "LAST: " . $host->lastline;
+    #my @lines = $host->getlines;
+    #print Dump \@lines;
     
+    print "Checking upload\n";
     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!";
+      next;
+    }
 
-    # 'updateflash mainimage $old_cksum $new_cksum'
-    # OR
-    # 'save mainimage [current firmware checksum] [new firmware checksum]'
-    # waitfor a prompt, look at the end of the output for 'Success.' otherwise
-    # error.
-    # decode_lines to get 'Checksum' to see if it matches $new_cksum
-    
-    $ver = get_ver($host);
-    # check versions
-    
+    if ($results->{'File Length'}   !~ /^$conf->{'file_size'} bytes/) {
+      print STDERR "File length does not match config file!";
+      next;
+    }
 
-    if ($try >= $max_tries) {
-      warn "Couldn't update in $max_tries tries!";
-      return undef;
+    if ( uc($results->{'File Name'}) ne uc($conf->{'file_name'}) ) {
+      print STDERR "File name does not match config file!";
+      next;
     }
+
+    print "Updating flash\n";
+    $results = updateflash(
+      $host, $ver->{'Firmware Checksum'}, $conf->{'cksum'}
+    ) or die "Couldn't update flash: " . $host->lastline;
+    unless (
+      defined $results->{'Checksum'} && 
+      $results->{'Checksum'} eq $conf->{'cksum'}
+    ) {
+      print STDERR "Saved checksum does not match config file!";
+      next;
+    }
+    
+    print STDERR "Successfully updated!\n";
+    return 1;
   }
 }
 
@@ -117,10 +165,10 @@
 {
   my $host = shift;
 
-  my $vals = cmd($host, 'tftpd on');
+  my $vals = cmd($host, 'tftpd on', 'Success.');
 
   if ($vals->{'Tftpd'} eq 'listen') {
-    return 1;
+    return $vals;
   } else {
     return undef;
   }
@@ -129,23 +177,53 @@
 sub check_tftpd
 {
   my $host = shift;
-  return cmd($host, 'tftpd');
+  return cmd($host, 'tftpd', 'Success.');
 }
 
+sub sysinfo
+{
+  my $host = shift;
+  return cmd($host, 'sysinfo', 'Success.');
+}
+
+sub updateflash
+{
+  my $host = shift;
+  my $old = shift;
+  my $new = shift;
+
+  return undef unless $new;
+
+  return cmd($host, "updateflash mainimage $old $new", 'Success.', 90);
+}
+
 sub cmd
 {
   my $host   = shift;
   my $string = shift;
+  my $expect_last = shift;
+  my $timeout = shift || 5;
 
-  my @lines = $host->cmd($string);
+  my @lines = $host->cmd(String => $string, Timeout => $timeout);
 
   my $vals = decode_lines(@lines);
-  return $vals;
+
+  my $last = $host->lastline;
+
+  unless ($expect_last) {
+    return $vals;
+  }
+
+  if ($last =~ /$expect_last$/) {
+    return $vals;
+  } else {
+    warn "Error with command ($string): $last";
+    return undef;
+  }
 }
 
 sub decode_lines
 {
-  ### XXX ver has 2 Checksums.  one for FPGA and one for Firmware.  DOH!
   my @lines = @_;
 
   my %conf;
@@ -158,15 +236,33 @@
   foreach my $line (@lines) {
     my @chars = split //, $line;
 
+    my $last_key = '';
     foreach my $c (@chars) {
-      next if $c eq "\r";
-      next if $c eq "\n";
 
-      if ($c eq '[') {
-        $in_key = 1;
-        $in_val = 0;
+      if ($c eq '[' || $c eq "\r" || $c eq "\n") {
+        if ($c eq '[') {
+          $in_key = 1;
+          $in_val = 0;
+        } else {
+          $in_key = 0;
+          $in_val = 0;
+        }
+
         if ($key) {
+          $key =~ s/^\s+//;
+          $key =~ s/\s+$//;
+
+          $val =~ s/^\s+//;
           $val =~ s/\s+$//;
+
+          if ($key eq 'Checksum' && $last_key) {
+            # Special case for these bastids.
+            my $new = $last_key;
+            $new =~ s/\s+\S+$//;
+            $key = $new . " " . $key;
+          }
+
+          $last_key = $key;
           $conf{$key} = $val;
           $key = '';
           $val = '';
@@ -185,7 +281,7 @@
       }
     }
   }
-  print Dump \%conf;
+  #print Dump \%conf;
 
   if (%conf) {
     return \%conf;
@@ -194,3 +290,40 @@
   }
 }
 
+sub read_conf
+{
+  my $file = shift;
+  my %conf;
+  my $in_ip_list = 0;
+  open my $fh, $file or die "Couldn't open file $file: $!";
+  while (<$fh>) {
+    chomp;
+    next if /^#/;
+    next if /^$/;
+    if ($in_ip_list) {
+      push @{ $conf{'ips'} }, $_;
+    } else {
+      my ($key, $val) = split /\s+/, $_, 2;
+
+      if (lc($key) eq 'ips') {
+        $in_ip_list = 1;
+        next;
+      }
+
+      $conf{ lc($key) } = $val;
+    }
+  }
+  close $fh;
+
+  #print Dump \%conf;
+  foreach (
+    'password', 
+    'file_name', 'file_size', 'file_cksum', 
+    'ver', 'cksum', 'ips',
+  ) {
+    die "No $_ specified in config file!"
+      if (not exists $conf{$_});
+  }
+
+  return \%conf;
+}