X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerBridge.java;h=157b27ee9cc0df8c620a6163e5d0ae524d4b4e57;hb=7d048df41aea44c07ea6e1ab774c627053f39dfa;hp=4aa9c41fab5b7cbf9bd934008b4002f5fc366f75;hpb=d827da2aba3d8b0e4a76426b5a76a9045ca584b2;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 4aa9c41..157b27e 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,30 +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);
-					}
+							getTraceHandler().trace("=== DONE", 1);
+							getTraceHandler().trace("", 1);
+						}
 
-					@Override
-					protected void onError(Exception e) {
-						ServerBridge.this.onError(e);
-					}
-				}.connect();
+						@Override
+						protected void onError(Exception e) {
+							ServerBridge.this.onError(e);
+						}
+					}.connect();
+				} catch (Exception e) {
+					ServerBridge.this.onError(e);
+				}
 			}
 		};
 	}
@@ -187,6 +202,15 @@ public class ServerBridge extends Server {
 		trace("<<< SERVER (" + serverVersion + ")", data);
 	}
 
+	@Override
+	public void run() {
+		getTraceHandler().trace(
+				getName() + ": will forward to " + forwardToHost + ":"
+						+ forwardToPort + " ("
+						+ (forwardToSsl ? "SSL" : "plain text") + ")");
+		super.run();
+	}
+
 	/**
 	 * Trace the data with the given prefix.
 	 * 
@@ -259,64 +283,4 @@ public class ServerBridge extends Server {
 			getTraceHandler().trace("", 2);
 		}
 	}
-
-	/**
-	 * Start a bridge between 2 servers.
-	 * 
-	 * @param args
-	 *            an array containing:
-	 *            <ul>
-	 *            <li>The bridge name</li>
-	 *            <li>The bridge port</li>
-	 *            <li>TRUE for an SSL bridge, FALSE for plain text</li>
-	 *            <li>The forward server host</li>
-	 *            <li>The forward server port</li>
-	 *            <li>TRUE for an SSL forward server, FALSE for plain text</li>
-	 *            <li>(optional) a trace level</li>
-	 *            <li>(optional) a truncate size for data</li>
-	 *            </ul>
-	 */
-	public static void main(String[] args) {
-		final TraceHandler tracer = new TraceHandler(true, false, 0);
-		try {
-			if (args.length < 6) {
-				tracer.error("Invalid syntax.\n"
-						+ "Syntax: [name] [port] [ssl] [fhost] [fport] [fssl] ([trace level]) ([max])\n"
-						+ "\tname: the bridge name\n"
-						+ "\tport: the bridge port\n"
-						+ "\tssl: TRUE for an SSL bridge, FALSE for plain text\n"
-						+ "\tfhost: the forward server host\n"
-						+ "\tfport: the forward server port\n"
-						+ "\tfssl: TRUE for an SSL forward server, FALSE for plain text\n"
-						+ "\ttrace level: the optional trace level (default is 1)\n"
-						+ "\tmax: the maximum size after which to truncate data\n");
-				return;
-			}
-
-			int i = 0;
-			String name = args[i++];
-			int port = Integer.parseInt(args[i++]);
-			boolean ssl = Boolean.parseBoolean(args[i++]);
-			String fhost = args[i++];
-			int fport = Integer.parseInt(args[i++]);
-			boolean fssl = Boolean.parseBoolean(args[i++]);
-
-			int traceLevel = 1;
-			if (args.length > 6) {
-				traceLevel = Integer.parseInt(args[i++]);
-			}
-			int maxPrintSize = 1;
-			if (args.length > 7) {
-				maxPrintSize = Integer.parseInt(args[i++]);
-			}
-
-			ServerBridge bridge = new ServerBridge(name, port, ssl, fhost,
-					fport, fssl);
-			bridge.setTraceHandler(new TraceHandler(true, true, traceLevel,
-					maxPrintSize));
-			bridge.run();
-		} catch (Exception e) {
-			tracer.error(e);
-		}
-	}
 }