diff options
| author | Kenny Root <kenny@the-b.org> | 2010-02-07 22:40:36 +0000 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2010-02-07 22:40:36 +0000 |
| commit | fdce2f1d5b7985639ba1b7d4d614c04d014bf6f6 (patch) | |
| tree | 0e1d6923708cc6d2b3e4e1491d761b7dc7d886af /src | |
| parent | ba9afbb1c988e6aad88db09bafc598fe00fd76ee (diff) | |
| download | connectbot-fdce2f1d5b7985639ba1b7d4d614c04d014bf6f6.tar.gz connectbot-fdce2f1d5b7985639ba1b7d4d614c04d014bf6f6.tar.bz2 connectbot-fdce2f1d5b7985639ba1b7d4d614c04d014bf6f6.zip | |
Trilead port forwards can throw many exceptions
Don't try to catch each individual one, just abort on a general error.
We don't really need to give up everything if we can't enable one port
forward.
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@469 df292f66-193f-0410-a5fc-6d59da041ff2
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/connectbot/transport/SSH.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/connectbot/transport/SSH.java b/src/org/connectbot/transport/SSH.java index cc2af9b..b94af63 100644 --- a/src/org/connectbot/transport/SSH.java +++ b/src/org/connectbot/transport/SSH.java @@ -611,7 +611,7 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC lpf = connection.createLocalPortForwarder( new InetSocketAddress(InetAddress.getLocalHost(), portForward.getSourcePort()), portForward.getDestAddr(), portForward.getDestPort()); - } catch (IOException e) { + } catch (Exception e) { Log.e(TAG, "Could not create local port forward", e); return false; } @@ -627,7 +627,7 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC } else if (HostDatabase.PORTFORWARD_REMOTE.equals(portForward.getType())) { try { connection.requestRemotePortForwarding("", portForward.getSourcePort(), portForward.getDestAddr(), portForward.getDestPort()); - } catch (IOException e) { + } catch (Exception e) { Log.e(TAG, "Could not create remote port forward", e); return false; } @@ -640,7 +640,7 @@ public class SSH extends AbsTransport implements ConnectionMonitor, InteractiveC try { dpf = connection.createDynamicPortForwarder( new InetSocketAddress(InetAddress.getLocalHost(), portForward.getSourcePort())); - } catch (IOException e) { + } catch (Exception e) { Log.e(TAG, "Could not create dynamic port forward", e); return false; } |