X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerString.java;h=3c982fd585371ee1694497880a918b2b5149a7e6;hb=cfdaf6052ddc5ca44cf19f1f6d9f154cc8443024;hp=89a7b28c6042418be95348191ad79794adb826fe;hpb=a72ea8a7a30837734f7f3f27a4ec7979d2549043;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ServerString.java b/src/be/nikiroo/utils/serial/server/ServerString.java
index 89a7b28..3c982fd 100644
--- a/src/be/nikiroo/utils/serial/server/ServerString.java
+++ b/src/be/nikiroo/utils/serial/server/ServerString.java
@@ -24,8 +24,9 @@ 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
@@ -35,8 +36,8 @@ abstract public class ServerString extends Server {
 	 *             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);
 	}
 
 	/**
@@ -47,8 +48,9 @@ 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
@@ -58,19 +60,20 @@ abstract public class ServerString extends Server {
 	 *             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 {
+				long id = getNextId();
 				for (String data = rec(); data != null; data = rec()) {
 					String rep = null;
 					try {
-						rep = onRequest(this, clientVersion, data);
+						rep = onRequest(this, clientVersion, data, id);
 						if (isClosing()) {
 							return;
 						}
@@ -81,9 +84,10 @@ abstract public class ServerString extends Server {
 					if (rep == null) {
 						rep = "";
 					}
-
 					send(rep);
 				}
+
+				onRequestDone(id, getBytesReceived(), getBytesSent());
 			}
 
 			@Override
@@ -93,6 +97,13 @@ abstract public class ServerString extends Server {
 		};
 	}
 
+	@Override
+	protected ConnectActionClient getConnectionToMe()
+			throws UnknownHostException, IOException {
+		return new ConnectActionClientString(new Socket((String) null,
+				getPort()), key);
+	}
+
 	/**
 	 * This is the method that is called on each client request.
 	 * <p>
@@ -105,12 +116,68 @@ abstract public class ServerString extends Server {
 	 *            the client version
 	 * @param data
 	 *            the data sent by the client
+	 * @param id
+	 *            an ID to identify this request (will also be re-used for
+	 *            {@link ServerObject#onRequestDone(long, long, long)}.
+	 * 
+	 * @return the answer to return to the client
+	 * 
+	 * @throws Exception
+	 *             in case of an exception, the error will only be logged
+	 */
+	protected String onRequest(ConnectActionServerString action,
+			Version clientVersion, String data,
+			@SuppressWarnings("unused") long id) throws Exception {
+		// TODO: change to abstract when deprecated method is removed
+		// Default implementation for compat
+		return onRequest(action, clientVersion, data);
+	}
+
+	// Deprecated //
+
+	/**
+	 * @deprecated SSL support has been replaced by key-based encryption.
+	 *             <p>
+	 *             Please use the version with key encryption (this deprecated
+	 *             version uses an empty key when <tt>ssl</tt> is TRUE and no
+	 *             key (NULL) when <tt>ssl</tt> is FALSE).
+	 */
+	@Deprecated
+	public ServerString(int port, boolean ssl) throws IOException {
+		this(port, ssl ? "" : null);
+	}
+
+	/**
+	 * @deprecated SSL support has been replaced by key-based encryption.
+	 *             <p>
+	 *             Please use the version with key encryption (this deprecated
+	 *             version uses an empty key when <tt>ssl</tt> is TRUE and no
+	 *             key (NULL) when <tt>ssl</tt> is FALSE).
+	 */
+	@Deprecated
+	public ServerString(String name, int port, boolean ssl) throws IOException {
+		this(name, port, ssl ? "" : null);
+	}
+
+	/**
+	 * Will be called if the correct version is not overrided.
+	 * 
+	 * @deprecated use the version with the id.
+	 * 
+	 * @param action
+	 *            the client action
+	 * @param data
+	 *            the data sent by the client
 	 * 
 	 * @return the answer to return to the client
 	 * 
 	 * @throws Exception
 	 *             in case of an exception, the error will only be logged
 	 */
-	abstract protected String onRequest(ConnectActionServerString action,
-			Version clientVersion, String data) throws Exception;
+	@Deprecated
+	@SuppressWarnings("unused")
+	protected String onRequest(ConnectActionServerString action,
+			Version version, String data) throws Exception {
+		return null;
+	}
 }