trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm - diff

Return to Trango.pm CVS log

Up to [local] / trango / Net-Telnet-Trango / lib / Net / Telnet

Diff for /trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm between version 1.10 and 1.19

-version 1.10, 2006/07/31 23:16:52
+version 1.19, 2006/09/12 03:16:43
 Line 1
 Line 1
 Line 1
  package Net::Telnet::Trango;
- # $RedRiver: Trango.pm,v 1.9 2006/07/14 01:17:29 andrew Exp $
+ # $RedRiver: Trango.pm,v 1.18 2006/09/12 02:13:08 andrew Exp $
  use strict;
  use warnings;
  use base 'Net::Telnet';
  =pod
  =head1 NAME
  Net::Telnet::Trango - Perl extension for accessing the Trango telnet interface
  =head1 SYNOPSIS
    use Net::Telnet::Trango;
    my $t = new Net::Telnet::Trango ( Timeout => 5 );
    $t->open( Host => $fox ) or die "Error connecting: $!";
    $t->login('password') or die "Couldn't log in: $!";
    # Do whatever
    $t->exit;
    $t->close;
  =head1 DESCRIPTION
  Perl access to the telnet interface on Trango Foxes, SUs and APs.
  Another handy feature is that it will parse the output from certain commands that is in the format "[key1] value1 [key2] value2" and put those in a hashref that is returned.  This makes using the output from things like sysinfo very easy to do.
  =head2 EXPORT
  None
  =cut
  our $VERSION = '0.01';
  my %PRIVATE = (
    is_connected => 0,
    logged_in => 0,
  );
  =pod
  =item new
  Same as new from L<Net::Telnet> but has defaults for the trango 'Prompt'
  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
  instead return an array of the lines that were returned from the
  command.
  =cut
  sub new
  {
    my $class = shift;
    my %args;
    if (@_ == 1) {
      $args{'Host'} = shift;
    } else {
      %args = @_;
    }
    $args{'Prompt'}  ||= '/#> *$/';
    foreach my $key (keys %args) {
      $PRIVATE{$key} = $args{$key};
    }
    $PRIVATE{'Decode'} = 1 unless defined $PRIVATE{'Decode'};
    delete $args{'Decode'};
    my $self = $class->SUPER::new(%args);
    bless $self if ref $self;
    return $self;
  }
  #  _password <new password> <new password>
  #  ? [command]
  #  apsearch <secs> <ch#> <h|v> [<ch#> <h|v>]...
  #  arp -bcast <on|off>
  #  bcastscant <all|suid> <ch#> <h|v> [<ch#> <h|v> ...
  #  bye
  #  cf2cf ap [default|<size>]
  #  date
  #  date <month> <day> <year>
  #  freq scantable
  #  freq channeltable
  #  freq writescan [<ch#> <h|v>]
  #  freq writechannel [<ch#> <freq>] ...
  #  freq <ch #> <h|v>
  #  help [command]
  #  heater [<on temp> <off temp>]
  #  ipconfig [<new ip> <new subnet mask> <new gateway>]
  #  log [<# of entries, 1..179>]
  #  log <sum> <# of entries, 1..179>
  #  logout
  #  opmode [ap [y]]
  #  password
  #  ping <ip addr>
  #  polar <h|v>
  #  power <setism|setunii> <max|min|<dBm>>
  #  reboot
  #  restart
  #  remarks [<str>]
  #  rfrxthreshold [<ism|unii> <-90|-85|-80|-75|-70|-65>]
  #  rfrxth [<ism|unii> <-90|-85|-80|-75|-70|-65>]
  #  sysinfo
  #  set suid <id>
  #  set apid <id>
  #  set baseid <id>
  #  set defaultopmode [<ap|su> <min,0..10>]
  #  set defaultopmode off
  #  set snmpcomm [<read | write | trap (id or setall)> <str>]
  #  set mir [on|off]
  #  set mir threshold <kbps>
  #  set rssitarget [<ism|unii> <dBm>]
  #  set serviceradius [<ism | unii> <miles>]
  #  ssrssi <ch #> <h|v>
  #  su [<suid>|all]
  #  su changechannel <all|suid> <ch#> <h|v>
  #  su ipconfig <suid> <new ip> <new subnet> <new gateway>
  #  su [live|poweroff|priority]
  #  su <ping|info|status> <suid>
  #  su powerleveling <all|suid>
  #  su reboot <all|suid>
  #  su restart <all|suid>
  #  su testrflink <all|suid> [r]
  #  su testrflink <setlen> [64..1600]
  #  su testrflink <aptx> [20..100]
  #  su sw <suid|all> <sw #> <on|off>
  #  sudb [dload | view]
  #  sudb add <suid> pr <cir,kbps> <mir,kbps> <device id,hex>
  #  sudb add <suid> reg <cir,kbps> <mir,kbps> <device id,hex>
  #  sudb delete <all|<suid>>
  #  sudb modify <suid> <cir|mir> <kbps>
  #  sudb modify <suid> <su2su> <group id,hex>
  #  sudb view
  #  sulog [lastmins | sampleperiod <1..60>]
  #  sulog [<# of entry,1..18>]
  #  survey <ism|unii> <time, sec> <h|v>
  #  sw [<sw #> <on|off>]
  #  temp
  #  tftpd [on|off]
  #  time
  #  time <hour> <min> <sec>
  #  save <mainimage|fpgaimage> <current chksum> <new chksum>
  #  save <systemsetting|sudb>
  #  updateflash <mainimage|fpgaimage> <current chksum> <new chksum>
  #  updateflash <systemsetting|sudb>
  =pod
  =head1 METHODS
  =head2 ACCESSORS
  =over
  =item Host
  returns the name of the host that you are accessing
  =item firmware_version
  returns the firmware version on the trango if available otherwise undef.
  Available after a successful open()
  This is usually only set internally
  =item host_type
  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
  returns 1 after a successful open() otherwise undef
  This is usually only set internally
  =item logged_in
  returns 1 after a successful login() 0 if it failed and undef if
  login() was never called
  This is usually only set internally
  =item login_banner
  returns the banner that is displayed when first connected at login.  Only set after a successful open()
  This is usually only set internally
  =item last_lines
  returns the output from the last cmd() that was run as an array ref
  This is usually only set internally
  =back
  =head2 ALIASES
  =over
  =item bye
  alias of exit()
  =item restart
  alias of reboot()
  =back
  =head2 COMMANDS
