===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.23
retrieving revision 1.25
diff -u -r1.23 -r1.25
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/01 18:44:30	1.23
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/02 17:50:09	1.25
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
-# $RedRiver: update_trango.pl,v 1.22 2007/02/01 17:58:33 andrew Exp $
+# $RedRiver: update_trango.pl,v 1.24 2007/02/02 16:29:58 mike Exp $
 ########################################################################
-# update_trango.pl *** Updates trango foxes with a new firmware
+# update_trango.pl *** Updates trango hosts with a new firmware
 # 
 # 2005.11.15 #*#*# andrew fresh <andrew@mad-techies.org>
 ########################################################################
@@ -12,6 +12,7 @@
 use Net::TFTP;
 use lib '.';
 use Net::Telnet::Trango;
+use RedRiver::Wireless;
 
 my $config_file = shift || 'update_trango.yaml';
 my $max_tries = 3;
@@ -21,15 +22,15 @@
 $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',
-);
+$l->sp("Reading hosts");
+my $hosts = RedRiver::Wireless::Read_Hosts();
 
-foreach my $fox (@foxes) {
-  $l->sp("Checking: $fox");
+
+
+foreach my $host (@{ $hosts }) {
+  next if $host->{group} !~ /^Trango/;
+  $l->sp("");
+  $l->sp("Checking: $host->{name}");
   my $needs_reboot = 0;
 
   ## Connect and login.
@@ -37,17 +38,54 @@
     Timeout => 5,
     Errmode => 'return',
   ) or die "Couldn't make new connection: $!";
-  $l->p("Connecting to $fox");
-  unless ( $t->open($fox) ) {
+  $l->p("Connecting to $host->{name}");
+  unless ( $t->open($host->{name}) ) {
     $l->sp("Error connecting: $!");
     next;
   }
 
+  my $password = $host->{Telnet_Password} || $conf->{general}->{password};
+
+  if ($host->{group} !~ /Client$/) {
+    $l->p("Logging in");
+    $t->login($password);
+    unless ($t->logged_in) {
+      $l->p('Failed!');
+      $t->close;
+      next;
+    }
+
+    $l->sp("Getting sudb");
+    my $sudb = $t->sudb_view;
+    if ($sudb) {
+      foreach my $su (@{ $sudb }) {
+        $l->p("Getting su info $su->{suid}");
+        my $su_info = $t->su_info( $su->{suid} ); 
+        if ($su_info->{ip}) {
+          $l->sp("Adding host $su_info->{ip}");
+          my $new_host = {
+            Telnet_Password => $host->{Telnet_Password},
+            group   => $host->{group} . '-Client',
+            name    => $su_info->{ip},
+            remarks => $su_info->{remarks},
+          };
+          push @{ $hosts }, $new_host;
+        } else {
+          $l->sp("Couldn't get su info for $su->{suid}");
+          if ($su_info->{ERR}) {
+            $l->sp("ERR: $su_info->{ERR}");
+          }
+          next;
+        }
+      }
+    }
+  } 
+
   foreach my $firmware_type ('Firmware', 'FPGA') {
 
     if (! exists $conf->{$firmware_type}) {
 	  $l->s("No configs for '$firmware_type'");
-	  $t->close();
+	  $t->close;
 	  next;
 	}
 
@@ -58,16 +96,16 @@
 
     if (! exists $conf->{$firmware_type}->{$host_type}) {
 	  $l->sp("No '$firmware_type' config for type $host_type");
-	  $t->close();
+	  $t->close;
 	  next;
 	}
 
     if (! $t->logged_in) {
       $l->p("Logging in");
-      $t->login($conf->{general}->{'password'});
+      $t->login($password);
       unless ($t->logged_in) {
         $l->p('Failed!');
-        $t->bye();
+        $t->close;
         next;
       }
     }
@@ -76,7 +114,7 @@
 	  $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;
+	$conf->{$firmware_type}->{$host_type}->{type} = $host_type;
 
     $l->sp("$host_type $firmware_type");
     $l->p("Sending commands");
@@ -96,13 +134,12 @@
   }
 
   if ($needs_reboot) {
-    $l->sp("Rebooting $fox");
+    $l->sp("Rebooting $host->{name}");
     $t->reboot;
   } else {
-    $l->sp("Bye $fox");
+    $l->sp("Bye $host->{name}");
     $t->bye();
   }
-  $l->sp("");
 }
 
 sub upload
@@ -180,10 +217,10 @@
     }
     $l->p("File length matches . . . ");
 
-    if ( uc($results->{'File Name'}) ne uc($conf->{'file_name'}) ) {
+    if ( uc($results->{'File Name'}) ne uc($file) ) {
       $l->sp(
         "File name '" . $results->{'File Name'} .
-        "' does not match config file '" . $conf->{'file_name'} . "'!"
+        "' does not match config file '" . $file . "'!"
       );
       next;
     }