X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionServer.java;h=350d3fe40a1320b68f555458a43c3ceec11e8c25;hb=505be508ae7d3fb48122be548b310a238cfb91eb;hp=10d3440e7af4a4a09e5b7cdf06151ab15ac98f66;hpb=a72ea8a7a30837734f7f3f27a4ec7979d2549043;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionServer.java b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
index 10d3440..350d3fe 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
@@ -23,14 +23,16 @@ abstract class ConnectActionServer {
 	protected ConnectAction action;
 
 	/**
-	 * Create a new {@link ConnectActionServer} with the current application
-	 * version (see {@link Version#getCurrentVersion()}) as the server version.
+	 * Create a new {@link ConnectActionServer}, using the current version.
 	 * 
 	 * @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());
 	}
 
 	/**
@@ -38,11 +40,14 @@ abstract class 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)
+	 * @param serverVersion
+	 *            the version of this server,that will be sent to the client
 	 */
-	public ConnectActionServer(Socket s, Version version) {
-		action = new ConnectAction(s, true, version) {
+	public ConnectActionServer(Socket s, String key, Version serverVersion) {
+		action = new ConnectAction(s, true, key, serverVersion) {
 			@Override
 			protected void action(Version clientVersion) throws Exception {
 				ConnectActionServer.this.action(clientVersion);
@@ -87,6 +92,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,14 +127,14 @@ 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
+	 *            the version of the client connected to this server
 	 * 
 	 * @throws Exception
 	 *             in case of I/O error