===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.6
retrieving revision 1.12
diff -u -r1.6 -r1.12
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2005/11/17 00:40:06	1.6
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2005/12/29 18:41:17	1.12
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: update_trango.pl,v 1.5 2005/11/16 21:39:51 andrew Exp $
+# $RedRiver: update_trango.pl,v 1.11 2005/12/21 02:03:30 andrew Exp $
 ########################################################################
 # update_trango.pl *** Updates trango foxes with a new firmware
 # 
@@ -8,320 +8,178 @@
 use strict;
 use warnings;
 
-use Net::Telnet;
 use Net::TFTP;
-use Fcntl ':flock'; # import LOCK_* constants
-#use YAML;
+use YAML;
+use lib '.';
+use Net::Telnet::Trango;
 
-
 my $config_file = shift || 'update_trango.conf';
-my $conf = read_conf($config_file);
+my $max_tries = 3;
 
-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;
-  }
-}
+my $l = Mylogger->new( { log_prefix => 'UT' } );
 
 
+$l->sp("Reading config file '$config_file'");
+my $conf = read_conf($config_file);
 
+$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("");
 
 
 
 
 
+
 foreach my $fox (@{ $conf->{'ips'} }) {
-  mylog("Updating: $fox", LOG_SAVE);
+  $l->sp("Updating: $fox");
 
   ## 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');
+  my $t = new Net::Telnet::Trango ({
+    Host    => $fox,
+    Timeout => 5,
+  });
 
-  ## Login to remote host.
-  unless ($host->waitfor(
-    -match => '/password: ?$/i',
-    -errmode => "return",
-  ) ) {
-    mylog("problem connecting to host ($fox): " . $host->lastline, LOG_SAVE);
+  $l->p("Connecting to $fox");
+  my ($type, $version) = $t->connect();
+
+  unless (defined $type && defined $version) {
+    $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'}) {
-    mylog("Wrong type of unit ('$type' should be '$conf->{'type'}')", LOG_SAVE);
-    $host->close;
+    $l->sp("Wrong type of unit ('$type' should be '$conf->{'type'}')");
+    $t->close;
     next;
   }
 
   if ($version eq $conf->{'ver'}) {
-    mylog("Already up to date with firmware version '$version'", LOG_SAVE);
-    $host->close;
+    $l->sp("Already up to date with firmware version '$version'");
+    $t->close;
     next;
   }
 
-  mylog("Logging in");
-  $host->print($conf->{'password'});
-  unless ($host->waitfor(
-    -match => $host->prompt,
-    -errmode => "return",
-  ) ) {
-    mylog("login ($fox) failed: " . $host->lastline);
-    next;
-  }
+  $l->p("Logging in");
+  $t->login($conf->{'password'}) || die "Couldn't login: $!";
 
-
-  mylog("Sending commands");
+  $l->p("Sending commands");
   ## Send commands
-  if ( upload($host, $fox, $conf->{'file_name'}) ) {
-    mylog("Rebooting");
-    $host->print("reboot\n");
-    $host->getline;
+  #print Dump $t->ver();
+  #print Dump $t->tftpd();
+  if ( upload($t, $conf->{'file_name'}) ) {
+    $l->p("Rebooting");
+    $t->reboot;
   } else {
-    mylog("Exiting");
-    $host->print("exit\n");
-    $host->getline;
+    $l->p("Exiting");
+    $t->exit;
   }
-  $host->close;
-  mylog("", LOG_SAVE);
+  
+  $t->close;
+  $l->sp("");
 }
 
 sub upload
 {
-  my $host = shift;
-  my $fox  = shift;
+  my $t    = shift;
   my $file = shift;
 
-  mylog("Getting current version");
-  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'}
   ) {
-    mylog("Already updated!", LOG_SAVE);
+    $l->sp("Already updated!");
     return 1;
   }
 
   my $try = 0;
   while (1) {
     if ($try >= $max_tries) {
-      mylog("Couldn't update in $max_tries tries!");
+      $l->sp("Couldn't update in $max_tries tries!");
       return undef;
     }
     $try++;
 
-    #sysinfo($host);
+    #sysinfo($self->{'_host'});
     
-    mylog("Enabling TFTPd");
-    enable_tftpd($host) || die "Couldn't enable tftpd";
+    $l->p("Enabling TFTPd");
+    $t->enable_tftpd || die "Couldn't enable tftpd";
 
-    mylog("Uploading file ($file)");
+    $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;
     
-    mylog("Checking upload ($conf->{'file_cksum'})");
-    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'}) {
-      mylog("File checksum does not match config file!", LOG_SAVE);
+      $l->sp(
+        "File checksum '" . $results->{'File Checksum'} .
+        "does not match config file '" . $conf->{'file_cksum'} . "'!"
+      );
       next;
     } 
-    mylog("File checksum ($results->{'File Checksum'}) " . 
-          "matches ($conf->{'file_cksum'})");
+    $l->p("File checksum matches . . . ");
 
     if ($results->{'File Length'}   !~ /^$conf->{'file_size'} bytes/) {
-      mylog("File length does not match config file!", LOG_SAVE);
+      $l->sp(
+        "File length '" . $results->{'File Length'} .
+        "does not match config file '" . $conf->{'file_size'} . " bytes'!"
+      );
       next;
     }
-    mylog("File length ($results->{'File Length'}) " . 
-          "matches ($conf->{'file_size'})");
+    $l->p("File length matches . . . ");
 
     if ( uc($results->{'File Name'}) ne uc($conf->{'file_name'}) ) {
-      mylog("File name does not match config file!", LOG_SAVE);
+      $l->sp(
+        "File name '" . $results->{'File Name'} .
+        "' does not match config file '" . $conf->{'file_name'} . "'!"
+      );
       next;
     }
-    mylog("File name ($results->{'File Name'}) " . 
-          "matches ($conf->{'file_name'})");
+    $l->p("File name  matches . . . ");
 
-    mylog("Updating flash (new checksum '$conf->{'cksum'}')");
-    $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(
+      $ver->{'Firmware Checksum'}, $conf->{'cksum'}
+    ) ) {
+      $l->sp("Couldn't update flash: $!");
+      next;
+    }
+
     unless (
       defined $results->{'Checksum'} && 
       $results->{'Checksum'} eq $conf->{'cksum'}
     ) {
-      mylog("Saved checksum does not match config file!", LOG_SAVE);
+      $l->sp("Saved checksum does not match config file!");
       next;
     }
-    mylog("Uploaded checksum ($results->{'Checksum'}) " . 
+    $l->p("Uploaded checksum ($results->{'Checksum'}) " . 
           "matches ($conf->{'cksum'})");
     
-    mylog("Successfully updated!", LOG_SAVE);
+    $l->sp("Successfully updated!");
     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;
@@ -333,7 +191,13 @@
     next if /^#/;
     next if /^$/;
     if ($in_ip_list) {
-      push @{ $conf{'ips'} }, $_;
+      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;
 
@@ -342,6 +206,11 @@
         next;
       }
 
+      $key =~ s/^\s+//;
+      $key =~ s/\s+$//;
+      $val =~ s/^\s+//;
+      $val =~ s/\s+$//;
+
       $conf{ lc($key) } = $val;
     }
   }
@@ -357,27 +226,90 @@
       if (not exists $conf{$_});
   }
 
+  #print Dump \%conf;
+  #exit;
   return \%conf;
 }
 
+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 $save = shift;
 
-  print $thing, "\n";
+  my $which = shift;
 
-  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)");
-    }
+  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: $!";