[BACK]Return to Trango.pm CVS log [TXT][DIR] Up to [local] / trango / Net-Telnet-Trango / lib / Net / Telnet

Diff for /trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm between version 1.25 and 1.30

version 1.25, 2007/01/17 20:48:46 version 1.30, 2007/02/02 17:51:52
Line 1 
Line 1 
 package Net::Telnet::Trango;  package Net::Telnet::Trango;
 # $RedRiver: Trango.pm,v 1.24 2007/01/17 19:00:51 andrew Exp $  # $RedRiver: Trango.pm,v 1.29 2007/02/01 17:58:33 andrew Exp $
 use strict;  use strict;
 use warnings;  use warnings;
 use base 'Net::Telnet';  use base 'Net::Telnet';
Line 8 
Line 8 
   
 =head1 NAME  =head1 NAME
   
 Net::Telnet::Trango - Perl extension for accessing the Trango telnet interface  Net::Telnet::Trango
   - Perl extension for accessing the Trango telnet interface
   
 =head1 SYNOPSIS  =head1 SYNOPSIS
   
Line 52 
Line 53 
   
 =pod  =pod
   
 =item new  =item B<new>
   
 Same as new from L<Net::Telnet> but has defaults for the trango 'Prompt'  - Creates a new Net::Telnet::Trango object.
   
           new([Options from Net::Telnet,]
               [Decode => 0,]);
   
   Same as new from L<Net::Telnet> but sets the default Trango Prompt:
   '/#> *$/'
   
 It also takes an optional parameter 'Decode'.  If not defined it  It also takes an optional parameter 'Decode'.  If not defined it
 defaults to 1, if it is set to 0, it will not decode the output and  defaults to 1, if it is set to 0, it will not decode the output and
 instead return an array of the lines that were returned from the  instead return a reference to an array of the lines that were returned
 command.  from the command.
   
 =cut  =cut
   
Line 168 
Line 175 
   
 =head2 ACCESSORS  =head2 ACCESSORS
   
   These are usually only set internally.
   
 =over  =over
   
 =item Host  =item B<firmware_version>
   
 returns the name of the host that you are accessing  - returns the firmware version
   
 =item firmware_version  Returns the firmware version if available, otherwise undef.
   
 returns the firmware version on the trango if available otherwise undef.  It should be available after a successful open().
 Available after a successful open()  
 This is usually only set internally  
   
 =item host_type  =item B<host_type>
   
   - return the type of host you are connected to.
   
 returns the type of host from the login banner for example M5830S or M5300S.  returns the type of host from the login banner for example M5830S or M5300S.
 Available after a successful open()  
 This is usually only set internally  
   
 =item is_connected  Should be available after a successful open().
   
 returns 1 after a successful open() otherwise undef  =item B<is_connected>
 This is usually only set internally  
   
 =item logged_in  - Status of the connection to host.
   
 returns 1 after a successful login() 0 if it failed and undef if  returns 1 when connected, undef otherwise.
 login() was never called  
 This is usually only set internally  
   
 =item login_banner  =item B<logged_in>
   
   - Status of being logged in to the host.
   
   returns 1 after a successful login(), 0 if it failed and undef if
   login() was never called.
   
   =item B<login_banner>
   
   - The banner when first connecting to the host.
   
 returns the banner that is displayed when first connected at login.  returns the banner that is displayed when first connected at login.
 Only set after a successful open()  Only set after a successful open().
   
 This is usually only set internally  =item B<last_lines>
   
 =item last_lines  - The last lines of output from the last cmd().
   
 returns the output from the last cmd() that was run as an array ref  returns, as an array ref, the output from the last cmd() that was run.
 This is usually only set internally  
   
 =item last_error  =item B<last_error>
   
 returns the last error reported.  Should contain the the last entry in  - A text output of the last error that was encountered.
 last_lines  
   
   returns the last error reported.  Probably contains the last entry in
   last_lines.
   
 =back  =back
   
 =head2 ALIASES  =head2 ALIASES
   
 =over  =over
   
 =item bye  =item B<bye>
   
 alias of exit()  - alias of L<exit()>.
   
 =item restart  =item B<restart>
   
 alias of reboot()  - alias of L<reboot()>.
   
 =back  =back
   
