diff options
| author | Steve Kemp <steve@steve.org.uk> | 2012-11-19 16:24:30 +0000 |
|---|---|---|
| committer | Steve Kemp <steve@steve.org.uk> | 2012-11-19 16:24:30 +0000 |
| commit | f1b81c42c9a6e53e3ce248e40ccc33a5b3ba51bc (patch) | |
| tree | 82e5b0ff0be8f61690e68a7db99f3e6a836278e6 /lib/custodian/protocol-tests/tcp.rb | |
| parent | f8fde5b7bba478a29feb2cb7fad562948ca80c46 (diff) | |
Updated to ensure we read a banner from the remote server - before we test against it.
Diffstat (limited to 'lib/custodian/protocol-tests/tcp.rb')
| -rwxr-xr-x | lib/custodian/protocol-tests/tcp.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/custodian/protocol-tests/tcp.rb b/lib/custodian/protocol-tests/tcp.rb index 08707a5..a6770e4 100755 --- a/lib/custodian/protocol-tests/tcp.rb +++ b/lib/custodian/protocol-tests/tcp.rb @@ -92,7 +92,7 @@ class TCPTest read = socket.gets(nil) # trim to a sane length & strip newlines. - read = read[0,255] + read = read[0,255] unless ( read.nil? ) read.gsub!(/[\n\r]/, "") unless ( read.nil? ) socket.close() @@ -102,7 +102,7 @@ class TCPTest return true else # test for banner - if ( read =~ /#{banner}/i ) + if ( ( !read.nil? ) && ( read =~ /#{banner}/i ) ) puts "We connected and matched the banner against '#{read}'" if ( @test_data['verbose'] ) return true end |