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

diff --git a/src/be/nikiroo/utils/serial/server/ServerString.java b/src/be/nikiroo/utils/serial/server/ServerString.java
index 89a7b28..a6e7a04 100644
--- a/src/be/nikiroo/utils/serial/server/ServerString.java
+++ b/src/be/nikiroo/utils/serial/server/ServerString.java
@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import be.nikiroo.utils.Version;
-
 /**
  * This class implements a simple server that can listen for connections and
  * send/receive Strings.
@@ -24,8 +22,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 +34,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 +46,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 +58,19 @@ 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 {
+			public void action() throws Exception {
 				for (String data = rec(); data != null; data = rec()) {
 					String rep = null;
 					try {
-						rep = onRequest(this, clientVersion, data);
+						rep = onRequest(this, data);
 						if (isClosing()) {
 							return;
 						}
@@ -101,8 +101,6 @@ abstract public class ServerString extends Server {
 	 * 
 	 * @param action
 	 *            the client action
-	 * @param clientVersion
-	 *            the client version
 	 * @param data
 	 *            the data sent by the client
 	 * 
@@ -112,5 +110,5 @@ abstract public class ServerString extends Server {
 	 *             in case of an exception, the error will only be logged
 	 */
 	abstract protected String onRequest(ConnectActionServerString action,
-			Version clientVersion, String data) throws Exception;
+			String data) throws Exception;
 }