From fdce2f1d5b7985639ba1b7d4d614c04d014bf6f6 Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Sun, 7 Feb 2010 22:40:36 +0000
Subject: 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
---
 AndroidManifest.xml                   | 2 +-
 src/org/connectbot/transport/SSH.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 07eca89..8a658ad 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.7-dev"
-	android:versionCode="248">
+	android:versionCode="249">
 
 	<application
 		android:icon="@drawable/icon"
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;
 			}
-- 
cgit v1.2.3