diff options
-rw-r--r-- | src/main/java/org/openslx/filetransfer/Downloader.java | 11 | ||||
-rw-r--r-- | src/main/java/org/openslx/filetransfer/Listener.java | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Downloader.java b/src/main/java/org/openslx/filetransfer/Downloader.java index 58e32f9..6fe0f1a 100644 --- a/src/main/java/org/openslx/filetransfer/Downloader.java +++ b/src/main/java/org/openslx/filetransfer/Downloader.java @@ -38,6 +38,7 @@ public class Downloader { * @throws KeyManagementException */ public Downloader(String ip, int port, SSLContext context) throws IOException, KeyStoreException, NoSuchAlgorithmException, CertificateException, KeyManagementException { + // TODO: Remove old code, that's why we have git.. ;) /* char[] passphrase = "test123".toCharArray(); KeyStore keystore = KeyStore.getInstance("JKS"); @@ -127,10 +128,8 @@ public class Downloader { * Method for reading incoming token for identification. * @throws IOException */ - public String getToken() throws IOException { - if (TOKEN != null) - return TOKEN; - return null; + public String getToken() { + return TOKEN; } /***********************************************************************//** @@ -138,9 +137,7 @@ public class Downloader { * Helpful for knowing how much is already downloaded if connection aborts. */ public String getRange() { - if (RANGE != null) - return RANGE; - return null; + return RANGE; } /***********************************************************************//** diff --git a/src/main/java/org/openslx/filetransfer/Listener.java b/src/main/java/org/openslx/filetransfer/Listener.java index afd4126..eaa8d4b 100644 --- a/src/main/java/org/openslx/filetransfer/Listener.java +++ b/src/main/java/org/openslx/filetransfer/Listener.java @@ -5,6 +5,8 @@ import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLServerSocketFactory; import javax.net.ssl.SSLSocket; +// TODO: (all files) apply formatting using strg+shift+f *after* importing scheme from ./extras/ + public class Listener extends Thread { private IncomingEvent incomingEvent; /* @@ -41,22 +43,24 @@ public class Listener extends Thread { * connection, and start Downloader or Uploader. * @throws Exception */ - private void listen() throws Exception { + private void listen() throws Exception { // TODO: Handle exceptions in function to keep going SSLServerSocketFactory sslServerSocketFactory = context.getServerSocketFactory(); SSLServerSocket welcomeSocket = (SSLServerSocket) sslServerSocketFactory.createServerSocket(this.port); while (!isInterrupted()) { SSLSocket connectionSocket = (SSLSocket) welcomeSocket.accept(); + connectionSocket.setSoTimeout(2000); // 2 second timeout enough? Maybe even use a small thread pool for handling accepted connections + // TODO: Handle SocketTimeoutException for all reads and writes in Downloader and Uploader byte[] b = new byte[1]; int length = connectionSocket.getInputStream().read(b); System.out.println(length); - // Ascii - Code: 'U' = 85 ; 'D' = 68. + // Ascii - Code: 'U' = 85 ; 'D' = 68. TODO: byte constant as class member if (b[0] == 85) { - System.out.println("U erkannt --> Downloader starten"); + System.out.println("U erkannt --> Downloader starten"); // TODO: Use Logger (see masterserver code for example) // --> start Downloader(socket). Downloader d = new Downloader(connectionSocket); incomingEvent.incomingDownloader(d); |