X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=9ccae1c498cd04611ccb4d6016da4255efdae68f;hb=f4053377fa15da2f11e82955bfab86e673fa371c;hp=60312bbe2dc4d0285f85feb79202c6372f2c1cbe;hpb=0ff71477abf90d4843b8d9a3dc9907b5edc95fc0;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/server/ServerBridge.java b/src/be/nikiroo/utils/serial/server/ServerBridge.java
index 60312bb..9ccae1c 100644
--- a/src/be/nikiroo/utils/serial/server/ServerBridge.java
+++ b/src/be/nikiroo/utils/serial/server/ServerBridge.java
@@ -3,6 +3,7 @@ package be.nikiroo.utils.serial.server;
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.net.Socket;
+import java.net.UnknownHostException;
 
 import be.nikiroo.utils.StringUtils;
 import be.nikiroo.utils.TraceHandler;
@@ -45,6 +46,11 @@ public class ServerBridge extends Server {
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
+	 * @throws UnknownHostException
+	 *             if the IP address of the host could not be determined
+	 * @throws IllegalArgumentException
+	 *             if the port parameter is outside the specified range of valid
+	 *             port values, which is between 0 and 65535, inclusive
 	 */
 	public ServerBridge(int port, boolean ssl, String forwardToHost,
 			int forwardToPort, boolean forwardToSsl) throws IOException {
@@ -73,6 +79,11 @@ public class ServerBridge extends Server {
 	 * 
 	 * @throws IOException
 	 *             in case of I/O error
+	 * @throws UnknownHostException
+	 *             if the IP address of the host could not be determined
+	 * @throws IllegalArgumentException
+	 *             if the port parameter is outside the specified range of valid
+	 *             port values, which is between 0 and 65535, inclusive
 	 */
 	public ServerBridge(String name, int port, boolean ssl,
 			String forwardToHost, int forwardToPort, boolean forwardToSsl)
@@ -113,27 +124,34 @@ public class ServerBridge extends Server {
 				onClientContact(clientVersion);
 				final ConnectActionServerString bridge = this;
 
-				new ConnectActionClientString(forwardToHost, forwardToPort,
-						forwardToSsl, clientVersion) {
-					@Override
-					public void action(final Version serverVersion)
-							throws Exception {
-						onServerContact(serverVersion);
+				try {
+					new ConnectActionClientString(forwardToHost, forwardToPort,
+							forwardToSsl, clientVersion) {
+						@Override
+						public void action(final Version serverVersion)
+								throws Exception {
+							onServerContact(serverVersion);
 
-						for (String fromClient = bridge.rec(); fromClient != null; fromClient = bridge
-								.rec()) {
-							onRec(clientVersion, fromClient);
-							String fromServer = send(fromClient);
-							onSend(serverVersion, fromServer);
-							bridge.send(fromServer);
+							for (String fromClient = bridge.rec(); fromClient != null; fromClient = bridge
+									.rec()) {
+								onRec(clientVersion, fromClient);
+								String fromServer = send(fromClient);
+								onSend(serverVersion, fromServer);
+								bridge.send(fromServer);
+							}
+
+							getTraceHandler().trace("=== DONE", 1);
+							getTraceHandler().trace("", 1);
 						}
-					}
 
-					@Override
-					protected void onError(Exception e) {
-						getTraceHandler().error(e);
-					}
-				}.connect();
+						@Override
+						protected void onError(Exception e) {
+							ServerBridge.this.onError(e);
+						}
+					}.connect();
+				} catch (Exception e) {
+					ServerBridge.this.onError(e);
+				}
 			}
 		};
 	}
@@ -145,7 +163,7 @@ public class ServerBridge extends Server {
 	 *            the client version
 	 */
 	protected void onClientContact(Version clientVersion) {
-		getTraceHandler().trace("<<< CLIENT " + clientVersion);
+		getTraceHandler().trace(">>> CLIENT " + clientVersion);
 	}
 
 	/**
@@ -155,7 +173,7 @@ public class ServerBridge extends Server {
 	 *            the server version
 	 */
 	protected void onServerContact(Version serverVersion) {
-		getTraceHandler().trace(">>> SERVER " + serverVersion);
+		getTraceHandler().trace("<<< SERVER " + serverVersion);
 		getTraceHandler().trace("");
 	}
 
@@ -168,7 +186,7 @@ public class ServerBridge extends Server {
 	 *            the data sent by the client
 	 */
 	protected void onRec(Version clientVersion, String data) {
-		trace("<<< CLIENT (" + clientVersion + ")", data);
+		trace(">>> CLIENT (" + clientVersion + ")", data);
 	}
 
 	/**
@@ -181,7 +199,16 @@ public class ServerBridge extends Server {
 	 *            the data sent by the client
 	 */
 	protected void onSend(Version serverVersion, String data) {
-		trace(">>> SERVER (" + serverVersion + ")", data);
+		trace("<<< SERVER (" + serverVersion + ")", data);
+	}
+
+	@Override
+	public void run() {
+		getTraceHandler().trace(
+				getName() + ": will forward to " + forwardToHost + ":"
+						+ forwardToPort + " ("
+						+ (forwardToSsl ? "SSL" : "plain text") + ")");
+		super.run();
 	}
 
 	/**
@@ -302,7 +329,7 @@ public class ServerBridge extends Server {
 			if (args.length > 6) {
 				traceLevel = Integer.parseInt(args[i++]);
 			}
-			int maxPrintSize = 1;
+			int maxPrintSize = 0;
 			if (args.length > 7) {
 				maxPrintSize = Integer.parseInt(args[i++]);
 			}