X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionClientObject.java;h=938564510753f36f70f66bae639afe3294c2e9a3;hb=601003e69e1dc81774243c6eadf7982b6b563b33;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..9385645 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;
@@ -15,35 +16,55 @@ import be.nikiroo.utils.Version;
*/
public class ConnectActionClientObject extends ConnectActionClient {
/**
- * Create a new {@link ConnectActionClientObject} with the current
- * application version (see {@link Version#getCurrentVersion()}) as the
- * client version.
+ * Create a new {@link ConnectActionClientObject} .
*
* @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);
}
/**
- * Create a new {@link ConnectActionClientObject} with the current
- * application version (see {@link Version#getCurrentVersion()}) as the
- * client version.
+ * Create a new {@link ConnectActionClientObject} .
+ *
+ * @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 clientVersion
+ * the version of the client
+ */
+ public ConnectActionClientObject(Socket s, String key, Version clientVersion) {
+ super(s, key, clientVersion);
+ }
+
+ /**
+ * Create a new {@link ConnectActionClientObject}.
*
* @param host
* 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,29 +74,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 version
- * the client version
+ * @param key
+ * an optional key to encrypt all the communications (if NULL,
+ * everything will be sent in clear text)
+ * @param clientVersion
+ * the version of the client
*
* @throws IOException
- * in case of I/O error when creating the socket
- */
- public ConnectActionClientObject(String host, int port, boolean ssl,
- Version version) throws IOException {
- super(host, port, ssl, version);
- }
-
- /**
- * Create a new {@link ConnectActionClientObject}.
- *
- * @param s
- * the socket to bind to
- * @param version
- * the client version
+ * 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(Socket s, Version version) {
- super(s, version);
+ public ConnectActionClientObject(String host, int port, String key,
+ Version clientVersion) throws IOException {
+ super(host, port, key, clientVersion);
}
/**
@@ -102,4 +117,59 @@ public class ConnectActionClientObject extends ConnectActionClient {
NoSuchMethodException, ClassNotFoundException {
return action.sendObject(data);
}
+
+ // Deprecated //
+
+ /**
+ * @deprecated SSL support has been replaced by key-based encryption.
+ *
+ * Please use the version with key encryption (this deprecated
+ * version uses an empty key when ssl is TRUE and no
+ * key (NULL) when ssl is FALSE).
+ */
+ @Deprecated
+ public ConnectActionClientObject(String host, int port, boolean ssl)
+ throws IOException {
+ this(host, port, ssl ? "" : null);
+ }
+
+ /**
+ * @deprecated SSL support has been replaced by key-based encryption.
+ *
+ * Please use the version with key encryption (this deprecated
+ * version uses an empty key when ssl is TRUE and no
+ * key (NULL) when ssl is FALSE).
+ */
+ @Deprecated
+ public ConnectActionClientObject(String host, int port, boolean ssl,
+ Version version) throws IOException {
+ this(host, port, ssl ? "" : null, version);
+ }
+
+ /**
+ * @deprecated SSL support has been replaced by key-based encryption.
+ *
+ * Please use the version with key encryption (this deprecated
+ * version uses an empty key when ssl is TRUE and no
+ * key (NULL) when ssl is FALSE).
+ */
+ @SuppressWarnings("unused")
+ @Deprecated
+ public ConnectActionClientObject(Socket s, boolean ssl) throws IOException {
+ this(s, ssl ? "" : null);
+ }
+
+ /**
+ * @deprecated SSL support has been replaced by key-based encryption.
+ *
+ * Please use the version with key encryption (this deprecated
+ * version uses an empty key when ssl is TRUE and no
+ * key (NULL) when ssl is FALSE).
+ */
+ @SuppressWarnings("unused")
+ @Deprecated
+ public ConnectActionClientObject(Socket s, boolean ssl, Version version)
+ throws IOException {
+ this(s, ssl ? "" : null, version);
+ }
}
\ No newline at end of file