import java.net.Socket;
import java.net.UnknownHostException;
-import be.nikiroo.utils.Version;
-
/**
* This class implements a simple server that can listen for connections and
* send/receive Strings.
* the port to listen on, or 0 to assign any unallocated port
* found (which can later on be queried via
* {@link ServerString#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
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
- public ServerString(int port, boolean ssl) throws IOException {
- super(port, ssl);
+ public ServerString(int port, String key) throws IOException {
+ super(port, key);
}
/**
* 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
* if the port parameter is outside the specified range of valid
* port values, which is between 0 and 65535, inclusive
*/
- public ServerString(String name, int port, boolean ssl) throws IOException {
- super(name, port, ssl);
+ public ServerString(String name, int port, String key) throws IOException {
+ super(name, port, key);
}
@Override
protected ConnectActionServer createConnectActionServer(Socket s) {
- return new ConnectActionServerString(s) {
+ return new ConnectActionServerString(s, key) {
@Override
- public void action(Version clientVersion) throws Exception {
+ public void action() throws Exception {
+ long id = getNextId();
for (String data = rec(); data != null; data = rec()) {
String rep = null;
try {
- rep = onRequest(this, clientVersion, data);
+ rep = onRequest(this, data, id);
if (isClosing()) {
return;
}
if (rep == null) {
rep = "";
}
-
send(rep);
}
+
+ onRequestDone(id, getBytesReceived(), getBytesSent());
}
@Override
*
* @param action
* the client action
- * @param clientVersion
- * the client version
* @param data
* the data sent by the client
+ * @param id
+ * an ID to identify this request (will also be re-used for
+ * {@link ServerObject#onRequestDone(long, long, long)}.
*
* @return the answer to return to the client
*
* in case of an exception, the error will only be logged
*/
abstract protected String onRequest(ConnectActionServerString action,
- Version clientVersion, String data) throws Exception;
+ String data, long id) throws Exception;
}