Line 239 
Line 253 
   
 =over  =over
   
 =item tftpd  =item B<tftpd>
   
 Returns a hash ref of the decoded output from the command.  - Returns a hash ref of the decoded output from the
   command.
   
 Also see enable_tftpd() and disable_tftpd() as those check for correct output  Also see enable_tftpd() and disable_tftpd() as those check that it was
   successfully changed.
   
 =item ver  =item B<ver>
   
 Returns a hash ref of the decoded output from the command.  - Returns a hash ref of the decoded output from the
   command.
   
 =item sysinfo  =item B<sysinfo>
   
 Returns a hash ref of the decoded output from the command.  - Returns a hash ref of the decoded output from the
   command.
   
 =item exit  =item B<exit>
   
 exits the command session with the trango and closes the connection  - exits the command session with the Trango and closes
   the connection
   
 =item reboot  =item B<reboot>
   
 reboots the trango and closes the connection  - reboots the Trango and closes the connection
   
 =item remarks  =item B<remarks>
   
   - Set or retrieve the remarks.
   
 Takes an optional argument, which sets the remarks.  Takes an optional argument, which sets the remarks.
 If there is no argument, returns the current remarks.  If there is no argument, returns the current remarks.
   
 =item sulog    my $old_remarks = $t->remarks();
     $t->remarks($new_remarks);
   
 returns an array ref of hashes containing each log line.  =item B<sulog>
   
 =item save_sudb  - returns an array ref of hashes containing each log
   line.
   
 returns true on success, undef on failure  =item B<save_sudb>
   
 =item syslog  - returns true on success, undef on failure
   
 returns the output from the syslog command  =item B<syslog>
   
 =item pipe  - returns the output from the syslog command
   
 returns the output from the pipe command  =item B<pipe>
   
 =item maclist  - returns the output from the pipe command
   
 returns the output from the maclist command  =item B<maclist>
   
 =item maclist_reset  -  returns the output from the maclist command
   
 resets the maclist.  No useful output.  =item B<maclist_reset>
   
 =item eth_list  - resets the maclist.
   
 returns the output from the eth list command  No useful output.
   
 =item su_info  =item B<eth_list>
   
 You need to pass in args => <suid> and it will return the info for that suid.  - returns the output from the eth list command
   
 =item save_ss  =item B<su_info>
   
 saves the config.  Returns 1 on success, undef on failure.  - returns information about the SU.
   
   You need to pass in the $suid and it will return the info for that suid.
   
     $t->su_info($suid);
   
   =item B<save_ss>
   
   - saves the config.
   
   Returns 1 on success, undef on failure.
   
 =cut  =cut
   
   
 my $success = 'Success.';  my $success = 'Success\\.';
 my %COMMANDS = (  my %COMMANDS = (
   tftpd       => { decode => 'all',   expect => $success },    tftpd       => { decode => 'all',   expect => $success },
   ver         => { decode => 'all' },    ver         => { decode => 'all' },
Line 334 
Line 367 
 my %ALIASES = (  my %ALIASES = (
   bye     => 'exit',    bye     => 'exit',
   restart => 'reboot',    restart => 'reboot',
     Host    => 'host',
 );  );
   
 my %ACCESS = map { $_ => 1 } qw(  my %ACCESS = map { $_ => 1 } qw(
   firmware_version    firmware_version
   host_type    host_type
   Host  
   is_connected    is_connected
   logged_in    logged_in
   login_banner    login_banner
Line 347 
Line 380 
   last_lines    last_lines
   last_vals    last_vals
   last_error    last_error
     Decode
 );  );
   
 sub AUTOLOAD  sub AUTOLOAD
Line 362 
Line 396 
   }    }
   
   if (exists $COMMANDS{$method}) {    if (exists $COMMANDS{$method}) {
     $COMMANDS{$method}{'String'} ||= $method;      my %cmd;
     $COMMANDS{$method}{'args'} .= ' ' . shift if (@_ == 1);      foreach my $k (keys %{ $COMMANDS{$method} }) {
     return $self->cmd(%{ $COMMANDS{$method} }, @_);        $cmd{$k} = $COMMANDS{$method}{$k};
       }
       $cmd{'String'} ||= $method;
       $cmd{'args'}   .= ' ' . shift if (@_ == 1);
       return $self->cmd(%cmd, @_);
   }    }
   
   if (exists $ACCESS{$method}) {    if (exists $ACCESS{$method}) {
Line 379 
Line 417 
   
 =pod  =pod
   
 =item open  =item B<open>
   
   - Open a connection to a Trango AP.
   
 Calls Net::Telnet::open() then makes sure you get a password prompt so  Calls Net::Telnet::open() then makes sure you get a password prompt so
 you are ready to login() and parses the login banner so you can get  you are ready to login() and parses the login banner so you can get
 host_type() and firmware_version()  host_type() and firmware_version()
Line 392 
Line 432 
   my $self = shift;    my $self = shift;
   
   unless ( $self->SUPER::open(@_) ) {    unless ( $self->SUPER::open(@_) ) {
     $self->last_error("Couldn't connect to " . $self->Host . ":  $!");      $self->last_error("Couldn't connect to " . $self->host . ":  $!");
     return undef;      return;
   }    }
   
   ## Get to login prompt    ## Get to login prompt
Line 401 
Line 441 
       -match => '/password: ?$/i',        -match => '/password: ?$/i',
       -errmode => "return",        -errmode => "return",
     ) ) {      ) ) {
     $self->last_error("problem connecting to host (" . $self->Host . "): " .      $self->last_error("problem connecting to host (" . $self->host . "): " .
         $self->lastline);          $self->lastline);
     return undef;      return;
   }    }
   
   $self->parse_login_banner($self->lastline);    $self->parse_login_banner($self->lastline);
