Merge branch 'subtree'

[nikiroo-utils.git] / src / be / nikiroo / utils / serial / server / ConnectActionServer.java

diff --git a/src/be/nikiroo/utils/serial/server/ConnectActionServer.java b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
index 04bf3360512567163e021308f88f35c249e2f124..350d3fe40a1320b68f555458a43c3ceec11e8c25 100644 (file)
--- a/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
+++ b/src/be/nikiroo/utils/serial/server/ConnectActionServer.java
@@ -1,10 +1,7 @@
 package be.nikiroo.utils.serial.server;
 
-import java.io.IOException;
 import java.net.Socket;
 
-import javax.net.ssl.SSLException;
-
 import be.nikiroo.utils.Version;
 
 /**
@@ -53,7 +50,6 @@ abstract class ConnectActionServer {
                action = new ConnectAction(s, true, key, serverVersion) {
                        @Override
                        protected void action(Version clientVersion) throws Exception {
-                               ConnectActionServer.this.serverHello();
                                ConnectActionServer.this.action(clientVersion);
                        }
 
@@ -69,23 +65,6 @@ abstract class ConnectActionServer {
                };
        }
 
-       /**
-        * Send the HELLO message (check that the client sends a String "HELLO" and
-        * send it back, to check I/O and encryption modes).
-        * 
-        * @throws IOException
-        *             in case of I/O error
-        * @throws SSLException
-        *             in case of encryption error
-        */
-       protected void serverHello() throws IOException, SSLException {
-               String HELLO = action.recString();
-               if (!"HELLO".equals(HELLO)) {
-                       throw new SSLException("Server did not accept the encryption key");
-               }
-               action.sendString(HELLO);
-       }
-
        /**
         * Actually start the process and call the action (synchronous).
         */