=================================================================== RCS file: /cvs/trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm,v retrieving revision 1.34 retrieving revision 1.36 diff -u -r1.34 -r1.36 --- trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2007/02/05 21:02:07 1.34 +++ trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2007/02/05 21:09:26 1.36 @@ -1,6 +1,6 @@ package Net::Telnet::Trango; -# $RedRiver: Trango.pm,v 1.33 2007/02/02 21:26:56 andrew Exp $ +# $RedRiver: Trango.pm,v 1.35 2007/02/05 21:03:40 andrew Exp $ use strict; use warnings; use base 'Net::Telnet'; @@ -55,8 +55,8 @@ =head2 B - Creates a new Net::Telnet::Trango object. - new([Options from Net::Telnet,] - [Decode => 0,]); + new([Options from Net::Telnet,] + [Decode => 0,]); Same as new from L but sets the default Trango Prompt: '/#> *$/' @@ -345,21 +345,16 @@ remarks => { decode => 'all', expect => $success }, save_sudb => { String => 'save sudb', expect => $success }, syslog => { expect => $success }, - 'pipe' => {}, # XXX needs a special decode - maclist => { decode => 'maclist' }, - maclist_reset => { String => 'maclist reset', expect => 'done' }, - eth_link => { String => 'eth link', expect => $success }, - su_info => { String => 'su info', decode => 'all', expect => $success }, + 'pipe' => {}, # XXX needs a special decode + maclist => { decode => 'maclist' }, + maclist_reset => { String => 'maclist reset', expect => 'done' }, + eth_link => { String => 'eth link', expect => $success }, + su_info => + { String => 'su info', decode => 'all', expect => $success }, su_testrflink => - { String => 'su testrflink', decode => 'each', expect => $success }, - save_ss => { String => 'save ss', expect => $success }, - opmode => { decode => 'all', expect => $success }, - - # eth r, w and reset??? - #su password??? - #_bootloader - #temp - #heater + { String => 'su testrflink', decode => 'each', expect => $success }, + save_ss => { String => 'save ss', expect => $success }, + opmode => { decode => 'all', expect => $success }, ); my %ALIASES = ( @@ -647,11 +642,11 @@ Takes the following paramaters - suid : numeric, - type : (reg|pr) - cir : numeric, - mir : numeric, - mac : Almost any format, it will be reformatted, + suid : numeric, + type : (reg|pr) + cir : numeric, + mir : numeric, + mac : Almost any format, it will be reformatted, and returns true on success or undef otherwise. @@ -864,7 +859,7 @@ - a string containing the command line options that are passed to the command - $t->cmd( String => 'exit', no_prompt => 1, cmd_disconnects => 1 ); + $t->cmd( String => 'exit', no_prompt => 1, cmd_disconnects => 1 ); =cut @@ -1114,11 +1109,11 @@ foreach my $line (@lines) { $line =~ s/\r?\n$//; my ( $mac, $loc, $tm ) = $line =~ / - ([0-9a-fA-F ]{17})\s+ - (.*)\s+ - tm\s+ - (\d+) - /x; + ([0-9a-fA-F ]{17})\s+ + (.*)\s+ + tm\s+ + (\d+) + /x; if ($mac) { $mac =~ s/\s+//g;