Handling poptential exceptions in on_eof, and deadlock in tests

2 files changed, 18 insertions, 6 deletions

diff --git a/endtoendtests/test_forward.rb b/endtoendtests/test_forward.rb
index 929f136..4898f1c 100644
--- a/endtoendtests/test_forward.rb
+++ b/endtoendtests/test_forward.rb
@@ -17,7 +17,7 @@ class TestForward < Test::Unit::TestCase
   end
   
   def ssh_start_params
-    [localhost ,ENV['USER']]
+    [localhost ,ENV['USER']] #:verbose => :debug
   end
   
   def find_free_port 
@@ -28,7 +28,7 @@ class TestForward < Test::Unit::TestCase
     port
   end
   
-  def start_server_sending_lot_of_data(exceptions=nil)
+  def start_server_sending_lot_of_data(exceptions)
     server = TCPServer.open(0)
     Thread.start do
       loop do
@@ -86,7 +86,7 @@ class TestForward < Test::Unit::TestCase
       end
     end
     session.loop(0.1) { client_done.empty? }
-    assert_equal "Broken pipe", "#{server_exc.pop}"
+    assert_equal "Broken pipe", "#{server_exc.pop}" unless server_exc.empty?
   end
   
   def test_loop_should_not_abort_when_local_side_of_forward_is_reset
@@ -109,7 +109,7 @@ class TestForward < Test::Unit::TestCase
       end
     end
     session.loop(0.1) { client_done.empty? }
-    assert_equal "Broken pipe", "#{server_exc.pop}"
+    assert_equal "Broken pipe", "#{server_exc.pop}" unless server_exc.empty?
   end
   
   def test_loop_should_not_abort_when_server_side_of_forward_is_closed
diff --git a/lib/net/ssh/service/forward.rb b/lib/net/ssh/service/forward.rb
index 67b12ba..9e37dce 100644
--- a/lib/net/ssh/service/forward.rb
+++ b/lib/net/ssh/service/forward.rb
@@ -246,8 +246,20 @@ module Net; module SSH; module Service
         
         channel.on_eof do |ch|
           debug { "eof #{type} on #{type} forwarded channel" }
-          ch[:socket].send_pending
-          ch[:socket].shutdown Socket::SHUT_WR
+          begin
+            ch[:socket].send_pending
+            ch[:socket].shutdown Socket::SHUT_WR
+          rescue IOError => e
+            if e.message =~ /closed/ then
+              debug { "epipe in on_eof => shallowing exception:#{e}" }
+            else
+              raise
+            end
+          rescue Errno::EPIPE => e
+            debug { "epipe in on_eof => shallowing exception:#{e}" }
+          rescue Errno::ENOTCONN => e
+            debug { "enotconn in on_eof => shallowing exception:#{e}" }
+          end
         end
         
         channel.on_close do |ch|