X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbe%2Fnikiroo%2Futils%2Fserial%2Fserver%2FServer.java;h=04701590e1c669c7d2dd143e7c9d3e921052b5b5;hb=5a90a6ca7261f4c17407131fef58d5bcc793e2ce;hp=2f23c288388bbc82315672dc3e375c39ec3622cc;hpb=04744179c3fc6a098dbe23495a5da1062d0651c1;p=nikiroo-utils.git diff --git a/src/be/nikiroo/utils/serial/server/Server.java b/src/be/nikiroo/utils/serial/server/Server.java index 2f23c28..0470159 100644 --- a/src/be/nikiroo/utils/serial/server/Server.java +++ b/src/be/nikiroo/utils/serial/server/Server.java @@ -4,13 +4,6 @@ import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.List; - -import javax.net.ssl.SSLServerSocket; -import javax.net.ssl.SSLServerSocketFactory; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.SSLSocketFactory; import be.nikiroo.utils.TraceHandler; @@ -24,10 +17,10 @@ import be.nikiroo.utils.TraceHandler; * @author niki */ abstract class Server implements Runnable { - static private final String[] ANON_CIPHERS = getAnonCiphers(); + protected final String key; + protected long id = 0; private final String name; - private final boolean ssl; private final Object lock = new Object(); private final Object counterLock = new Object(); @@ -61,8 +54,9 @@ abstract class Server implements Runnable { * the port to listen on, or 0 to assign any unallocated port * found (which can later on be queried via * {@link Server#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 @@ -72,20 +66,20 @@ abstract class Server implements Runnable { * if the port parameter is outside the specified range of valid * port values, which is between 0 and 65535, inclusive */ - public Server(int port, boolean ssl) throws IOException { - this((String) null, port, ssl); + public Server(int port, String key) throws IOException { + this((String) null, port, key); } /** * Create a new server that will start listening on the network when * {@link Server#start()} is called. + *
+ * All the communications will happen in plain text. * * @param name * 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) * * @throws IOException * in case of I/O error @@ -95,11 +89,35 @@ abstract class Server implements Runnable { * if the port parameter is outside the specified range of valid * port values, which is between 0 and 65535, inclusive */ - public Server(String name, int port, boolean ssl) throws IOException { + public Server(String name, int port) throws IOException { + this(name, port, null); + } + + /** + * Create a new server that will start listening on the network when + * {@link Server#start()} is called. + * + * @param name + * the server name (only used for debug info and traces) + * @param port + * the port to listen on + * @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 UnknownHostException + * if the IP address of the host could not be determined + * @throws IllegalArgumentException + * if the port parameter is outside the specified range of valid + * port values, which is between 0 and 65535, inclusive + */ + public Server(String name, int port, String key) throws IOException { this.name = name; this.port = port; - this.ssl = ssl; - this.ss = createSocketServer(port, ssl); + this.key = key; + this.ss = new ServerSocket(port); if (this.port == 0) { this.port = this.ss.getLocalPort(); @@ -213,7 +231,7 @@ abstract class Server implements Runnable { try { tracer.trace(name + ": server starting on port " + port + " (" - + (ssl ? "SSL" : "plain text") + ")"); + + (key != null ? "encrypted" : "plain text") + ")"); while (started && !exiting) { count(1); @@ -306,8 +324,7 @@ abstract class Server implements Runnable { exiting = true; try { - new ConnectActionClientObject(createSocket(null, port, ssl)) - .connect(); + getConnectionToMe().connect(); long time = 0; while (ss != null && timeout > 0 && timeout > time) { Thread.sleep(10); @@ -331,6 +348,20 @@ abstract class Server implements Runnable { } } + /** + * Return a connection to this server (used by the Exit code to send an exit + * message). + * + * @return the connection + * + * @throws UnknownHostException + * the host should always be NULL (localhost) + * @throws IOException + * in case of I/O error + */ + abstract protected ConnectActionClient getConnectionToMe() + throws UnknownHostException, IOException; + /** * Change the number of currently serviced actions. * @@ -360,89 +391,29 @@ abstract class Server implements Runnable { } /** - * Create a {@link Socket}. + * Return the next ID to use. * - * @param host - * the host to connect to - * @param port - * the port to connect to - * @param ssl - * TRUE for SSL mode (or FALSE for plain text mode) - * - * @return the {@link Socket} - * - * @throws IOException - * in case of I/O error - * @throws UnknownHostException - * if the host is not known - * @throws IllegalArgumentException - * if the port parameter is outside the specified range of valid - * port values, which is between 0 and 65535, inclusive - */ - static Socket createSocket(String host, int port, boolean ssl) - throws IOException { - Socket s; - if (ssl) { - s = SSLSocketFactory.getDefault().createSocket(host, port); - if (s instanceof SSLSocket) { - // Should always be the case - ((SSLSocket) s).setEnabledCipherSuites(ANON_CIPHERS); - } - } else { - s = new Socket(host, port); - } - - return s; - } - - /** - * Create a {@link ServerSocket}. - * - * @param port - * the port to accept connections on - * @param ssl - * TRUE for SSL mode (or FALSE for plain text mode) - * - * @return the {@link ServerSocket} - * - * @throws IOException - * in case of I/O error - * @throws UnknownHostException - * if the IP address of the host could not be determined - * @throws IllegalArgumentException - * if the port parameter is outside the specified range of valid - * port values, which is between 0 and 65535, inclusive + * @return the next ID */ - static ServerSocket createSocketServer(int port, boolean ssl) - throws IOException { - ServerSocket ss; - if (ssl) { - ss = SSLServerSocketFactory.getDefault().createServerSocket(port); - if (ss instanceof SSLServerSocket) { - // Should always be the case - ((SSLServerSocket) ss).setEnabledCipherSuites(ANON_CIPHERS); - } - } else { - ss = new ServerSocket(port); - } - - return ss; + protected synchronized long getNextId() { + return id++; } /** - * Return all the supported ciphers that do not use authentication. + * Method called when + * {@link ServerObject#onRequest(ConnectActionServerObject, Object, long)} + * has successfully finished. + *
+ * Can be used to know how much data was transmitted.
*
- * @return the list of such supported ciphers
+ * @param id
+ * the ID used to identify the request
+ * @param bytesReceived
+ * the bytes received during the request
+ * @param bytesSent
+ * the bytes sent during the request
*/
- public static String[] getAnonCiphers() {
- List