protected ConnectAction action;
/**
- * Create a new {@link ConnectActionClient} with the current application
- * version (see {@link Version#getCurrentVersion()}) as the client version.
- *
- * @param s
- * the socket to bind to
- */
- public ConnectActionClient(Socket s) {
- this(s, Version.getCurrentVersion());
- }
-
- /**
- * Create a new {@link ConnectActionClient} with the current application
- * version (see {@link Version#getCurrentVersion()}) as the client version.
+ * Create a new {@link ConnectActionClient}, using the current version of
+ * the program.
*
* @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
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
- public ConnectActionClient(String host, int port, boolean ssl)
+ public ConnectActionClient(String host, int port, String key)
throws IOException {
- this(Server.createSocket(host, port, ssl), Version.getCurrentVersion());
+ this(host, port, key, Version.getCurrentVersion());
}
/**
* 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
+ * @param key
+ * an optional key to encrypt all the communications (if NULL,
+ * everything will be sent in clear text)
+ * @param clientVersion
* the client version
*
+ *
* @throws IOException
* in case of I/O error
* @throws UnknownHostException
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
- public ConnectActionClient(String host, int port, boolean ssl,
- Version version) throws IOException {
- this(Server.createSocket(host, port, ssl), version);
+ public ConnectActionClient(String host, int port, String key,
+ Version clientVersion) throws IOException {
+ this(new Socket(host, port), key, clientVersion);
+ }
+
+ /**
+ * Create a new {@link ConnectActionClient}, using the current version of
+ * the program.
+ *
+ * @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 ConnectActionClient(Socket s, String key) {
+ this(s, key, Version.getCurrentVersion());
}
/**
*
* @param s
* the socket to bind to
- * @param version
+ * @param key
+ * an optional key to encrypt all the communications (if NULL,
+ * everything will be sent in clear text)
+ * @param clientVersion
* the client version
*/
- public ConnectActionClient(Socket s, Version version) {
- action = new ConnectAction(s, false, version) {
+ public ConnectActionClient(Socket s, String key, Version clientVersion) {
+ action = new ConnectAction(s, false, key, clientVersion) {
@Override
protected void action(Version serverVersion) throws Exception {
ConnectActionClient.this.action(serverVersion);
* Method that will be called when an action is performed on the client.
*
* @param serverVersion
- * the server version
+ * the version of the server connected to this client
*
* @throws Exception
* in case of I/O error