Line 415 
Line 455 
   
 =pod  =pod
   
 =item login  =item B<login>
   
   - Login to the AP.
   
 Calls open() if not already connected, then sends the password and sets  Calls open() if not already connected, then sends the password and sets
 logged_in() if successful  logged_in() if successful
   
Line 427 
Line 469 
   my $self = shift;    my $self = shift;
   
   unless ($self->is_connected) {    unless ($self->is_connected) {
     $self->open or return undef;      $self->open or return;
   }    }
   
   my $password = shift;    my $password = shift;
Line 437 
Line 479 
     -match => $self->prompt,      -match => $self->prompt,
     -errmode => "return",      -errmode => "return",
   ) ) {    ) ) {
     $self->last_error("login ($self->Host) failed: " . $self->lastline);      $self->last_error("login ($self->host) failed: " . $self->lastline);
     return undef;      return;
   }    }
   
   $self->logged_in(1);    $self->logged_in(1);
Line 448 
Line 490 
   
 =pod  =pod
   
 =item parse_login_banner  =item B<parse_login_banner>
   
   - Converts the login_banner to some useful
   variables.
   
 Takes a login banner (what you get when you first connect to the Trango)  Takes a login banner (what you get when you first connect to the Trango)
 or reads what is already in login_banner() then parses it and sets  or reads what is already in login_banner() then parses it and sets
 host_type() and firmware_version() as well as login_banner()  host_type() and firmware_version() as well as login_banner()
Line 466 
Line 511 
   
   my $banner = $self->login_banner;    my $banner = $self->login_banner;
   
   my ($type, $ver) = $banner =~    my ($type, $sep1, $subtype, $sep2, $ver) = $banner =~
     /Welcome to Trango Broadband Wireless (\S+)[\s-]+(.+)$/i;      /Welcome to Trango Broadband Wireless (\S+)([\s-]+)(\S+)([\s-]+)(.+)$/i;
   
     $type .= $sep1 . $subtype;
     $ver = $subtype . $sep2 . $ver;
   
   $self->login_banner($banner);    $self->login_banner($banner);
   $self->host_type($type);    $self->host_type($type);
   $self->firmware_version($ver);    $self->firmware_version($ver);
Line 478 
Line 526 
   
 =pod  =pod
   
 =item su_password  =item B<su_password>
   
 C<su_password('new_password'[, 'suid'])> If no suid is specified,  - Set the password on SUs connected to the AP.
   
   su_password('new_password'[, 'suid']) If no suid is specified,
 the default is "all".  the default is "all".
   
     $t->su_password('good_pass', 5);
   
 =cut  =cut
   
 sub su_password  sub su_password
