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
...
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
server
/
ServerObject.java
diff --git
a/src/be/nikiroo/utils/serial/server/ServerObject.java
b/src/be/nikiroo/utils/serial/server/ServerObject.java
index 53606ed420a671ce34826fe0d1380dac9501d05d..4f72013a3e7008896a65107d6e8737f87a640c0e 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ServerObject.java
+++ b/
src/be/nikiroo/utils/serial/server/ServerObject.java
@@
-24,8
+24,9
@@
abstract public class ServerObject extends Server {
* the port to listen on, or 0 to assign any unallocated port
* found (which can later on be queried via
* {@link ServerObject#getPort()}
* the port to listen on, or 0 to assign any unallocated port
* found (which can later on be queried via
* {@link ServerObject#getPort()}
- * @param ssl
- * use a SSL connection (or not)
+ * @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
*
* @throws IOException
* in case of I/O error
@@
-35,8
+36,8
@@
abstract public class ServerObject extends Server {
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
- public ServerObject(int port,
boolean ssl
) throws IOException {
- super(port,
ssl
);
+ public ServerObject(int port,
String key
) throws IOException {
+ super(port,
key
);
}
/**
}
/**
@@
-47,8
+48,9
@@
abstract public class ServerObject extends Server {
* the server name (only used for debug info and traces)
* @param port
* the port to listen on
* the server name (only used for debug info and traces)
* @param port
* the port to listen on
- * @param ssl
- * use a SSL connection (or not)
+ * @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
*
* @throws IOException
* in case of I/O error
@@
-58,13
+60,13
@@
abstract public class ServerObject extends Server {
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
- public ServerObject(String name, int port,
boolean ssl
) throws IOException {
- super(name, port,
ssl
);
+ public ServerObject(String name, int port,
String key
) throws IOException {
+ super(name, port,
key
);
}
@Override
protected ConnectActionServer createConnectActionServer(Socket s) {
}
@Override
protected ConnectActionServer createConnectActionServer(Socket s) {
- return new ConnectActionServerObject(s) {
+ return new ConnectActionServerObject(s
, key
) {
@Override
public void action(Version clientVersion) throws Exception {
try {
@Override
public void action(Version clientVersion) throws Exception {
try {
@@
-72,6
+74,9
@@
abstract public class ServerObject extends Server {
Object rep = null;
try {
rep = onRequest(this, clientVersion, data);
Object rep = null;
try {
rep = onRequest(this, clientVersion, data);
+ if (isClosing()) {
+ return;
+ }
} catch (Exception e) {
onError(e);
}
} catch (Exception e) {
onError(e);
}