X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServerObject.java;h=f79776696cdc2e6c5fae13e6ed0f733c814268c2;hb=ae0ca537218b08a53929a5f2545269fc99e2b0b1;hp=fdbd2cd4d93fe2bcb2b14fa6e44d9814e27c6400;hpb=4b7d32e77cf31ca44c5f93f08d2729357c86b93f;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ServerObject.java b/src/be/nikiroo/utils/serial/server/ServerObject.java
index fdbd2cd..f797766 100644
--- a/src/be/nikiroo/utils/serial/server/ServerObject.java
+++ b/src/be/nikiroo/utils/serial/server/ServerObject.java
@@ -2,8 +2,7 @@ package be.nikiroo.utils.serial.server;
 
 import java.io.IOException;
 import java.net.Socket;
-
-import be.nikiroo.utils.Version;
+import java.net.UnknownHostException;
 
 /**
  * This class implements a simple server that can listen for connections and
@@ -23,14 +22,20 @@ abstract public class ServerObject extends Server {
 	 *            the port to listen on, or 0 to assign any unallocated port
 	 *            found (which can later on be queried via
 	 *            {@link ServerObject#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 ServerObject(int port, boolean ssl) throws IOException {
-		super(port, ssl);
+	public ServerObject(int port, String key) throws IOException {
+		super(port, key);
 	}
 
 	/**
@@ -41,35 +46,52 @@ abstract public class ServerObject 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 ServerObject(String name, int port, boolean ssl) throws IOException {
-		super(name, port, ssl);
+	public ServerObject(String name, int port, String key) throws IOException {
+		super(name, port, key);
 	}
 
 	@Override
 	protected ConnectActionServer createConnectActionServer(Socket s) {
-		return new ConnectActionServerObject(s) {
+		return new ConnectActionServerObject(s, key) {
 			@Override
-			public void action(Version clientVersion) throws Exception {
+			public void action() throws Exception {
+				long id = getNextId();
 				try {
 					for (Object data = rec(); true; data = rec()) {
 						Object rep = null;
 						try {
-							rep = onRequest(this, clientVersion, data);
+							rep = onRequest(this, data, id);
+							if (isClosing()) {
+								return;
+							}
 						} catch (Exception e) {
 							onError(e);
 						}
+
 						send(rep);
 					}
 				} catch (NullPointerException e) {
 					// Client has no data any more, we quit
+					onRequestDone(id, getBytesReceived(), getBytesSent());
 				}
 			}
+
+			@Override
+			protected void onError(Exception e) {
+				ServerObject.this.onError(e);
+			}
 		};
 	}
 
@@ -80,10 +102,11 @@ abstract public class ServerObject extends Server {
 	 * 
 	 * @param action
 	 *            the client action
-	 * @param clientVersion
-	 *            the client version
 	 * @param data
 	 *            the data sent by the client (which can be NULL)
+	 * @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 (which can be NULL)
 	 * 
@@ -91,5 +114,5 @@ abstract public class ServerObject extends Server {
 	 *             in case of an exception, the error will only be logged
 	 */
 	abstract protected Object onRequest(ConnectActionServerObject action,
-			Version clientVersion, Object data) throws Exception;
+			Object data, long id) throws Exception;
 }