X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerString.java;h=9d8d008e02a3907f3c0a386ca165c1c8e4b12352;hb=6ef54b36380b9d123bbdb6b4056cf64b7489225e;hp=4a185da50baf3ae03190a3e0d3b64c09bbbf285c;hpb=79ce1a4973eba079ba819ba841d906de42f38e40;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ServerString.java b/src/be/nikiroo/utils/serial/server/ServerString.java
index 4a185da..9d8d008 100644
--- a/src/be/nikiroo/utils/serial/server/ServerString.java
+++ b/src/be/nikiroo/utils/serial/server/ServerString.java
@@ -2,6 +2,7 @@ package be.nikiroo.utils.serial.server;
 
 import java.io.IOException;
 import java.net.Socket;
+import java.net.UnknownHostException;
 
 import be.nikiroo.utils.Version;
 
@@ -23,14 +24,20 @@ abstract public class ServerString extends Server {
 	 *            the port to listen on, or 0 to assign any unallocated port
 	 *            found (which can later on be queried via
 	 *            {@link ServerString#getPort()}
-	 * @param ssl
-	 *            use a SSL connection (or not)
+	 * @param key
+	 *            an optional key to encrypt all the communications (if NULL,
+	 *            everything will be sent in clear text)
 	 * 
 	 * @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 ServerString(int port, boolean ssl) throws IOException {
-		super(port, ssl);
+	public ServerString(int port, String key) throws IOException {
+		super(port, key);
 	}
 
 	/**
@@ -41,51 +48,49 @@ abstract public class ServerString extends Server {
 	 *            the server name (only used for debug info and traces)
 	 * @param port
 	 *            the port to listen on
-	 * @param ssl
-	 *            use a SSL connection (or not)
+	 * @param key
+	 *            an optional key to encrypt all the communications (if NULL,
+	 *            everything will be sent in clear text)
 	 * 
 	 * @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 ServerString(String name, int port, boolean ssl) throws IOException {
-		super(name, port, ssl);
+	public ServerString(String name, int port, String key) throws IOException {
+		super(name, port, key);
 	}
 
 	@Override
 	protected ConnectActionServer createConnectActionServer(Socket s) {
-		return new ConnectActionServerString(s) {
+		return new ConnectActionServerString(s, key) {
 			@Override
 			public void action(Version clientVersion) throws Exception {
-				try {
-					for (String data = rec(); data != null; data = rec()) {
-						String rep = null;
-						try {
-							rep = onRequest(this, clientVersion, data);
-						} catch (Exception e) {
-							onError(e);
-						}
-
-						if (rep == null) {
-							rep = "";
+				for (String data = rec(); data != null; data = rec()) {
+					String rep = null;
+					try {
+						rep = onRequest(this, clientVersion, data);
+						if (isClosing()) {
+							return;
 						}
+					} catch (Exception e) {
+						onError(e);
+					}
 
-						send(rep);
+					if (rep == null) {
+						rep = "";
 					}
-				} catch (NullPointerException e) {
-					// Client has no data any more, we quit
-					getTraceHandler()
-							.trace(getName()
-									+ ": client has data no more, stopping connection");
+
+					send(rep);
 				}
 			}
 
 			@Override
-			public void connect() {
-				try {
-					super.connect();
-				} finally {
-					count(-1);
-				}
+			protected void onError(Exception e) {
+				ServerString.this.onError(e);
 			}
 		};
 	}