=================================================================== RCS file: /cvs/trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm,v retrieving revision 1.49 retrieving revision 1.51 diff -u -r1.49 -r1.51 --- trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2008/02/08 19:29:05 1.49 +++ trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm 2008/02/18 16:37:35 1.51 @@ -1,6 +1,6 @@ package Net::Telnet::Trango; -# $RedRiver: Trango.pm,v 1.48 2008/02/08 18:49:41 andrew Exp $ +# $RedRiver: Trango.pm,v 1.50 2008/02/08 19:32:15 andrew Exp $ use strict; use warnings; use base 'Net::Telnet'; @@ -493,7 +493,7 @@ my ( $type, $sep1, $subtype, $sep2, $ver ) = $banner =~ - /Welcome to Trango Broadband Wireless (\S+)([\s-]+)(\S+)([\s-]+)(.+)$/i; + /Welcome to Trango Broadband Wireless,? (\S+)([\s-]+)(\S+)([\s-]+)(.+)$/i; $type .= $sep1 . $subtype; $ver = $subtype . $sep2 . $ver; @@ -1120,10 +1120,10 @@ if ($line =~ s/^(\d+) \s+ //xms) { my $line_id = $1; my ($tm, $rt); - if ($line =~ s/\s+ (\d+ \s+ \w+) $//xms) { + if ($line =~ s/\s+ (\d+ \s+ \w+) \s* $//xms) { $rt = $1; } - if ($line =~ s/\s+ (\d+ \s+ \w+) $//xms) { + if ($line =~ s/\s+ (\d+ \s+ \w+) \s* $//xms) { $tm = $1; }