X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionServer.java;h=d0ddb92acd253cb5befda49760c5803e379e1688;hb=a0eb51f41b98280d751d13d15489a6e375fe8b80;hp=10d3440e7af4a4a09e5b7cdf06151ab15ac98f66;hpb=a72ea8a7a30837734f7f3f27a4ec7979d2549043;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionServer.java b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
index 10d3440..d0ddb92 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
@@ -2,8 +2,6 @@ package be.nikiroo.utils.serial.server;
 
 import java.net.Socket;
 
-import be.nikiroo.utils.Version;
-
 /**
  * Base class used for the server basic handling.
  * <p>
@@ -22,41 +20,26 @@ abstract class ConnectActionServer {
 	 */
 	protected ConnectAction action;
 
-	/**
-	 * Create a new {@link ConnectActionServer} with the current application
-	 * version (see {@link Version#getCurrentVersion()}) as the server version.
-	 * 
-	 * @param s
-	 *            the socket to bind to
-	 */
-	public ConnectActionServer(Socket s) {
-		this(s, Version.getCurrentVersion());
-	}
-
 	/**
 	 * Create a new {@link ConnectActionServer}.
 	 * 
 	 * @param s
 	 *            the socket to bind to
-	 * @param version
-	 *            the server version
+	 * @param key
+	 *            an optional key to encrypt all the communications (if NULL,
+	 *            everything will be sent in clear text)
 	 */
-	public ConnectActionServer(Socket s, Version version) {
-		action = new ConnectAction(s, true, version) {
+	public ConnectActionServer(Socket s, String key) {
+		action = new ConnectAction(s, true, key) {
 			@Override
-			protected void action(Version clientVersion) throws Exception {
-				ConnectActionServer.this.action(clientVersion);
+			protected void action() throws Exception {
+				ConnectActionServer.this.action();
 			}
 
 			@Override
 			protected void onError(Exception e) {
 				ConnectActionServer.this.onError(e);
 			}
-
-			@Override
-			protected Version negotiateVersion(Version clientVersion) {
-				return ConnectActionServer.this.negotiateVersion(clientVersion);
-			}
 		};
 	}
 
@@ -87,6 +70,8 @@ abstract class ConnectActionServer {
 	 * <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;
@@ -120,20 +105,17 @@ abstract class ConnectActionServer {
 	 * @return the amount of bytes sent
 	 */
 	public long getBytesSent() {
-		return action.getBytesSent();
+		return action.getBytesWritten();
 	}
 
 	/**
 	 * Method that will be called when an action is performed on the server.
 	 * 
-	 * @param clientVersion
-	 *            the client version
-	 * 
 	 * @throws Exception
 	 *             in case of I/O error
 	 */
 	@SuppressWarnings("unused")
-	public void action(Version clientVersion) throws Exception {
+	public void action() throws Exception {
 	}
 
 	/**
@@ -146,19 +128,4 @@ abstract class ConnectActionServer {
 	 */
 	protected void onError(@SuppressWarnings("unused") Exception e) {
 	}
-
-	/**
-	 * Method called when we negotiate the version with the client.
-	 * <p>
-	 * Will return the actual server version by default.
-	 * 
-	 * @param clientVersion
-	 *            the client version
-	 * 
-	 * @return the version to send to the client
-	 */
-	protected Version negotiateVersion(
-			@SuppressWarnings("unused") Version clientVersion) {
-		return action.getVersion();
-	}
 }
\ No newline at end of file