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
limit API breakage
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
utils
/
serial
/
server
/
ServerString.java
diff --git
a/src/be/nikiroo/utils/serial/server/ServerString.java
b/src/be/nikiroo/utils/serial/server/ServerString.java
index 9d8d008e02a3907f3c0a386ca165c1c8e4b12352..6a0d4f462c48d1adfc46f5723bd240514cdf020e 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ServerString.java
+++ b/
src/be/nikiroo/utils/serial/server/ServerString.java
@@
-4,8
+4,6
@@
import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
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.
/**
* This class implements a simple server that can listen for connections and
* send/receive Strings.
@@
-68,11
+66,12
@@
abstract public class ServerString extends Server {
protected ConnectActionServer createConnectActionServer(Socket s) {
return new ConnectActionServerString(s, key) {
@Override
protected ConnectActionServer createConnectActionServer(Socket 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 {
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 (isClosing()) {
return;
}
@@
-83,9
+82,10
@@
abstract public class ServerString extends Server {
if (rep == null) {
rep = "";
}
if (rep == null) {
rep = "";
}
-
send(rep);
}
send(rep);
}
+
+ onRequestDone(id, getBytesReceived(), getBytesSent());
}
@Override
}
@Override
@@
-95,6
+95,13
@@
abstract public class ServerString extends Server {
};
}
};
}
+ @Override
+ protected ConnectActionClient getConnectionToMe()
+ throws UnknownHostException, IOException {
+ return new ConnectActionClientString(new Socket((String) null,
+ getPort()), key);
+ }
+
/**
* This is the method that is called on each client request.
* <p>
/**
* This is the method that is called on each client request.
* <p>
@@
-103,10
+110,11
@@
abstract public class ServerString extends Server {
*
* @param action
* the client action
*
* @param action
* the client action
- * @param clientVersion
- * the client version
* @param data
* the data sent by the client
* @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
*
*
* @return the answer to return to the client
*
@@
-114,5
+122,5
@@
abstract public class ServerString extends Server {
* in case of an exception, the error will only be logged
*/
abstract protected String onRequest(ConnectActionServerString action,
* 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;
}
}