From b8c8f24f273869ddb61ad869be2cbbe6081ae01c Mon Sep 17 00:00:00 2001 From: Ben Greear Date: Tue, 10 Mar 2020 17:18:04 -0700 Subject: [PATCH] Fix usage of telnet so that we do not keep sending useless newlines. --- LANforge/Utils.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/LANforge/Utils.pm b/LANforge/Utils.pm index adaa8651..55924874 100644 --- a/LANforge/Utils.pm +++ b/LANforge/Utils.pm @@ -35,7 +35,7 @@ sub new { sub connect { my ($self, $host, $port) = @_; my $t = new Net::Telnet(Prompt => '/btbits>> $/', - Timeout => 2); + Timeout => 10); $self->{telnet} = \$t; $t->open(Host => $host, Port => $port, @@ -104,16 +104,16 @@ sub doCmd { sub doAsyncCmd { my $self = shift; my $cmd = shift; - my $t = $self->telnet(); + my $t = ${$self->{telnet}}; my @rv = (); if ( !$self->cli_send_silent() || (defined $ENV{'LOG_CLI'} && $ENV{'LOG_CLI'} ne "")) { $self->log_cli($cmd); } $t->print($cmd); - my @rslt = $t->waitfor('/ \>\>RSLT:(.*)/'); + #my @rslt = $t->waitfor('/ \>\>RSLT:(.*)/'); my @rslt2 = $t->waitfor( $self->async_waitfor() ); - @rv = ( @rslt, @rslt2 ); + @rv = ( @rslt2 ); if ( !$self->cli_rcv_silent() ) { print "**************\n @rv \n................\n\n";