Line 493 
Line 545 
   
   unless (defined $new_pass) {    unless (defined $new_pass) {
     $self->last_error("No new password");      $self->last_error("No new password");
     #return undef;      #return;
   }    }
   
   return $self->cmd(String => 'su password ' .    return $self->cmd(String => 'su password ' .
Line 506 
Line 558 
   
 =pod  =pod
   
 =item su_ipconfig  =item B<su_ipconfig>
   
 C<su_ipconfig( 'suid', 'new_ip', 'new_subnet', 'new_gateway' )>  - Change IP configuration on SUs connected to
   the AP.
   
   su_ipconfig( 'suid', 'new_ip', 'new_subnet', 'new_gateway' )
   
     $t->su_ipconfig( 5, '10.0.1.5', '255.255.255.0', '10.0.1.1' );
   
 =cut  =cut
   
 sub su_ipconfig  sub su_ipconfig
Line 523 
Line 580 
   
         if ($suid =~ /\D/) {          if ($suid =~ /\D/) {
                 $self->last_error("Invalid suid '$suid'");                  $self->last_error("Invalid suid '$suid'");
                 return undef;                  return;
         }          }
         unless ($new_ip) {          unless ($new_ip) {
                 $self->last_error("no new_ip passed");                  $self->last_error("no new_ip passed");
                 return undef;                  return;
         }          }
         unless ($new_subnet) {          unless ($new_subnet) {
                 $self->last_error("no new_subnet passed");                  $self->last_error("no new_subnet passed");
                 return undef;                  return;
         }          }
         unless ($new_gateway) {          unless ($new_gateway) {
                 $self->last_error("no new_gateway passed");                  $self->last_error("no new_gateway passed");
                 return undef;                  return;
         }          }
   
         # su ipconfig <suid> <new ip> <new subnet> <new gateway>          # su ipconfig <suid> <new ip> <new subnet> <new gateway>
Line 550 
Line 607 
   
 =pod  =pod
   
 =item sudb_view  =item B<sudb_view>
   
 returns a reference to an array of hashes each containing:  - Returns the output from the sudb view command
   
   suid  returns a reference to an array of hashes each containing these keys
   type  'suid', 'type', 'cir', 'mir' and 'mac'
   cir  
   mir  
   mac  
   
 =cut  =cut
   
Line 566 
Line 620 
 {  {
   my $self = shift;    my $self = shift;
   
   my @lines = $self->cmd( String => 'sudb view', expect => $success );    my $lines = $self->cmd( String => 'sudb view', expect => $success ) || [];
   
   return undef unless @lines;    return unless @{ $lines };
   
   unless ($PRIVATE{'Decode'}) {    unless ($PRIVATE{'Decode'}) {
     return @lines;      return $lines;
   }    }
   
   my @sus;    my @sus;
   foreach (@lines) {    foreach (@{ $lines }) {
     next unless $_;      next unless $_;
     if (/^\[(\d+)\]\s+(\d+)\s+(\d+)\s+(\d+)\s+([0-9A-Fa-f\s]+)$/) {      if (/^\[(\d+)\]\s+(\d+)\s+(\d+)\s+(\d+)\s+([0-9A-Fa-f\s]+)$/) {
       my %s = (        my %s = (
Line 598 
Line 652 
   
 =pod  =pod
   
 =item sudb_add  =item B<sudb_add>
   
 Takes the following paramaters  Takes the following paramaters
   
Line 610 
Line 664 
   
 and returns true on success or undef otherwise.  and returns true on success or undef otherwise.
   
     $t->sudb_add($suid, 'reg', $cir, $mir, $mac);
   
 You should save_sudb() after calling this, or your changes  will be lost  You should save_sudb() after calling this, or your changes  will be lost
 when the AP is rebooted.  when the AP is rebooted.
   
Line 626 
Line 682 
   
         if ($suid =~ /\D/) {          if ($suid =~ /\D/) {
                 $self->last_error("Invalid suid '$suid'");                  $self->last_error("Invalid suid '$suid'");
                 return undef;                  return;
         }          }
   
         unless (lc($type) eq 'reg' || lc($type) eq 'pr') {          unless (lc($type) eq 'reg' || lc($type) eq 'pr') {
                 $self->last_error("Invalid type '$type'");                  $self->last_error("Invalid type '$type'");
                 return undef;                  return;
         }          }
   
         if ($cir =~ /\D/) {          if ($cir =~ /\D/) {
                 $self->last_error("Invalid CIR '$cir'");                  $self->last_error("Invalid CIR '$cir'");
                 return undef;                  return;
         }          }
   
         if ($mir =~ /\D/) {          if ($mir =~ /\D/) {
                 $self->last_error("Invalid MIR '$mir'");                  $self->last_error("Invalid MIR '$mir'");
                 return undef;                  return;
         }          }
   
         my $new_mac = $mac;          my $new_mac = $mac;
         $new_mac =~ s/[^0-9A-Fa-f]//;          $new_mac =~ s/[^0-9A-Fa-f]//;
         unless (length $new_mac == 12) {          unless (length $new_mac == 12) {
                 $self->last_error("Invalid MAC '$mac'");                  $self->last_error("Invalid MAC '$mac'");
                 return undef;                  return;
         }          }
         $new_mac = join ' ', $new_mac =~ /../g;          $new_mac = join ' ', $new_mac =~ /../g;
   
Line 665 
Line 721 
   
 =pod  =pod
   
 =item sudb_delete  =item B<sudb_delete>
   
 Takes either 'all' or the  suid of the su to delete  Takes either 'all' or the  suid of the su to delete
 and returns true on success or undef otherwise.  and returns true on success or undef otherwise.
   
     $t->sudb_delete($suid);
   
 You should save_sudb() after calling this, or your changes  will be lost  You should save_sudb() after calling this, or your changes  will be lost
 when the AP is rebooted.  when the AP is rebooted.
   
Line 683 
Line 741 
         #if (lc($suid) ne 'all' || $suid =~ /\D/) {          #if (lc($suid) ne 'all' || $suid =~ /\D/) {
         if ($suid =~ /\D/) {          if ($suid =~ /\D/) {
                 $self->last_error("Invalid suid '$suid'");                  $self->last_error("Invalid suid '$suid'");
                 return undef;                  return;
         }          }
   
         return $self->cmd( String => 'sudb delete ' . $suid, expect => $success );          return $self->cmd( String => 'sudb delete ' . $suid, expect => $success );
Line 691 
Line 749 
   
 =pod  =pod
   
 =item sudb_modify  =item B<sudb_modify>
   
 Takes either the  suid of the su to delete  Takes either the  suid of the su to change
 as well as what you are changing, either "cir, mir or su2su"  as well as what you are changing, either "cir, mir or su2su"
 and returns true on success or undef otherwise.  and returns true on success or undef otherwise.
   
Line 701 
Line 759 
   
 su2su takes a group id parameter that is in hex.  su2su takes a group id parameter that is in hex.
   
     $t->sudb_modify($suid, 'cir', 512);
   
 You should save_sudb() after calling this, or your changes  will be lost  You should save_sudb() after calling this, or your changes  will be lost
 when the AP is rebooted.  when the AP is rebooted.
   
Line 715 
Line 775 
   
         if ($suid =~ /\D/) {          if ($suid =~ /\D/) {
                 $self->last_error("Invalid suid '$suid'");                  $self->last_error("Invalid suid '$suid'");
                 return undef;                  return;
         }          }
   
         if (lc($opt) eq 'cir' or lc($opt) eq 'mir') {          if (lc($opt) eq 'cir' or lc($opt) eq 'mir') {
                 if ($value =~ /\D/) {                  if ($value =~ /\D/) {
                         $self->last_error("Invalid $opt '$value'");                          $self->last_error("Invalid $opt '$value'");
                         return undef;                          return;
                 }                  }
         } elsif (lc($opt) eq 'su2su') {          } elsif (lc($opt) eq 'su2su') {
                 if ($value =~ /[^0-9A-Za-f]/) {                  if ($value =~ /[^0-9A-Za-f]/) {
                         $self->last_error("Invalid MAC '$value'");                          $self->last_error("Invalid MAC '$value'");
                         return undef;                          return;
                 }                  }
         } else {          } else {
                 $self->last_error("Invalid option '$opt'");                  $self->last_error("Invalid option '$opt'");
                 return undef;                  return;
         }          }
   
         my $string = 'sudb modify ' . $suid . ' ' . $opt . ' ' . $value;          my $string = 'sudb modify ' . $suid . ' ' . $opt . ' ' . $value;
Line 740 
Line 800 
   
 =pod  =pod
   
 =item enable_tftpd  =item B<enable_tftpd>
   
   - enable the TFTP server
   
 runs C<tftpd(args =E<gt> 'on')> and makes sure that Tftpd is now 'listen'ing  runs C<tftpd(args =E<gt> 'on')> and makes sure that Tftpd is now 'listen'ing
   
 =cut  =cut
Line 755 
Line 817 
   if ($vals->{'Tftpd'} eq 'listen') {    if ($vals->{'Tftpd'} eq 'listen') {
     return $vals;      return $vals;
   } else {    } else {
     return undef;      return;
   }    }
 }  }
   
 =pod  =pod
   
 =item disable_tftpd  =item B<disable_tftpd>
   
   - disable the TFTP server
   
 runs C<tftpd(args =E<gt> 'off')> and makes sure that Tftpd is now 'disabled'  runs C<tftpd(args =E<gt> 'off')> and makes sure that Tftpd is now 'disabled'
   
 =cut  =cut
Line 776 
Line 840 
   if (ref $vals eq 'HASH' && $vals->{'Tftpd'} eq 'disabled') {    if (ref $vals eq 'HASH' && $vals->{'Tftpd'} eq 'disabled') {
     return $vals;      return $vals;
   } else {    } else {
     return undef;      return;
   }    }
 }  }
   
 =pod  =pod
   
 =item cmd  =item B<cmd>
   
   - runs a command on the AP.
   
 This does most of the work.  At the heart, it calls Net::Telnet::cmd()  This does most of the work.  At the heart, it calls Net::Telnet::cmd()
 but it also does some special stuff for Trango.  but it also does some special stuff for Trango.
   
 Normally returns the last lines from from the command  Normally returns the last lines from from the command
   
 Also accepts these options:  If you are using this, rather than one of the "easy" methods above,
   you probably want to read through the source of this module to see how
   some of the other commands are called.
   
   In addition to the Net::Telnet::cmd() options, it also accepts these:
   
 I<decode>  I<decode>
   
 - if this is true, then it will send the output lines to _decode_lines()  - if this is true, then it will send the output lines to _decode_lines()
 and then returns the decoded output  and then returns the decoded output
   
   I<no_prompt>
   
   - if this is true, it does not wait for a prompt, so you are not stuck
   waiting for something that will never happen.
   
 I<cmd_disconnects>  I<cmd_disconnects>
   
 - if this is true, it then sets logged_in() to false, then it will  - if this is true, it then sets logged_in() to false, then it will
 close() the connection and then sets is_connected() to false  close() the connection and set is_connected() to false
   
 I<expect>  I<expect>
   
 - if this is set (usually to 'Success.') it will check for that in the  - if this is set (usually to 'Success.') it will check for that in the
 last line of output and if it does not, will return undef because the  last line of output and if it does not, will return undef because the
 command probably failed  command probably failed
   
 I<args>  I<args>
   
 - a string containing the command line options that are passed to the  - a string containing the command line options that are passed to the
 command  command
   
           $t->cmd( String => 'exit', no_prompt => 1, cmd_disconnects => 1 );
   
 =cut  =cut
   
 sub cmd  sub cmd
Line 838 
Line 919 
   
   unless ($cfg{'String'}) {    unless ($cfg{'String'}) {
     $self->last_error("No command passed");      $self->last_error("No command passed");
     return undef;      return;
   }    }
   
   unless ($self->is_connected) {    unless ($self->is_connected) {
     $self->last_error("Not connected");      $self->last_error("Not connected");
     return undef;      return;
   }    }
   
   unless ($self->logged_in) {    unless ($self->logged_in) {
     $self->last_error("Not logged in");      $self->last_error("Not logged in");
     return undef;      return;
   }    }
   
   
Line 861 
Line 942 
   if ($cfg{'args'}) {    if ($cfg{'args'}) {
     $cmd{'String'} .= ' ' . $cfg{'args'};      $cmd{'String'} .= ' ' . $cfg{'args'};
   }    }
   
   my @lines;    my @lines;
   unless ($cfg{'no_prompt'}) {    if ($cfg{'no_prompt'}) {
     @lines = $self->SUPER::cmd(%cmd);  
   } else {  
     $self->print($cmd{'String'});      $self->print($cmd{'String'});
     @lines = $self->lastline;      @lines = $self->lastline;
     } else {
       @lines = $self->SUPER::cmd(%cmd);
   }    }
   
   $self->last_lines(\@lines);    $self->last_lines(\@lines);
Line 899 
Line 981 
     if ($PRIVATE{'Decode'} && $cfg{'decode'}) {      if ($PRIVATE{'Decode'} && $cfg{'decode'}) {
       return $vals;        return $vals;
     } else {      } else {
       return @lines;        return \@lines;
     }      }
   } else {    } else {
     $self->last_error("Error with command ($cfg{'String'}): $last");      $self->last_error("Error with command ($cfg{'String'}): $last");
     return undef;      return;
   }    }
 }  }
   
Line 917 
Line 999 
   
   my $key = '';    my $key = '';
   my $val = undef;    my $val = undef;
     my @vals;
   my $in_key = 0;    my $in_key = 0;
   my $in_val = 1;    my $in_val = 1;
   
Line 941 
Line 1024 
           $key =~ s/^\s+//;            $key =~ s/^\s+//;
           $key =~ s/\s+$//;            $key =~ s/\s+$//;
   
           if (defined $val) {            if ($val) {
             $val =~ s/^\s+//;              $val =~ s/^\s+//;
             $val =~ s/\s+$//;              $val =~ s/\s+$//;
           }            }
Line 953 
Line 1036 
             $key = $new . " " . $key;              $key = $new . " " . $key;
           }            }
   
           $last_key = $key;  
           $conf{$key} = $val;            $conf{$key} = $val;
             $last_key = $key;
           $key = '';            $key = '';
           $val = '';          } elsif ($val) {
         }                          push @vals, $val;
                   }
           $val = '';
   
       } elsif ($c eq ']') {        } elsif ($c eq ']') {
         $in_val = 1;          $in_val = 1;
Line 973 
Line 1058 
     }      }
   }    }
   
     unless ($key) {
       push @vals, $val;
     }
   
     if (@vals == 1) {
       $val = $vals[0];
     } elsif (@vals) {
       $val= \@vals;
     } else {
       $val = undef;
     }
   
   if (%conf) {    if (%conf) {
       $conf{_pre} = $val if $val;
     return \%conf;      return \%conf;
   } else {    } else {
     return $val;      return $val;
Line 1065 
Line 1163 
                 return \@decoded;                  return \@decoded;
         } else {          } else {
                 # XXX we should have a way to set last error, not sure why we don't                  # XXX we should have a way to set last error, not sure why we don't
                 return undef;                  return;
         }          }
 }  }
   
Line 1076 
Line 1174 
   
 =head1 SEE ALSO  =head1 SEE ALSO
   
 Trango Documentation -  Trango Documentation - http://www.trangobroadband.com/support/product_docs.htm
 http://www.trangobroadband.com/support/product_docs.htm  
   
 L<Net::Telnet>  L<Net::Telnet>
   
Line 1098 
Line 1195 
   
 =head1 COPYRIGHT AND LICENSE  =head1 COPYRIGHT AND LICENSE
   
 Copyright (C) 2005 by Andrew Fresh  Copyright (C) 2005,2006,2007 by Andrew Fresh
   
 This library is free software; you can redistribute it and/or modify  This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself, either Perl version 5.8.7 or,  it under the same terms as Perl itself, either Perl version 5.8.7 or,
 at your option, any later version of Perl 5 you may have available.  at your option, any later version of Perl 5 you may have available.
   
   
 =cut  =cut
Legend:
Removed from v.1.25  
changed lines
  Added in v.1.30
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>