X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FConnectActionClientObject.java;h=938564510753f36f70f66bae639afe3294c2e9a3;hb=44f134a51306506cc3458aabc774222cc0041a1c;hp=dd6f917ee03cf373ffe025a26fe83518e364f457;hpb=f4053377fa15da2f11e82955bfab86e673fa371c;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java b/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java index dd6f917..9385645 100644 --- a/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java +++ b/src/be/nikiroo/utils/serial/server/ConnectActionClientObject.java @@ -16,28 +16,43 @@ 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 @@ -47,9 +62,9 @@ public class ConnectActionClientObject extends ConnectActionClient { * 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); } /** @@ -59,10 +74,11 @@ 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 @@ -72,21 +88,9 @@ public class ConnectActionClientObject extends ConnectActionClient { * 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, - 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 - */ - 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); } /** @@ -113,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