===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm,v
retrieving revision 1.45
retrieving revision 1.49
diff -u -r1.45 -r1.49
--- trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm	2008/02/08 16:49:09	1.45
+++ trango/Net-Telnet-Trango/lib/Net/Telnet/Trango.pm	2008/02/08 19:29:05	1.49
@@ -1,6 +1,6 @@
 package Net::Telnet::Trango;
 
-# $RedRiver: Trango.pm,v 1.44 2007/06/05 19:54:05 mike Exp $
+# $RedRiver: Trango.pm,v 1.48 2008/02/08 18:49:41 andrew Exp $
 use strict;
 use warnings;
 use base 'Net::Telnet';
@@ -112,6 +112,7 @@
 #  help [command]
 #  heater [<on temp> <off temp>]
 #  ipconfig [<new ip> <new subnet mask> <new gateway>]
+#  linktest <suid> [<pkt len, bytes> [<# of pkts> [<# of cycle>]]]
 #  log [<# of entries, 1..179>]
 #  log <sum> <# of entries, 1..179>
 #  logout
@@ -506,6 +507,41 @@
 
 =pod
 
+=head2 B<linktest> - Link test to SU
+
+linktest('suid'[, 'pkt len, bytes'[, '# of pkts'[, '# of cycles']]]);
+
+Returns a hash reference to the results of the test
+
+=cut
+
+sub linktest
+{
+    my $self    = shift;
+    my $suid    = shift;
+    # These numbers are what I found as defaults when running the command
+    my $pkt_len = shift || 1600;
+    my $pkt_cnt = shift || 500; 
+    my $cycles  = shift || 10;
+
+    my %config  = @_;
+
+    # * 2, one for the FromAP, one FromSU.  Then / 1000 to get to ms.
+    # XXX This might need to be changed, this makes the default timeout the
+    # same as $pkt_len, and that might not be enough at slower speeds.
+    $config{Timeout} ||= int(($pkt_len * $pkt_cnt * $cycles * 2 ) / 1000);
+
+    my $string = join $SPACE, 'linktest', $suid, $pkt_len, $pkt_cnt, $cycles;
+    return $self->cmd(
+        %config,
+        String => $string,
+        decode => 'linktest',
+    );
+
+}
+
+=pod
+
 =head2 B<su_password> - Set the password on SUs connected to the AP.
 
 su_password('new_password'[, 'suid']) If no suid is specified,
@@ -920,6 +956,12 @@
                 $self->last_error("Error decoding maclist");
             }
         }
+        elsif ( $cfg{'decode'} eq 'linktest' ) {
+            $vals = _decode_linktest(@lines);
+            if (! $vals) {
+                $self->last_error("Error decoding linktest");
+            }
+        }
         else {
             $vals = _decode_lines(@lines);
         }
@@ -928,6 +970,7 @@
     $self->last_vals($vals);
 
     my $last = $self->lastline;
+    $self->last_error($EMPTY);
 
     if ( ( not $cfg{'expect'} ) || $last =~ /$cfg{'expect'}$/ ) {
         if ( $cfg{'cmd_disconnects'} ) {
@@ -1074,10 +1117,20 @@
     my %decoded;
     foreach my $line (@lines) {
 
-        if ($line =~ s/^(\d+) \s*//xms) {
+        if ($line =~ s/^(\d+) \s+ //xms) {
             my $line_id = $1;
-            my $d = _decode_lines($line . "\n");
+			my ($tm, $rt);
+			if ($line =~ s/\s+ (\d+ \s+ \w+) $//xms) {
+				$rt = $1;
+			}
+			if ($line =~ s/\s+ (\d+ \s+ \w+) $//xms) {
+				$tm = $1;
+			}
+
+            my $d = _decode_lines($line. "\n");
             $decoded{tests}[$line_id] = $d;
+            $decoded{tests}[$line_id]{'time'} = $tm;
+            $decoded{tests}[$line_id]{rate}   = $rt;
         }
 
         else {