git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
serial: switch from SSL to CryptUtils
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
server
/
ConnectActionServer.java
diff --git
a/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
index 10d3440e7af4a4a09e5b7cdf06151ab15ac98f66..699f3074b44b228ac797e186c0f18da58208d08c 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ConnectActionServer.java
+++ b/
src/be/nikiroo/utils/serial/server/ConnectActionServer.java
@@
-28,9
+28,12
@@
abstract class ConnectActionServer {
*
* @param s
* the socket to bind to
*
* @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 ConnectActionServer(Socket s) {
- this(s, Version.getCurrentVersion());
+ public ConnectActionServer(Socket s
, String key
) {
+ this(s,
key,
Version.getCurrentVersion());
}
/**
}
/**
@@
-38,11
+41,14
@@
abstract class ConnectActionServer {
*
* @param s
* the socket to bind to
*
* @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 version
* the server version
*/
* @param version
* the server version
*/
- public ConnectActionServer(Socket s, Version version) {
- action = new ConnectAction(s, true, version) {
+ public ConnectActionServer(Socket s,
String key,
Version version) {
+ action = new ConnectAction(s, true,
key,
version) {
@Override
protected void action(Version clientVersion) throws Exception {
ConnectActionServer.this.action(clientVersion);
@Override
protected void action(Version clientVersion) throws Exception {
ConnectActionServer.this.action(clientVersion);
@@
-87,6
+93,8
@@
abstract class ConnectActionServer {
* <p>
* Example of usage: the client failed an authentication check, cut the
* connection here and now.
* <p>
* Example of usage: the client failed an authentication check, cut the
* connection here and now.
+ *
+ * @return TRUE when it is
*/
public boolean isClosing() {
return closing;
*/
public boolean isClosing() {
return closing;