===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.3
retrieving revision 1.15
diff -u -r1.3 -r1.15
--- 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/12/30 20:26:41	1.15
@@ -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.14 2005/12/30 19:26:06 andrew Exp $
 ########################################################################
 # update_trango.pl *** Updates trango foxes with a new firmware
 # 
@@ -8,15 +8,29 @@
 use strict;
 use warnings;
 
-use Net::Telnet;
 use Net::TFTP;
-#use YAML;
+use YAML;
+use lib '.';
+use Net::Telnet::Trango;
 
+my $config_file = shift || 'update_trango.conf';
+my $max_tries = 3;
 
-my $config_file = shift || 'fox53.conf';
+
+
+my $l = Mylogger->new( { log_prefix => 'UT' } );
+
+
+$l->sp("Reading config file '$config_file'");
 my $conf = read_conf($config_file);
 
-my $max_tries = 1;
+$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("  FW Version:    $conf->{'ver'}");
+$l->sp("  FW Checksum:   $conf->{'cksum'}");
+$l->sp("");
 
 
 
@@ -24,306 +38,323 @@
 
 
 foreach my $fox (@{ $conf->{'ips'} }) {
-  print STDERR "Updating: $fox\n";
+  $l->sp("Updating: $fox");
 
   ## Connect and login.
-  my $host = new Net::Telnet (Timeout => 5,
-                              Prompt => '/#> *$/');
-  print "Connecting to $fox\n";
-  $host->open($fox);
-  $host->dump_log('dump.log');
+  my $t = new Net::Telnet::Trango (
+    Timeout => 5,
+    Errmode => 'return',
+  ) or die "Couldn't make new connection: $!";
 
-  ## Login to remote host.
-  $host->waitfor(
-    -match => '/password: ?$/i',
-    -errmode => "return",
-  ) or die "problem connecting to host ($fox): ", $host->lastline;
+  $l->p("Connecting to $fox");
+  unless ( $t->open($fox) ) {
+    $l->sp("Error connecting: $!");
+    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";
-    $host->close;
+  if ($t->host_type ne $conf->{'type'}) {
+    $l->sp("Wrong type of unit ('$t->host_type' should be '$conf->{'type'}')");
+    $t->close;
     next;
   }
 
-  if ($version eq $conf->{'ver'}) {
-    print STDERR "Already up to date with firmware version '$version'\n";
-    $host->close;
+  if ($t->firmware_version eq $conf->{'ver'}) {
+    $l->sp("Already up to date with firmware version '$t->firmware_version'");
+    $t->close;
     next;
   }
 
-  print "Logging in\n";
-  $host->print($conf->{'password'});
-  $host->waitfor(
-    -match => $host->prompt,
-    -errmode => "return",
-  ) or die "login ($fox) failed: ", $host->lastline;
+  $l->p("Logging in");
+  $t->login($conf->{'password'}) || die "Couldn't login: $!";
 
-
-  print "Sending commands\n";
+  $l->p("Sending commands");
   ## Send commands
-  if ( upload($host, $fox, $conf->{'file_name'}) ) {
-    print "Rebooting\n";
-    $host->print("reboot\n");
-    $host->getline;
-  } else {
-    print "Exiting\n";
-    $host->print("exit\n");
-    $host->getline;
-  }
-  $host->close;
+  #print Dump $t->login_banner;
+  #print Dump $t->sysinfo;
+  #print Dump $t->last_lines;
+  #print Dump $t->ver();
+  #print Dump $t->tftpd();
+  #print Dump $t->enable_tftpd();
+  #print Dump [ "Exit", $t->exit ];
+  #print Dump $t->tftpd();
+  #print Dump $t->disable_tftpd();
+  #print Dump $t->tftpd();
+  print Dump $t->sulog(args => 5);
+  #if ( upload($t, $conf->{'file_name'}) ) {
+  #   $l->p("Rebooting");
+  #  $t->reboot;
+  #} else {
+    $l->p("Exiting");
+    $t->exit;
+  #}
+  
+  $l->sp("");
 }
 
 sub upload
 {
-  my $host = shift;
-  my $fox  = shift;
+  my $t    = shift;
   my $file = shift;
 
-  print "Getting current version\n";
-  my $ver = get_ver($host);
+  my $ver = $t->ver;
+  $l->p("Current version '$ver->{'Firmware Version'}'");
 
   if (
     $ver->{'Firmware Version'}  eq $conf->{'ver'} && 
     $ver->{'Firmware Checksum'} eq $conf->{'cksum'}
   ) {
-    print STDERR "Already updated!";
+    $l->sp("Already updated!");
     return 1;
   }
 
   my $try = 0;
   while (1) {
     if ($try >= $max_tries) {
-      print STDERR "Couldn't update in $max_tries tries!";
+      $l->sp("Couldn't update in $max_tries tries!");
       return undef;
     }
     $try++;
 
-    #sysinfo($host);
+    #sysinfo($self->{'_host'});
     
-    print "Enabling TFTPd\n";
-    enable_tftpd($host) || die "Couldn't enable tftpd";
+    $l->p("Enabling TFTPd");
+    $t->enable_tftpd || die "Couldn't enable tftpd";
 
-    print "Uploading file\n";
+    $l->p("Uploading file ($file)");
     # use tftp to push the file up
-    my $tftp = Net::TFTP->new($fox, Mode => 'octet');
+    my $tftp = Net::TFTP->new($t->Host, 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 "LAST: " . $self->lastline;
+    #my @lines = $self->getlines;
     #print Dump \@lines;
     
-    print "Checking upload\n";
-    my $results = check_tftpd($host);
+    $l->p("Checking upload ($conf->{'file_cksum'})");
+    my $results = $t->tftpd;
     # check the 'File Length' against ???
     if ( $results->{'File Checksum'} ne $conf->{'file_cksum'}) {
-      print STDERR "File checksum does not match config file!";
+      $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/) {
-      print STDERR "File length does not match config file!";
+      $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'}) ) {
-      print STDERR "File name does not match config file!";
+      $l->sp(
+        "File name '" . $results->{'File Name'} .
+        "' does not match config file '" . $conf->{'file_name'} . "'!"
+      );
       next;
     }
+    $l->p("File name  matches . . . ");
 
-    print "Updating flash\n";
-    $results = updateflash(
-      $host, $ver->{'Firmware Checksum'}, $conf->{'cksum'}
-    ) or die "Couldn't update flash: " . $host->lastline;
+    $l->p("Updating flash (new checksum '$conf->{'cksum'}')");
+    unless ($results = $t->updateflash(
+      args => 'mainimage ' . $ver->{'Firmware Checksum'} . 
+              ' '          . $conf->{'cksum'},
+      Timeout => 90,
+    ) ) {
+      $l->sp("Couldn't update flash: $!");
+      next;
+    }
+
     unless (
       defined $results->{'Checksum'} && 
       $results->{'Checksum'} eq $conf->{'cksum'}
     ) {
-      print STDERR "Saved checksum does not match config file!";
+      $l->sp("Saved checksum does not match config file!");
       next;
     }
+    $l->p("Uploaded checksum ($results->{'Checksum'}) " . 
+          "matches ($conf->{'cksum'})");
     
-    print STDERR "Successfully updated!\n";
+    $l->sp("Successfully updated!");
     return 1;
   }
 }
 
-sub get_ver
+sub read_conf
 {
-  my $host = shift;
-  return cmd($host, 'ver');
+  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) {
+      s/\s+//g; # Whitespace is a no no
+
+      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;
+      }
+
+      $key =~ s/^\s+//;
+      $key =~ s/\s+$//;
+      $val =~ s/^\s+//;
+      $val =~ s/\s+$//;
+
+      $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 enable_tftpd
-{
-  my $host = shift;
+package Mylogger;
 
-  my $vals = cmd($host, 'tftpd on', 'Success.');
+use Fcntl ':flock'; # import LOCK_* constants
+#use YAML;
+use constant LOG_PRINT => 128;
+use constant LOG_SAVE  =>  64;
 
-  if ($vals->{'Tftpd'} eq 'listen') {
-    return $vals;
-  } else {
-    return undef;
+DESTROY {
+  my $self = shift;
+  if ($self->{'MYLOG'}) {
+    $self->p("Closing log ($self->{'log_path'}/$self->{'log_file'})");
+    close $self->{'MYLOG'};
   }
 }
 
-sub check_tftpd
-{
-  my $host = shift;
-  return cmd($host, 'tftpd', 'Success.');
+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 sysinfo
+sub s
 {
-  my $host = shift;
-  return cmd($host, 'sysinfo', 'Success.');
+  my $self = shift;
+  my $m = shift;
+  return $self->mylog($m, LOG_SAVE);
 }
 
-sub updateflash
+sub p
 {
-  my $host = shift;
-  my $old = shift;
-  my $new = shift;
+  my $self = shift;
+  my $m = shift;
+  return $self->mylog($m, LOG_PRINT);
+}
 
-  return undef unless $new;
-
-  return cmd($host, "updateflash mainimage $old $new", 'Success.', 90);
+sub sp
+{
+  my $self = shift;
+  my $m = shift;
+  return $self->mylog($m, LOG_SAVE | LOG_PRINT);
 }
 
-sub cmd
+sub mylog
 {
-  my $host   = shift;
-  my $string = shift;
-  my $expect_last = shift;
-  my $timeout = shift || 5;
+  my $self = shift;
 
-  my @lines = $host->cmd(String => $string, Timeout => $timeout);
+  my $thing = shift;
+  chomp $thing;
 
-  my $vals = decode_lines(@lines);
+  my $which = shift;
 
-  my $last = $host->lastline;
-
-  unless ($expect_last) {
-    return $vals;
+  my $MYLOG;
+  if ($which & LOG_PRINT) {
+    print $thing, "\n";
   }
 
-  if ($last =~ /$expect_last$/) {
-    return $vals;
-  } else {
-    warn "Error with command ($string): $last";
-    return undef;
+  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 decode_lines
+sub GetLogName
 {
-  my @lines = @_;
+  my $prefix  = shift || die "Invalid prefix passed for log";
 
-  my %conf;
+  my $logdate = GetLogDate();
+  my $logver  = 0;
+  my $logname;
 
-  my $key = '';
-  my $val = '';
-  my $in_key = 0;
-  my $in_val = 0;
+  do {
+    $logname = $prefix . $logdate . sprintf("%02d", $logver) . '.log';
+    $logver++;
+  } until (not -e $logname);
 
-  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;
-  }
+  return $logname;
 }
 
-sub read_conf
+sub GetLogDate
 {
-  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;
+  my ($sec,$min,$hour,$mday,$mon,$year,,,) = localtime();
 
-      if (lc($key) eq 'ips') {
-        $in_ip_list = 1;
-        next;
-      }
+  $mon++;
+  $year += 1900;
 
-      $conf{ lc($key) } = $val;
-    }
-  }
-  close $fh;
+  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"  }
 
-  #print Dump \%conf;
-  foreach (
-    'password', 
-    'file_name', 'file_size', 'file_cksum', 
-    'ver', 'cksum', 'ips',
-  ) {
-    die "No $_ specified in config file!"
-      if (not exists $conf{$_});
-  }
+  my $time = $year . $mon . $mday;
 
-  return \%conf;
+  return $time;
 }