===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.8
retrieving revision 1.23
diff -u -r1.8 -r1.23
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2005/11/17 20:20:59	1.8
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/01 18:44:30	1.23
@@ -1,439 +1,339 @@
-#!/usr/bin/perl
-# $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
-# 
-# 2005.11.15 #*#*# andrew fresh <andrew@mad-techies.org>
-########################################################################
-use strict;
-use warnings;
-
-use Net::Telnet;
-use Net::TFTP;
-use Fcntl ':flock'; # import LOCK_* constants
-#use YAML;
-use constant LOG_SAVE => 1;
-
-
-my $config_file = shift || 'update_trango.conf';
-my $max_tries = 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) {
-    mylog("Closing log ($log_file)");
-    close $MYLOG;
-  }
-}
-
-
-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);
-
-  ## Connect and login.
-  my $host = new Net::Telnet (Timeout => 5,
-                              Prompt => '/#> *$/');
-  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.
-  unless ($host->waitfor(
-    -match => '/password: ?$/i',
-    -errmode => "return",
-  ) ) {
-    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'}) {
-    mylog("Wrong type of unit ('$type' should be '$conf->{'type'}')", LOG_SAVE);
-    $host->close;
-    next;
-  }
-
-  if ($version eq $conf->{'ver'}) {
-    mylog("Already up to date with firmware version '$version'", LOG_SAVE);
-    $host->close;
-    next;
-  }
-
-  mylog("Logging in");
-  $host->print($conf->{'password'});
-  unless ($host->waitfor(
-    -match => $host->prompt,
-    -errmode => "return",
-  ) ) {
-    mylog("login ($fox) failed: " . $host->lastline);
-    next;
-  }
-
-
-  mylog("Sending commands");
-  ## Send commands
-  if ( upload($host, $fox, $conf->{'file_name'}) ) {
-    mylog("Rebooting");
-    $host->print("reboot\n");
-    $host->getline;
-  } else {
-    mylog("Exiting");
-    $host->print("exit\n");
-    $host->getline;
-  }
-  $host->close;
-  mylog("", LOG_SAVE);
-}
-
-sub upload
-{
-  my $host = shift;
-  my $fox  = shift;
-  my $file = shift;
-
-  mylog("Getting current version");
-  my $ver = get_ver($host);
-
-  if (
-    $ver->{'Firmware Version'}  eq $conf->{'ver'} && 
-    $ver->{'Firmware Checksum'} eq $conf->{'cksum'}
-  ) {
-    mylog("Already updated!", LOG_SAVE);
-    return 1;
-  }
-
-  my $try = 0;
-  while (1) {
-    if ($try >= $max_tries) {
-      mylog("Couldn't update in $max_tries tries!");
-      return undef;
-    }
-    $try++;
-
-    #sysinfo($host);
-    
-    mylog("Enabling TFTPd");
-    enable_tftpd($host) || die "Couldn't enable tftpd";
-
-    mylog("Uploading file ($file)");
-    # 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;
-    
-    mylog("Checking upload ($conf->{'file_cksum'})");
-    my $results = check_tftpd($host);
-    # check the 'File Length' against ???
-    if ( $results->{'File Checksum'} ne $conf->{'file_cksum'}) {
-      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/) {
-      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'}) ) {
-      mylog("File name does not match config file!", LOG_SAVE);
-      next;
-    }
-    mylog("File name ($results->{'File Name'}) " . 
-          "matches ($conf->{'file_name'})");
-
-    mylog("Updating flash (new checksum '$conf->{'cksum'}')");
-    $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'}
-    ) {
-      mylog("Saved checksum does not match config file!", LOG_SAVE);
-      next;
-    }
-    mylog("Uploaded checksum ($results->{'Checksum'}) " . 
-          "matches ($conf->{'cksum'})");
-    
-    mylog("Successfully updated!", LOG_SAVE);
-    return 1;
-  }
-}
-
-sub get_ver
-{
-  my $host = shift;
-  return cmd($host, 'ver');
-}
-
-sub enable_tftpd
-{
-  my $host = shift;
-
-  my $vals = cmd($host, 'tftpd on', 'Success.');
-
-  if ($vals->{'Tftpd'} eq 'listen') {
-    return $vals;
-  } else {
-    return undef;
-  }
-}
-
-sub check_tftpd
-{
-  my $host = shift;
-  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 => $string, Timeout => $timeout);
-
-  my $vals = decode_lines(@lines);
-
-  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
-{
-  my @lines = @_;
-
-  my %conf;
-
-  my $key = '';
-  my $val = '';
-  my $in_key = 0;
-  my $in_val = 0;
-
-  foreach my $line (@lines) {
-    my @chars = split //, $line;
-
-    my $last_key = '';
-    foreach my $c (@chars) {
-
-      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 = '';
-        }
-
-      } elsif ($c eq ']') {
-        $in_val = 1;
-        $in_key = 0;
-        $c = shift @chars;
-
-      } elsif ($in_key) {
-        $key .= $c;
-
-      } elsif ($in_val) {
-        $val .= $c;
-      }
-    }
-  }
-  #print Dump \%conf;
-
-  if (%conf) {
-    return \%conf;
-  } else {
-    return \@lines;
-  }
-}
-
-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) {
-      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;
-
-      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{$_});
-  }
-
-  #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;
-}
+#!/usr/bin/perl
+# $RedRiver: update_trango.pl,v 1.22 2007/02/01 17:58:33 andrew Exp $
+########################################################################
+# update_trango.pl *** Updates trango foxes with a new firmware
+# 
+# 2005.11.15 #*#*# andrew fresh <andrew@mad-techies.org>
+########################################################################
+use strict;
+use warnings;
+
+use YAML qw/ LoadFile /;
+use Net::TFTP;
+use lib '.';
+use Net::Telnet::Trango;
+
+my $config_file = shift || 'update_trango.yaml';
+my $max_tries = 3;
+
+my $l = Mylogger->new( { log_prefix => 'UT' } );
+
+$l->sp("Reading config file '$config_file'");
+my $conf = LoadFile($config_file);
+
+my @foxes = (
+'10.100.1.2',
+'10.100.2.2',
+'10.100.3.2',
+'10.100.4.2',
+);
+
+foreach my $fox (@foxes) {
+  $l->sp("Checking: $fox");
+  my $needs_reboot = 0;
+
+  ## Connect and login.
+  my $t = new Net::Telnet::Trango (
+    Timeout => 5,
+    Errmode => 'return',
+  ) or die "Couldn't make new connection: $!";
+  $l->p("Connecting to $fox");
+  unless ( $t->open($fox) ) {
+    $l->sp("Error connecting: $!");
+    next;
+  }
+
+  foreach my $firmware_type ('Firmware', 'FPGA') {
+
+    if (! exists $conf->{$firmware_type}) {
+	  $l->s("No configs for '$firmware_type'");
+	  $t->close();
+	  next;
+	}
+
+    my $host_type = $t->host_type;
+    if ($firmware_type eq 'FPGA') {
+      $host_type =~ s/\s.*$//;
+    }
+
+    if (! exists $conf->{$firmware_type}->{$host_type}) {
+	  $l->sp("No '$firmware_type' config for type $host_type");
+	  $t->close();
+	  next;
+	}
+
+    if (! $t->logged_in) {
+      $l->p("Logging in");
+      $t->login($conf->{general}->{'password'});
+      unless ($t->logged_in) {
+        $l->p('Failed!');
+        $t->bye();
+        next;
+      }
+    }
+
+	foreach my $k (keys %{ $conf->{general} }) {
+	  $conf->{$firmware_type}->{$host_type}->{$k} ||= $conf->{general}->{$k};
+    }
+	$conf->{$firmware_type}->{$host_type}->{firmware_type} ||= $firmware_type;
+	$conf->{$firmware_type}->{$host_type}->{type} ||= $host_type;
+
+    $l->sp("$host_type $firmware_type");
+    $l->p("Sending commands");
+    ## Send commands
+    my $rc = upload($t, $conf->{$firmware_type}->{$host_type});
+	if ($rc) {
+      $l->sp("Successfull!");
+	  $needs_reboot = 1;
+    } elsif (defined $rc) {
+	  $l->sp("Already up to date");
+    } else {
+	  $l->sp("Failed");
+	  $t->bye;
+	  next;
+    }
+  
+  }
+
+  if ($needs_reboot) {
+    $l->sp("Rebooting $fox");
+    $t->reboot;
+  } else {
+    $l->sp("Bye $fox");
+    $t->bye();
+  }
+  $l->sp("");
+}
+
+sub upload
+{
+  my $t    = shift;
+  my $conf = shift;
+
+  my $file = $conf->{firmware_path} . '/' . $conf->{file_name};
+
+  my $fw_type = $conf->{firmware_type};
+
+  my $ver = $t->ver;
+
+  if (
+    $ver->{$fw_type . ' Version'}  eq $conf->{'ver'} && 
+    $ver->{$fw_type . ' Checksum'} eq $conf->{'cksum'}
+  ) {
+    return 0;
+  }
+
+  $l->sp("Config information:");
+  $l->sp("  Hardware Type: $conf->{'type'}");
+  $l->sp("  File Name:     $conf->{'file_name'}");
+  $l->sp("  File Size:     $conf->{'file_size'}");
+  $l->sp("  File Checksum: $conf->{'file_cksum'}");
+  $l->sp("  Conf Version:  $conf->{'ver'}");
+  $l->sp("  Cur  Version:  $ver->{$fw_type . ' Version'}");
+  $l->sp("  Conf Checksum: $conf->{'cksum'}");
+  $l->sp("  Cur  Checksum: $ver->{$fw_type . ' Checksum'}");
+
+  $l->sp("Updating");
+  my $try = 0;
+  while (1) {
+    if ($try >= $max_tries) {
+      $l->sp("Couldn't update in $max_tries tries!");
+      return;
+    }
+    $try++;
+
+    #sysinfo($self->{'_host'});
+    
+    $l->p("Enabling TFTPd");
+    unless ($t->enable_tftpd) {
+      $l->sp("Couldn't enable tftpd");
+      next;
+    }
+
+    $l->p("Uploading file ($file)");
+    # use tftp to push the file up
+    my $tftp = Net::TFTP->new($t->Host, Mode => 'octet');
+
+    unless ($tftp->put($file, $file)) {
+      $l->sp("Error uploading: " . $tftp->error);
+      next;
+    }
+
+    $l->p("Checking upload ($conf->{'file_cksum'})");
+    my $results = $t->tftpd;
+    # check the 'File Length' against ???
+    if ( $results->{'File Checksum'} ne $conf->{'file_cksum'}) {
+      $l->sp(
+        "File checksum '" . $results->{'File Checksum'} .
+        " does not match config file '" . $conf->{'file_cksum'} . "'!"
+      );
+      next;
+    } 
+    $l->p("File checksum matches . . . ");
+
+    if ($results->{'File Length'}   !~ /^$conf->{'file_size'} bytes/) {
+      $l->sp(
+        "File length '" . $results->{'File Length'} .
+        "does not match config file '" . $conf->{'file_size'} . " bytes'!"
+      );
+      next;
+    }
+    $l->p("File length matches . . . ");
+
+    if ( uc($results->{'File Name'}) ne uc($conf->{'file_name'}) ) {
+      $l->sp(
+        "File name '" . $results->{'File Name'} .
+        "' does not match config file '" . $conf->{'file_name'} . "'!"
+      );
+      next;
+    }
+    $l->p("File name  matches . . . ");
+
+    my $image_type = 'mainimage';
+    if ($fw_type eq 'FPGA') {
+      $image_type = 'fpgaimage';
+    }
+    $l->p("Updating $image_type (new checksum '$conf->{'cksum'}')");
+    unless ($results = $t->updateflash(
+      args => $image_type . ' ' . $ver->{$fw_type . ' Checksum'} . 
+              ' '          . $conf->{'cksum'},
+      Timeout => 90,
+    ) ) {
+      $l->sp("Couldn't update flash: $!");
+      next;
+    }
+
+    unless (
+      defined $results->{'Checksum'} && 
+      $results->{'Checksum'} eq $conf->{'cksum'}
+    ) {
+      $l->sp("Saved checksum " . $results->{'Checksum'} . " does not match config file " .  $conf->{'cksum'} . "!");
+      next;
+    }
+    $l->p("Uploaded checksum ($results->{'Checksum'}) " . 
+          "matches ($conf->{'cksum'})");
+    
+    $l->sp("Successfully updated!");
+    return 1;
+  }
+}
+
+package Mylogger;
+
+use Fcntl ':flock'; # import LOCK_* constants
+#use YAML;
+use constant LOG_PRINT => 128;
+use constant LOG_SAVE  =>  64;
+
+DESTROY {
+  my $self = shift;
+  if ($self->{'MYLOG'}) {
+    $self->p("Closing log ($self->{'log_path'}/$self->{'log_file'})");
+    close $self->{'MYLOG'};
+  }
+}
+
+sub new {
+  my $package = shift;
+  my $self = shift || {};
+
+  $self->{'base_path'}  ||= '.';
+  $self->{'log_path'}   ||= $self->{'base_path'};
+  $self->{'log_prefix'} ||= 'LOG';
+  $self->{'log_file'}   ||= GetLogName(
+    $self->{'log_prefix'}, 
+    $self->{'log_path'}
+  );
+  bless $self, $package;
+}
+
+sub s
+{
+  my $self = shift;
+  my $m = shift;
+  return $self->mylog($m, LOG_SAVE);
+}
+
+sub p
+{
+  my $self = shift;
+  my $m = shift;
+  return $self->mylog($m, LOG_PRINT);
+}
+
+sub sp
+{
+  my $self = shift;
+  my $m = shift;
+  return $self->mylog($m, LOG_SAVE | LOG_PRINT);
+}
+
+sub mylog
+{
+  my $self = shift;
+
+  my $thing = shift;
+  chomp $thing;
+
+  my $which = shift;
+
+  my $MYLOG;
+  if ($which & LOG_PRINT) {
+    print $thing, "\n";
+  }
+
+  if ($which & LOG_SAVE) {
+    if ($self->{'MYLOG'}) {
+      $MYLOG = $self->{'MYLOG'};
+    } else {
+      unless ($MYLOG) {
+		open ($MYLOG, '>>', $self->{'log_path'} . '/' . $self->{'log_file'}) 
+          or die "Couldn't open logfile!\n";
+        my $ofh = select $MYLOG;
+        $|=1;
+        select $ofh;
+        $self->{'MYLOG'} = $MYLOG;
+
+        $self->p("Opened log ($self->{'log_path'}/$self->{'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;
+}