- Most of these are just shortcuts to C<cmd(String =E<gt> METHOD)>, as such they accept the same options as C<cmd()>.  Specifically they take a named paramater "args", for example:
+ Most of these are just shortcuts to C<cmd(String =E<gt> METHOD)>,
- C<tftpd(args =E<gt> 'on')> would enable tftpd
+ as such they accept the same options as C<cmd()>.
+ Specifically they take a named paramater "args", for example:
- =over
+ C<tftpd(args =E<gt> 'on')> would enable tftpd
- =item tftpd
+ =over
- Returns a hash ref of the decoded output from the command.
+ =item tftpd
- Also see enable_tftpd() and disable_tftpd() as those check for correct output
+ Returns a hash ref of the decoded output from the command.
- =item ver
+ Also see enable_tftpd() and disable_tftpd() as those check for correct output
- Returns a hash ref of the decoded output from the command.
+ =item ver
- =item sysinfo
+ 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 exit
+ Returns a hash ref of the decoded output from the command.
- exits the command session with the trango and closes the connection
+ =item exit
- =item reboot
+ exits the command session with the trango and closes the connection
- reboots the trango and closes the connection
+ =item reboot
- =item sulog
+ reboots the trango and closes the connection
- returns an array ref of hashes containing each log line.
+ =item remarks
- =item save_sudb
+ Takes an optional argument, which sets the remarks.
+ If there is no argument, returns the current remarks.
- returns true on success, undef on failure
+ =item sulog
- =item syslog
+ returns an array ref of hashes containing each log line.
- returns the output from the syslog command
+ =item save_sudb
- =item pipe
+ returns true on success, undef on failure
- returns the output from the pipe command
+ =item syslog
- =item maclist
+ returns the output from the syslog command
- returns the output from the maclist command
+ =item pipe
- =item maclist_reset
+ returns the output from the pipe command
- resets the maclist.  No useful output.
+ =item maclist
- =item eth_list
+ returns the output from the maclist command
- returns the output from the eth list command
+ =item maclist_reset
- =cut
+ resets the maclist.  No useful output.
- my $success = 'Success.';
+ =item eth_list
- my %COMMANDS = (
-   tftpd       => { decode => 'all',   expect => $success },
+ returns the output from the eth list command
-   ver         => { decode => 'all' },
-   sysinfo     => { decode => 'all',   expect => $success },
+ =item su_info
-   updateflash => { decode => 'all',   expect => $success },
-   sulog       => { decode => 'sulog', expect => $success },
+ You need to pass in args => <suid> and it will return the info for that suid.
-   'exit'      => { no_prompt => 1, cmd_disconnects => 1 },
-   reboot      => { no_prompt => 1, cmd_disconnects => 1 },
+ =item save_ss
-   save_sudb   => { String => 'save sudb', expect => $success },
-   syslog      => { expect => $success },
+ saves the config.  Returns 1 on success, undef on failure.
-   'pipe'      => { }, # XXX needs a special decode
-   maclist     => { }, # XXX needs a special decode and a special expect
+ =cut
-   maclist_reset => { String => 'maclist reset', expect => 'done' },
-   eth_link    => { String => 'eth link', expect => $success },
-   # eth r, w and reset???
+ my $success = 'Success.';
-   #su password???
+ my %COMMANDS = (
-   #_bootloader
+   tftpd       => { decode => 'all',   expect => $success },
-   #temp
+   ver         => { decode => 'all' },
-   #heater
+   sysinfo     => { decode => 'all',   expect => $success },
- );
+   updateflash => { decode => 'all',   expect => $success },
+   sulog       => { decode => 'sulog', expect => $success },
- my %ALIASES = (
+   'exit'      => { no_prompt => 1, cmd_disconnects => 1 },
-   bye     => 'exit',
+   reboot      => { no_prompt => 1, cmd_disconnects => 1 },
-   restart => 'reboot',
+   remarks     => { decode => 'all', expect => $success },
- );
+   save_sudb   => { String => 'save sudb', expect => $success },
+   syslog      => { expect => $success },
- my %ACCESS = map { $_ => 1 } qw(
+   'pipe'      => { }, # XXX needs a special decode
-   firmware_version
+   maclist     => { decode => 'maclist' },
-   host_type
+   maclist_reset => { String => 'maclist reset', expect => 'done' },
-   Host
+   eth_link    => { String => 'eth link', expect => $success },
-   is_connected
+   su_info     => { String => 'su info', decode => 'all', expect => $success },
-   logged_in
+   save_ss     => { String => 'save ss', expect => $success },
-   login_banner
+   # eth r, w and reset???
-   Timeout
+   #su password???
-   last_lines
+   #_bootloader
-   last_vals
+   #temp
- );
+   #heater
+ );
- sub AUTOLOAD
- {
+ my %ALIASES = (
-   my $self = shift;
+   bye     => 'exit',
+   restart => 'reboot',
-   my ($method) = (our $AUTOLOAD) =~ /^.*::(\w+)$/
+ );
-     or die "Weird: $AUTOLOAD";
+ my %ACCESS = map { $_ => 1 } qw(
-   if (exists $ALIASES{$method}) {
+   firmware_version
-     $method = $ALIASES{$method};
+   host_type
-     return $self->$method(@_);
+   Host
-   }
+   is_connected
+   logged_in
-   if (exists $COMMANDS{$method}) {
+   login_banner
-     $method = shift if (@_ == 1);
+   Timeout
-     $COMMANDS{$method}{'String'} ||= $method;
+   last_lines
-     return $self->cmd(%{ $COMMANDS{$method} }, @_);
+   last_vals
-   }
+ );
-   if (exists $ACCESS{$method}) {
+ sub AUTOLOAD
-     my $prev = $PRIVATE{$method};
+ {
-     ($PRIVATE{$method}) = @_ if @_;
+   my $self = shift;
-     return $prev;
-   }
+   my ($method) = (our $AUTOLOAD) =~ /^.*::(\w+)$/
+     or die "Weird: $AUTOLOAD";
-   $method = "SUPER::$method";
-   return $self->$method(@_);
+   if (exists $ALIASES{$method}) {
- }
+     $method = $ALIASES{$method};
+     return $self->$method(@_);
- =pod
+   }
- =item open
+   if (exists $COMMANDS{$method}) {
+     $COMMANDS{$method}{'String'} ||= $method;
- 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 host_type() and firmware_version()
+     $COMMANDS{$method}{'args'} .= ' ' . shift if (@_ == 1);
+     return $self->cmd(%{ $COMMANDS{$method} }, @_);
- =cut
+   }
- sub open
+   if (exists $ACCESS{$method}) {
- {
+     my $prev = $PRIVATE{$method};
-   my $self = shift;
+     ($PRIVATE{$method}) = @_ if @_;
+     return $prev;
-   unless ( $self->SUPER::open(@_) ) {
+   }
-     #$! = "Couldn't connect to " . $self->Host . ":  $!";
-     return undef;
+   $method = "SUPER::$method";
-   }
+   return $self->$method(@_);
+ }
-   ## Get to login prompt
-   unless ($self->waitfor(
+ =pod
-       -match => '/password: ?$/i',
-       -errmode => "return",
+ =item open
-     ) ) {
-     #$! = "problem connecting to host (" . $self->Host . "): " .
+ 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 host_type() and firmware_version()
-     #    $self->lastline;
-     return undef;
+ =cut
-   }
+ sub open
-   $self->parse_login_banner($self->lastline);
+ {
+   my $self = shift;
-   $self->is_connected(1);
+   unless ( $self->SUPER::open(@_) ) {
-   return $self->is_connected;
+     #$! = "Couldn't connect to " . $self->Host . ":  $!";
- }
+     return undef;
+   }
- =pod
+   ## Get to login prompt
- =item login
+   unless ($self->waitfor(
+       -match => '/password: ?$/i',
- Calls open() if not already connected, then sends the password and sets logged_in() if successful
+       -errmode => "return",
+     ) ) {
- =cut
+     #$! = "problem connecting to host (" . $self->Host . "): " .
+     #    $self->lastline;
- sub login
+     return undef;
- {
+   }
-   my $self = shift;
+   $self->parse_login_banner($self->lastline);
-   unless ($self->is_connected) {
-     $self->open or return undef;
+   $self->is_connected(1);
-   }
+   return $self->is_connected;
-   my $password = shift;
+ }
-   $self->print($password);
+ =pod
-   unless ($self->waitfor(
-     -match => $self->prompt,
+ =item login
-     -errmode => "return",
-   ) ) {
+ Calls open() if not already connected, then sends the password and sets logged_in() if successful
-     #$! = "login ($self->Host) failed: " . $self->lastline;
-     return undef;
+ =cut
-   }
+ sub login
-   $self->logged_in(1);
+ {
+   my $self = shift;
-   return $self->logged_in;
- }
+   unless ($self->is_connected) {
+     $self->open or return undef;
- =pod
+   }
- =item parse_login_banner
+   my $password = shift;
- 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 host_type() and firmware_version() as well as login_banner()
+   $self->print($password);
+   unless ($self->waitfor(
- =cut
+     -match => $self->prompt,
+     -errmode => "return",
- sub parse_login_banner
+   ) ) {
- {
+     #$! = "login ($self->Host) failed: " . $self->lastline;
-   my $self = shift;
+     return undef;
+   }
-   if (@_) {
-     $self->login_banner(@_);
+   $self->logged_in(1);
-   }
+   return $self->logged_in;
-   my $banner = $self->login_banner;
+ }
-   my ($type, $ver) = $banner =~
+ =pod
-     /Welcome to Trango Broadband Wireless (\S+)[\s-]+(.+)$/i;
+ =item parse_login_banner
-   $self->login_banner($banner);
-   $self->host_type($type);
+ 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 host_type() and firmware_version() as well as login_banner()
-   $self->firmware_version($ver);
+ =cut
-   return 1;
- }
+ sub parse_login_banner
+ {
- =pod
+   my $self = shift;
- =item su_password
+   if (@_) {
+     $self->login_banner(@_);
- C<su_password('all'|suid, 'new_password')>
+   }
- =cut
+   my $banner = $self->login_banner;
- sub su_password
+   my ($type, $ver) = $banner =~
- {
+     /Welcome to Trango Broadband Wireless (\S+)[\s-]+(.+)$/i;
-   my $self     = shift;
-   my $su       = shift || '!';
+   $self->login_banner($banner);
-   my $new_pass = shift || '';
+   $self->host_type($type);
+   $self->firmware_version($ver);
-   unless (defined $su) {
-     warn "No su passed!"
+   return 1;
-     #return undef;
+ }
-   }
+ =pod
-   unless (defined $new_pass) {
-     warn "No new password!"
+ =item su_password
-     #return undef;
-   }
+ C<su_password('all'|suid, 'new_password')>
-   return $self->cmd(String => 'su password ' .
+ =cut
-                      $su . ' ' .
-                      $new_pass . ' ' .
+ sub su_password
-                      $new_pass,
+ {
-                      expect => $success,
+   my $self     = shift;
-                     );
+   my $su       = shift || '!';
- }
+   my $new_pass = shift || '';
- =pod
+   unless (defined $su) {
+     warn "No su passed!"
- =item sudb_view
+     #return undef;
+   }
- returns a reference to an array of hashes each containing:
+   unless (defined $new_pass) {
-   suid
+     warn "No new password!"
-   type
+     #return undef;
-   cir
+   }
-   mir
-   mac
+   return $self->cmd(String => 'su password ' .
+                      $su . ' ' .
- =cut
+                      $new_pass . ' ' .
+                      $new_pass,
- sub sudb_view
+                      expect => $success,
- {
+                     );
-   my $self = shift;
+ }
-   my @lines = $self->cmd( String => 'sudb view', expect => $success );
+ =pod
-   return undef unless @lines;
+ =item su_ipconfig
-   unless ($PRIVATE{'Decode'}) {
+ C<su_ipconfig( 'suid', 'new_ip', 'new_subnet', 'new_gateway' )>
-     return @lines;
-   }
+ =cut
-   my @sus;
+ sub su_ipconfig
-   foreach (@lines) {
+ {
-     next unless $_;
+         my $self        = shift;
-     if (/^\[(\d+)\]\s+(\d+)\s+(\d+)\s+(\d+)\s+([0-9A-Fa-f\s]+)$/) {
-       my %s = (
+         my $suid        = shift;
-         suid => $1,
+         my $new_ip      = shift;
-         type => $2,
+         my $new_subnet  = shift;
-         cir  => $3,
+         my $new_gateway = shift;
-         mir  => $4,
-         mac  => $5,
+         return undef unless $suid =~ /^\d+$/;
-       );
+         return undef unless $new_ip;
+         return undef unless $new_subnet;
-           $s{'mac'} =~ s/\s//g;
+         return undef unless $new_gateway;
-           $s{'mac'} = uc($s{'mac'});
+         # su ipconfig <suid> <new ip> <new subnet> <new gateway>
-       push @sus, \%s;
+         return $self->cmd(String => 'su ipconfig ' .
-     }
+                      $suid       . ' ' .
-   }
+                      $new_ip     . ' ' .
+                      $new_subnet . ' ' .
-   return \@sus;
+                      $new_gateway,
- }
+                      expect => $success,
+                     );
- =pod
+ }
- =item sudb_add
+ =pod
- Takes the following paramaters
+ =item sudb_view
-         suid : numeric,
+ returns a reference to an array of hashes each containing:
-         type : (reg|pr)
-         cir  : numeric,
+   suid
-         mir  : numeric,
+   type
-         mac  : Almost any format, it will be reformatted,
+   cir
+   mir
- and returns true on success or undef otherwise.
+   mac
- You should save_sudb() after calling this, or your changes  will be lost
+ =cut
- when the AP is rebooted.
+ sub sudb_view
- =cut
+ {
+   my $self = shift;
- sub sudb_add
- {
+   my @lines = $self->cmd( String => 'sudb view', expect => $success );
-         my $self = shift;
-         my $suid = shift;
+   return undef unless @lines;
-         my $type = shift;
-         my $cir  = shift;
+   unless ($PRIVATE{'Decode'}) {
-         my $mir  = shift;
+     return @lines;
-         my $mac  = shift;
+   }
-         if ($suid =~ /\D/) {
+   my @sus;
-                 return undef;
+   foreach (@lines) {
-         }
+     next unless $_;
+     if (/^\[(\d+)\]\s+(\d+)\s+(\d+)\s+(\d+)\s+([0-9A-Fa-f\s]+)$/) {
-         unless (lc($type) eq 'reg' || lc($type) eq 'pr') {
+       my %s = (
-                 warn "Invalid type '$type'!";
+         suid => $1,
-                 return undef;
+         type => $2,
-         }
+         cir  => $3,
+         mir  => $4,
-         if ($cir =~ /\D/) {
+         mac  => $5,
-                 warn "Invalid CIR '$cir'!";
+       );
-                 return undef;
-         }
+           $s{'mac'} =~ s/\s//g;
+           $s{'mac'} = uc($s{'mac'});
-         if ($mir =~ /\D/) {
-                 warn "Invalid MIR '$mir'!";
+       push @sus, \%s;
-                 return undef;
+     }
-         }
+   }
-         my $new_mac = $mac;
+   return \@sus;
-         $new_mac =~ s/[^0-9A-Fa-f]//;
+ }
-         unless (length $new_mac == 12) {
-                 warn "Invalid MAC '$mac'!";
+ =pod
-                 return undef;
-         }
+ =item sudb_add
-         $new_mac = join ' ', $new_mac =~ /../g;
+ Takes the following paramaters
-         my $string = 'sudb add ' .
-                 $suid . ' ' .
+         suid : numeric,
-                 $type . ' ' .
+         type : (reg|pr)
-                 $cir  . ' ' .
+         cir  : numeric,
-                 $mir  . ' ' .
+         mir  : numeric,
-                 $new_mac;
+         mac  : Almost any format, it will be reformatted,
+ and returns true on success or undef otherwise.
-         return $self->cmd( String => $string, expect => $success );
- }
+ You should save_sudb() after calling this, or your changes  will be lost
+ when the AP is rebooted.
- =pod
+ =cut
- =item sudb_delete
+ sub sudb_add
- Takes either 'all' or the  suid of the su to delete
+ {
- and returns true on success or undef otherwise.
+         my $self = shift;
+         my $suid = shift;
- You should save_sudb() after calling this, or your changes  will be lost
+         my $type = shift;
- when the AP is rebooted.
+         my $cir  = shift;
+         my $mir  = shift;
- =cut
+         my $mac  = shift;
- sub sudb_delete
+         if ($suid =~ /\D/) {
- {
+                 return undef;
-         my $self = shift;
+         }
-         my $suid = shift;
+         unless (lc($type) eq 'reg' || lc($type) eq 'pr') {
-         if (lc($suid) ne 'all' || $suid =~ /\D/) {
+                 warn "Invalid type '$type'!";
                  return undef;
          }
-         return $self->cmd( String => 'sudb delete ' . $suid, expect => $success );
+         if ($cir =~ /\D/) {
- }
+                 warn "Invalid CIR '$cir'!";
+                 return undef;
- =pod
+         }
- =item sudb_modify
+         if ($mir =~ /\D/) {
+                 warn "Invalid MIR '$mir'!";
- Takes either the  suid of the su to delete
+                 return undef;
- as well as what you are changing, either "cir, mir or su2su"
+         }
- and returns true on success or undef otherwise.
+         my $new_mac = $mac;
- cir and mir also take a value to set the cir/mir to.
+         $new_mac =~ s/[^0-9A-Fa-f]//;
+         unless (length $new_mac == 12) {
- su2su takes a group id parameter that is in hex.
+                 warn "Invalid MAC '$mac'!";
+                 return undef;
- You should save_sudb() after calling this, or your changes  will be lost
+         }
- when the AP is rebooted.
+         $new_mac = join ' ', $new_mac =~ /../g;
- =cut
+         my $string = 'sudb add ' .
+                 $suid . ' ' .
- sub sudb_modify
+                 $type . ' ' .
- {
+                 $cir  . ' ' .
-         my $self  = shift;
+                 $mir  . ' ' .
-         my $suid  = shift;
+                 $new_mac;
-         my $opt   = shift;
-         my $value = shift;
+         return $self->cmd( String => $string, expect => $success );
-         if ($suid =~ /\D/) {
+ }
-                 return undef;
-         }
+ =pod
-         if (lc($opt) eq 'cir' or lc($opt) eq 'mir') {
+ =item sudb_delete
-                 if ($value =~ /\D/) {
-                         return undef;
+ Takes either 'all' or the  suid of the su to delete
-                 }
+ and returns true on success or undef otherwise.
-         } elsif (lc($opt) eq 'su2su') {
-                 if ($value =~ /[^0-9A-Za-f]/) {
+ You should save_sudb() after calling this, or your changes  will be lost
-                         return undef;
+ when the AP is rebooted.
-                 }
-         } else {
+ =cut
-                 return undef;
-         }
+ sub sudb_delete
+ {
-         my $string = 'sudb modify ' . $suid . ' ' . $opt . ' ' . $value;
+         my $self = shift;
+         my $suid = shift;
-         return $self->cmd( String => $string, expect => $success );
- }
+         if (lc($suid) ne 'all' || $suid =~ /\D/) {
+                 return undef;
- =pod
+         }
- =item enable_tftpd
+         return $self->cmd( String => 'sudb delete ' . $suid, expect => $success );
+ }
- runs C<tftpd(args =E<gt> 'on')> and makes sure that Tftpd is now 'listen'ing
+ =pod
- =cut
+ =item sudb_modify
- sub enable_tftpd
- {
+ Takes either the  suid of the su to delete
-   my $self = shift;
+ as well as what you are changing, either "cir, mir or su2su"
+ and returns true on success or undef otherwise.
-   my $vals = $self->tftpd( args => 'on' );
+ cir and mir also take a value to set the cir/mir to.
-   if ($vals->{'Tftpd'} eq 'listen') {
-     return $vals;
+ su2su takes a group id parameter that is in hex.
-   } else {
-     return undef;
+ You should save_sudb() after calling this, or your changes  will be lost
-   }
+ when the AP is rebooted.
- }
+ =cut
- =pod
+ sub sudb_modify
- =item disable_tftpd
+ {
+         my $self  = shift;
- runs C<tftpd(args =E<gt> 'off')> and makes sure that Tftpd is now 'disabled'
+         my $suid  = shift;
+         my $opt   = shift;
- =cut
+         my $value = shift;
- sub disable_tftpd
+         if ($suid =~ /\D/) {
- {
+                 return undef;
-   my $self = shift;
+         }
-   my $vals = $self->tftpd( args => 'off' );
+         if (lc($opt) eq 'cir' or lc($opt) eq 'mir') {
+                 if ($value =~ /\D/) {
-   if (ref $vals eq 'HASH' && $vals->{'Tftpd'} eq 'disabled') {
+                         return undef;
-     return $vals;
+                 }
-   } else {
+         } elsif (lc($opt) eq 'su2su') {
-     return undef;
+                 if ($value =~ /[^0-9A-Za-f]/) {
-   }
+                         return undef;
- }
+                 }
+         } else {
- =pod
+                 return undef;
+         }
- =item cmd
+         my $string = 'sudb modify ' . $suid . ' ' . $opt . ' ' . $value;
- This does most of the work.  At the heart, it calls Net::Telnet::cmd() but it also does some special stuff for Trango.
+         return $self->cmd( String => $string, expect => $success );
- Normally returns the last lines from from the command
+ }
- Also accepts these options:
+ =pod
- I<decode>
+ =item enable_tftpd
- - if this is true, then it will send the output lines to _decode_lines() and then returns the decoded output
+ runs C<tftpd(args =E<gt> 'on')> and makes sure that Tftpd is now 'listen'ing
- I<cmd_disconnects>
- - if this is true, it then sets logged_in() to false, then it will close() the connection and then sets is_connected() to false
+ =cut
- I<expect>
+ sub enable_tftpd
- - 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 command probably failed
+ {
+   my $self = shift;
- I<args>
- - a string containing the command line options that are passed to the command
+   my $vals = $self->tftpd( args => 'on' );
- =cut
+   if ($vals->{'Tftpd'} eq 'listen') {
+     return $vals;
- sub cmd
+   } else {
- {
+     return undef;
-   my $self = shift;
+   }
+ }
-   my @valid_net_telnet_opts = qw(
-     String
+ =pod
-     Output
-     Cmd_remove_mode
+ =item disable_tftpd
-     Errmode
-     Input_record_separator
+ runs C<tftpd(args =E<gt> 'off')> and makes sure that Tftpd is now 'disabled'
-     Ors
-     Output_record_separator
+ =cut
-     Prompt
-     Rs
+ sub disable_tftpd
-     Timeout
+ {
-   );
+   my $self = shift;
-   my %cfg;
+   my $vals = $self->tftpd( args => 'off' );
-   if (@_ == 1) {
-     $cfg{'String'} = shift;
+   if (ref $vals eq 'HASH' && $vals->{'Tftpd'} eq 'disabled') {
-   } elsif (@_ > 1) {
+     return $vals;
-     %cfg = @_;
+   } else {
-   }
+     return undef;
+   }
-   $cfg{'Timeout'} ||= $self->Timeout;
+ }
-   unless ($cfg{'String'}) {
+ =pod
-     #$! = "No command passed";
-     #warn "No command passed\n";
+ =item cmd
-     return undef;
-   }
+ This does most of the work.  At the heart, it calls Net::Telnet::cmd() but it also does some special stuff for Trango.
-   unless ($self->is_connected) {
+ Normally returns the last lines from from the command
-     #$! = "Not connected";
-     #warn "Not connected\n";
+ Also accepts these options:
-     return undef;
-   }
+ I<decode>
+ - if this is true, then it will send the output lines to _decode_lines() and then returns the decoded output
-   unless ($self->logged_in) {
-     #$! = "Not logged in";
+ I<cmd_disconnects>
-     #warn "Not logged in\n";
+ - if this is true, it then sets logged_in() to false, then it will close() the connection and then sets is_connected() to false
-     return undef;
-   }
+ I<expect>
+ - 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 command probably failed
-   my %cmd;
+ I<args>
-   foreach (@valid_net_telnet_opts) {
+ - a string containing the command line options that are passed to the command
-     if (exists $cfg{$_}) {
-       $cmd{$_} = $cfg{$_};
+ =cut
-     }
-   }
+ sub cmd
-   if ($cfg{'args'}) {
+ {
-     $cmd{'String'} .= ' ' . $cfg{'args'};
+   my $self = shift;
-   }
-   my @lines;
+   my @valid_net_telnet_opts = qw(
-   unless ($cfg{'no_prompt'}) {
+     String
-     @lines = $self->SUPER::cmd(%cmd);
+     Output
-   } else {
+     Cmd_remove_mode
-     $self->print($cmd{'String'});
+     Errmode
-     @lines = $self->lastline;
+     Input_record_separator
-   }
+     Ors
+     Output_record_separator
-   $self->last_lines(\@lines);
+     Prompt
+     Rs
-   my $vals = 1;
+     Timeout
-   if ($PRIVATE{'Decode'} && $cfg{'decode'}) {
+   );
-     if ($cfg{'decode'} eq 'each') {
-       $vals = _decode_each_line(@lines);
+   my %cfg;
-     } elsif ($cfg{'decode'} eq 'sulog') {
+   if (@_ == 1) {
-       $vals = _decode_sulog(@lines);
+     $cfg{'String'} = shift;
-     } else {
+   } elsif (@_ > 1) {
-       $vals = _decode_lines(@lines);
+     %cfg = @_;
-     }
+   }
-   }
+   $cfg{'Timeout'} ||= $self->Timeout;
-   $self->last_vals($vals);
+   unless ($cfg{'String'}) {
+     #$! = "No command passed";
-   my $last = $self->lastline;
+     #warn "No command passed\n";
+     return undef;
-   if ((not $cfg{'expect'}) || $last =~ /$cfg{'expect'}$/) {
+   }
-     if ($cfg{'cmd_disconnects'}) {
-       $self->logged_in(0);
+   unless ($self->is_connected) {
-       $self->close;
+     #$! = "Not connected";
-       $self->is_connected(0);
+     #warn "Not connected\n";
-     }
+     return undef;
+   }
-     if ($PRIVATE{'Decode'} && $cfg{'decode'}) {
-       return $vals;
+   unless ($self->logged_in) {
-     } else {
+     #$! = "Not logged in";
-       return @lines;
+     #warn "Not logged in\n";
-     }
+     return undef;
-   } else {
+   }
-     #$! = "Error with command ($cfg{'string'}): $last";
-     return undef;
-   }
+   my %cmd;
- }
+   foreach (@valid_net_telnet_opts) {
+     if (exists $cfg{$_}) {
- #=item _decode_lines
+       $cmd{$_} = $cfg{$_};
+     }
- sub _decode_lines
+   }
- {
+   if ($cfg{'args'}) {
-   my @lines = @_;
+     $cmd{'String'} .= ' ' . $cfg{'args'};
+   }
-   my %conf;
+   my @lines;
+   unless ($cfg{'no_prompt'}) {
-   my $key = '';
+     @lines = $self->SUPER::cmd(%cmd);
-   my $val = '';
+   } else {
-   my $in_key = 0;
+     $self->print($cmd{'String'});
-   my $in_val = 0;
+     @lines = $self->lastline;
+   }
-   foreach my $line (@lines) {
-     next if $line =~ /$success$/;
+   $self->last_lines(\@lines);
-     my @chars = split //, $line;
+   my $vals = 1;
+   if ($PRIVATE{'Decode'} && $cfg{'decode'}) {
-     my $last_key = '';
+     if ($cfg{'decode'} eq 'each') {
-     foreach my $c (@chars) {
+       $vals = _decode_each_line(@lines);
+     } elsif ($cfg{'decode'} eq 'sulog') {
-       if ($c eq '[' || $c eq "\r" || $c eq "\n") {
+       $vals = _decode_sulog(@lines);
-         if ($c eq '[') {
+     } elsif ($cfg{'decode'} eq 'maclist') {
-           $in_key = 1;
+       $vals = _decode_maclist(@lines);
-           $in_val = 0;
+     } else {
-         } else {
+       $vals = _decode_lines(@lines);
-           $in_key = 0;
+     }
-           $in_val = 0;
+   }
-         }
+   $self->last_vals($vals);
-         if ($key) {
-           $key =~ s/^\s+//;
-           $key =~ s/\s+$//;
+   my $last = $self->lastline;
-           $val =~ s/^\s+//;
+   if ((not $cfg{'expect'}) || $last =~ /$cfg{'expect'}$/) {
-           $val =~ s/\s+$//;
+     if ($cfg{'cmd_disconnects'}) {
+       $self->logged_in(0);
-           if ($key eq 'Checksum' && $last_key) {
+       $self->close;
-             # Special case for these bastids.
+       $self->is_connected(0);
-             my $new = $last_key;
+     }
-             $new =~ s/\s+\S+$//;
-             $key = $new . " " . $key;
+     if ($PRIVATE{'Decode'} && $cfg{'decode'}) {
-           }
+       return $vals;
+     } else {
-           $last_key = $key;
+       return @lines;
-           $conf{$key} = $val;
+     }
-           $key = '';
+   } else {
-           $val = '';
+     #$! = "Error with command ($cfg{'string'}): $last";
-         }
+     return undef;
+   }
-       } elsif ($c eq ']') {
+ }
-         $in_val = 1;
-         $in_key = 0;
+ #=item _decode_lines
-         $c = shift @chars;
+ sub _decode_lines
-       } elsif ($in_key) {
+ {
-         $key .= $c;
+   my @lines = @_;
-       } elsif ($in_val) {
+   my %conf;
-         $val .= $c;
-       }
+   my $key = '';
-     }
+   my $val = undef;
-   }
+   my $in_key = 0;
+   my $in_val = 1;
-   if (%conf) {
-     return \%conf;
+   foreach my $line (@lines) {
-   } else {
+     next if $line =~ /$success$/;
-     return undef;
-   }
+     my @chars = split //, $line;
- }
+     my $last_key = '';
- #=item _decode_each_line
+     foreach my $c (@chars) {
- sub _decode_each_line
+       if ($c eq '[' || $c eq "\r" || $c eq "\n") {
- {
+         if ($c eq '[') {
-   my @lines = @_;
+           $in_key = 1;
-   my @decoded;
+           $in_val = 0;
-   foreach my $line (@lines) {
+         } else {
-     my $decoded = _decode_lines($line);
+           $in_key = 0;
-     push @decoded, $decoded if defined $decoded;
+           $in_val = 1;
-   }
+         }
-   return \@decoded;
- }
+         if ($key) {
+           $key =~ s/^\s+//;
- #=item _decode_sulog
+           $key =~ s/\s+$//;
- sub _decode_sulog
+           if (defined $val) {
- {
+             $val =~ s/^\s+//;
-   my @lines = @_;
+             $val =~ s/\s+$//;
-   my @decoded;
+           }
-   my $last_tm;
-   foreach my $line (@lines) {
+           if ($key eq 'Checksum' && $last_key) {
-     my $decoded = _decode_lines($line);
+             # Special case for these bastids.
+             my $new = $last_key;
-     if (defined $decoded) {
+             $new =~ s/\s+\S+$//;
-       if ($decoded->{'tm'}) {
+             $key = $new . " " . $key;
-         $last_tm = $decoded->{'tm'};
+           }
-         next;
-       } else {
+           $last_key = $key;
-         $decoded->{'tm'} = $last_tm;
+           $conf{$key} = $val;
-       }
+           $key = '';
-       next unless $last_tm;
+           $val = '';
+         }
-       push @decoded, $decoded if defined $decoded;
-     }
+       } elsif ($c eq ']') {
-   }
+         $in_val = 1;
-   return \@decoded;
+         $in_key = 0;
- }
+         $c = shift @chars;
-;
+       } elsif ($in_key) {
- __END__
+         $key .= $c;
- =back
+       } elsif ($in_val) {
+         $val .= $c;
- =head1 SEE ALSO
+       }
+     }
- Trango Documentation - http://www.trangobroadband.com/support/product_docs.htm
+   }
- L<Net::Telnet>
+   if (%conf) {
+     return \%conf;
- =head1 TODO
+   } else {
+     return $val;
- There are still a lot of commands that are not accessed directly.  If you call them (as cmd("command + args") or whatever) and it works, please send me examples that work and I will try to get it incorporated into the next version of the script.
+   }
+ }
- I also want to be able to parse the different types of output from commands like su, sudb all and anything else that would be better available as a perl datastructure.
+ #=item _decode_each_line
- =head1 AUTHOR
+ sub _decode_each_line
- Andrew Fresh E<lt>andrew@rraz.netE<gt>
+ {
+   my @lines = @_;
- =head1 COPYRIGHT AND LICENSE
+   my @decoded;
+   foreach my $line (@lines) {
- Copyright (C) 2005 by Andrew Fresh
+     my $decoded = _decode_lines($line);
+     push @decoded, $decoded if defined $decoded;
- 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,
+   return \@decoded;
- at your option, any later version of Perl 5 you may have available.
+ }
+ #=item _decode_sulog
- =cut
+ sub _decode_sulog
+ {
+   my @lines = @_;
+   my @decoded;
+   my $last_tm;
+   foreach my $line (@lines) {
+     my $decoded = _decode_lines($line);
+     if (defined $decoded) {
+       if ($decoded->{'tm'}) {
+         $last_tm = $decoded->{'tm'};
+         next;
+       } else {
+         $decoded->{'tm'} = $last_tm;
+       }
+       next unless $last_tm;
+       push @decoded, $decoded if defined $decoded;
+     }
+   }
+   return \@decoded;
+ }
+ #=item _decode_maclist
+ sub _decode_maclist
+ {
+         my @lines = @_;
+         my @decoded;
+         my $total_entries = 0;
+         my $current_tm = 0;
+         foreach my $line (@lines) {
+                 $line =~ s/\r?\n$//;
+                 my ($mac, $loc, $tm) = $line =~ /
+                         ([0-9a-fA-F ]{17})\s+
+                         (.*)\s+
+                         tm\s+
+                         (\d+)
+                 /x;
+                 if ($mac) {
+                         $mac =~ s/\s+//g;
+                         $loc =~ s/^\s+//;
+                         $loc =~ s/\s+$//;
+                         my $suid = undef;
+                         if ($loc =~ /suid\s+=\s+(\d+)/) {
+                                 $suid = $1;
+                                 $loc = undef;
+                         }
+                         push @decoded, {
+                                 mac  => $mac,
+                                 loc  => $loc,
+                                 tm   => $tm,
+                                 suid => $suid,
+                         };
+                 } elsif ($line =~ /(\d+)\s+entries/) {
+                         $total_entries = $1;
+                 } elsif ($line =~ /current tm = (\d+)\s+sec/) {
+                         $current_tm = $1
+                 }
+         }
+         map { $_->{'cur_tm'} = $current_tm } @decoded;
+         if (scalar @decoded == $total_entries) {
+                 return \@decoded;
+         } else {
+                 # XXX we should have a way to set last error, not sure why we don't
+                 return undef;
+         }
+ }
+;
+ __END__
+ =back
+ =head1 SEE ALSO
+ Trango Documentation - http://www.trangobroadband.com/support/product_docs.htm
+ L<Net::Telnet>
+ =head1 TODO
+ There are still a lot of commands that are not accessed directly.  If you call them (as cmd("command + args") or whatever) and it works, please send me examples that work and I will try to get it incorporated into the next version of the script.
+ I also want to be able to parse the different types of output from commands like su, sudb all and anything else that would be better available as a perl datastructure.
+ =head1 AUTHOR
+ Andrew Fresh E<lt>andrew@rraz.netE<gt>
+ =head1 COPYRIGHT AND LICENSE
+ Copyright (C) 2005 by Andrew Fresh
+ 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,
+ at your option, any later version of Perl 5 you may have available.
+ =cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>