X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionServer.java;h=699f3074b44b228ac797e186c0f18da58208d08c;hb=8468bb79f0fc9c88fa21355509731625732eb10e;hp=60f8db85db4f6f278a9b1f50ef1d41de92b0540e;hpb=45640453da7c9789354847147df9f945c80860a8;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionServer.java b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
index 60f8db8..699f307 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
@@ -13,6 +13,8 @@ import be.nikiroo.utils.Version;
  * @author niki
  */
 abstract class ConnectActionServer {
+	private boolean closing;
+
 	/**
 	 * The underlying {@link ConnectAction}.
 	 * <p>
@@ -26,9 +28,12 @@ abstract class ConnectActionServer {
 	 * 
 	 * @param s
 	 *            the socket to bind to
+	 * @param key
+	 *            an optional key to encrypt all the communications (if NULL,
+	 *            everything will be sent in clear text)
 	 */
-	public ConnectActionServer(Socket s) {
-		this(s, Version.getCurrentVersion());
+	public ConnectActionServer(Socket s, String key) {
+		this(s, key, Version.getCurrentVersion());
 	}
 
 	/**
@@ -36,11 +41,14 @@ abstract class ConnectActionServer {
 	 * 
 	 * @param s
 	 *            the socket to bind to
+	 * @param key
+	 *            an optional key to encrypt all the communications (if NULL,
+	 *            everything will be sent in clear text)
 	 * @param version
 	 *            the server version
 	 */
-	public ConnectActionServer(Socket s, Version version) {
-		action = new ConnectAction(s, true, version) {
+	public ConnectActionServer(Socket s, String key, Version version) {
+		action = new ConnectAction(s, true, key, version) {
 			@Override
 			protected void action(Version clientVersion) throws Exception {
 				ConnectActionServer.this.action(clientVersion);
@@ -77,6 +85,34 @@ abstract class ConnectActionServer {
 		}).start();
 	}
 
+	/**
+	 * Stop the client/server connection on behalf of the server (usually, the
+	 * client connects then is allowed to send as many requests as it wants; in
+	 * some cases, though, the server may wish to forcefully close the
+	 * connection and can do via this value, when it is set to TRUE).
+	 * <p>
+	 * Example of usage: the client failed an authentication check, cut the
+	 * connection here and now.
+	 * 
+	 * @return TRUE when it is
+	 */
+	public boolean isClosing() {
+		return closing;
+	}
+
+	/**
+	 * Can be called to stop the client/server connection on behalf of the
+	 * server (usually, the client connects then is allowed to send as many
+	 * requests as it wants; in some cases, though, the server may wish to
+	 * forcefully close the connection and can do so by calling this method).
+	 * <p>
+	 * Example of usage: the client failed an authentication check, cut the
+	 * connection here and now.
+	 */
+	public void close() {
+		closing = true;
+	}
+
 	/**
 	 * The total amount of bytes received.
 	 *