git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: add a HELLO handshake
[fanfix.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 a6e7a04f80dbb9d0d0e9784f5ada3d3c1b82cfcc..6a0d4f462c48d1adfc46f5723bd240514cdf020e 100644
(file)
--- a/
src/be/nikiroo/utils/serial/server/ServerString.java
+++ b/
src/be/nikiroo/utils/serial/server/ServerString.java
@@
-67,10
+67,11
@@
abstract public class ServerString extends Server {
return new ConnectActionServerString(s, key) {
@Override
public void action() throws Exception {
return new ConnectActionServerString(s, key) {
@Override
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, data);
+ rep = onRequest(this, data
, id
);
if (isClosing()) {
return;
}
if (isClosing()) {
return;
}
@@
-81,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
@@
-93,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,6
+112,9
@@
abstract public class ServerString extends Server {
* the client action
* @param data
* the data sent by the client
* the client action
* @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
*
@@
-110,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,
- String data) throws Exception;
+ String data
, long id
) throws Exception;
}
}