X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionClientObject.java;h=f8eaae176561ce32bbaeac73371e22dbb52e649d;hb=6ef54b36380b9d123bbdb6b4056cf64b7489225e;hp=e9673ac299730c521aa9c1c7d0fff0165f1c7063;hpb=79ce1a4973eba079ba819ba841d906de42f38e40;p=fanfix.git

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java
index e9673ac..f8eaae1 100644
--- a/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java
@@ -2,6 +2,7 @@ package be.nikiroo.utils.serial.server;
 
 import java.io.IOException;
 import java.net.Socket;
+import java.net.UnknownHostException;
 
 import be.nikiroo.utils.Version;
 
@@ -21,9 +22,12 @@ public class ConnectActionClientObject extends ConnectActionClient {
 	 * 
 	 * @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 ConnectActionClientObject(Socket s) {
-		super(s);
+	public ConnectActionClientObject(Socket s, String key) {
+		super(s, key);
 	}
 
 	/**
@@ -35,15 +39,21 @@ public class ConnectActionClientObject extends ConnectActionClient {
 	 *            the host to bind to
 	 * @param port
 	 *            the port to bind to
-	 * @param ssl
-	 *            TRUE for an SSL connection, FALSE for plain text
+	 * @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 when creating the socket
+	 *             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 ConnectActionClientObject(String host, int port, boolean ssl)
+	public ConnectActionClientObject(String host, int port, String key)
 			throws IOException {
-		super(host, port, ssl);
+		super(host, port, key);
 	}
 
 	/**
@@ -53,17 +63,23 @@ public class ConnectActionClientObject extends ConnectActionClient {
 	 *            the host to bind to
 	 * @param port
 	 *            the port to bind to
-	 * @param ssl
-	 *            TRUE for an SSL connection, FALSE for plain text
+	 * @param key
+	 *            an optional key to encrypt all the communications (if NULL,
+	 *            everything will be sent in clear text)
 	 * @param version
 	 *            the client version
 	 * 
 	 * @throws IOException
-	 *             in case of I/O error when creating the socket
+	 *             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 ConnectActionClientObject(String host, int port, boolean ssl,
+	public ConnectActionClientObject(String host, int port, String key,
 			Version version) throws IOException {
-		super(host, port, ssl, version);
+		super(host, port, key, version);
 	}
 
 	/**
@@ -73,9 +89,12 @@ public class ConnectActionClientObject extends ConnectActionClient {
 	 *            the socket to bind to
 	 * @param version
 	 *            the client version
+	 * @param key
+	 *            an optional key to encrypt all the communications (if NULL,
+	 *            everything will be sent in clear text)
 	 */
-	public ConnectActionClientObject(Socket s, Version version) {
-		super(s, version);
+	public ConnectActionClientObject(Socket s, String key, Version version) {
+		super(s, key, version);
 	}
 
 	/**