summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/filetransfer/Uploader.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/Uploader.java')
-rw-r--r--src/main/java/org/openslx/filetransfer/Uploader.java324
1 files changed, 192 insertions, 132 deletions
diff --git a/src/main/java/org/openslx/filetransfer/Uploader.java b/src/main/java/org/openslx/filetransfer/Uploader.java
index befa9bf..5aaa7ef 100644
--- a/src/main/java/org/openslx/filetransfer/Uploader.java
+++ b/src/main/java/org/openslx/filetransfer/Uploader.java
@@ -16,7 +16,8 @@ import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
-public class Uploader {
+public class Uploader
+{
// Some member variables.
private SSLSocketFactory sslSocketFactory;
private SSLSocket satelliteSocket;
@@ -25,244 +26,303 @@ public class Uploader {
private String TOKEN = null;
private String RANGE = null;
private String ERROR = null;
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Constructor for satellite uploader.
* Tries to connect to specific ip and port and sending type of action.
+ *
* @param ip
* @param port
- * @throws IOException
- * @throws KeyStoreException
- * @throws CertificateException
- * @throws NoSuchAlgorithmException
- * @throws KeyManagementException
- * @throws UnknownHostException
+ * @throws IOException
+ * @throws KeyStoreException
+ * @throws CertificateException
+ * @throws NoSuchAlgorithmException
+ * @throws KeyManagementException
+ * @throws UnknownHostException
*/
- public Uploader(String ip, int port, SSLContext context) throws IOException, KeyStoreException, NoSuchAlgorithmException, CertificateException, KeyManagementException {
- sslSocketFactory = context.getSocketFactory();
-
- satelliteSocket = (SSLSocket) sslSocketFactory.createSocket(ip, port);
-
- dataToServer = new DataOutputStream(satelliteSocket.getOutputStream());
- dataToServer.writeByte('U');
- dataFromServer = new DataInputStream(satelliteSocket.getInputStream());
+ public Uploader( String ip, int port, SSLContext context )
+ {
+ try {
+ sslSocketFactory = context.getSocketFactory();
+
+ satelliteSocket = (SSLSocket)sslSocketFactory.createSocket( ip, port );
+
+ dataToServer = new DataOutputStream( satelliteSocket.getOutputStream() );
+ dataToServer.writeByte( 'U' );
+ dataFromServer = new DataInputStream( satelliteSocket.getInputStream() );
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Constructor for master uploader.
* Sends back the socket for datatransfer.
- * @throws IOException
+ *
+ * @throws IOException
*/
- public Uploader(SSLSocket socket) throws IOException {
- satelliteSocket = socket;
- dataToServer = new DataOutputStream(satelliteSocket.getOutputStream());
- dataFromServer = new DataInputStream(satelliteSocket.getInputStream());
+ public Uploader( SSLSocket socket )
+ {
+ try {
+ satelliteSocket = socket;
+ dataToServer = new DataOutputStream( satelliteSocket.getOutputStream() );
+ dataFromServer = new DataInputStream( satelliteSocket.getInputStream() );
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Method for sending token from satellite to master.
* Needfull for getting to know what should happens over connection.
+ *
* @param t
*/
- public void sendToken(String token) throws IOException {
- TOKEN = token;
- String sendToken = "TOKEN=" + TOKEN;
- byte[] data = sendToken.getBytes(StandardCharsets.UTF_8);
- dataToServer.writeByte(data.length);
- dataToServer.write(data);
+ public Boolean sendToken( String token )
+ {
+ try {
+ TOKEN = token;
+ String sendToken = "TOKEN=" + TOKEN;
+ byte[] data = sendToken.getBytes( StandardCharsets.UTF_8 );
+ dataToServer.writeByte( data.length );
+ dataToServer.write( data );
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Getter for TOKEN.
*/
- public String getToken() {
- if (TOKEN != null)
- return TOKEN;
- return null;
+ public String getToken()
+ {
+ return TOKEN;
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Method to send range of the file, which should be uploaded.
* Helpful for knowing how much was already uploaded if
* connection aborts.
+ *
* @param a
* @param b
- * @throws IOException
*/
- public void sendRange(int a, int b) throws IOException {
- RANGE = a + ":" + b;
- String sendRange = "RANGE=" + RANGE;
- byte[] data = sendRange.getBytes(StandardCharsets.UTF_8);
- dataToServer.writeByte(data.length);
- dataToServer.write(data);
- dataToServer.writeByte(0);
+ public Boolean sendRange( int a, int b )
+ {
+ try {
+ RANGE = a + ":" + b;
+ String sendRange = "RANGE=" + RANGE;
+ byte[] data = sendRange.getBytes( StandardCharsets.UTF_8 );
+ dataToServer.writeByte( data.length );
+ dataToServer.write( data );
+ dataToServer.writeByte( 0 );
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Getter for RANGE.
+ *
* @return
*/
- public String getRange() {
- if (RANGE != null)
- return RANGE;
- return null;
+ public String getRange()
+ {
+ return RANGE;
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Getter for beginning of RANGE.
+ *
* @return
*/
- public int getStartOfRange() {
- if (RANGE != null) {
- String[] splitted = RANGE.split(":");
- return Integer.parseInt(splitted[0]);
+ public int getStartOfRange()
+ {
+ if ( RANGE != null ) {
+ String[] splitted = RANGE.split( ":" );
+ return Integer.parseInt( splitted[0] );
}
return -1;
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Getter for end of RANGE.
+ *
* @return
*/
- public int getEndOfRange() {
- if (RANGE != null) {
- String[] splitted = RANGE.split(":");
- return Integer.parseInt(splitted[1]);
+ public int getEndOfRange()
+ {
+ if ( RANGE != null ) {
+ String[] splitted = RANGE.split( ":" );
+ return Integer.parseInt( splitted[1] );
}
return -1;
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Method for returning difference of current Range.
+ *
* @return
*/
- public int getDiffOfRange() {
- if (getStartOfRange() == -1 || getEndOfRange() == -1) {
+ public int getDiffOfRange()
+ {
+ if ( getStartOfRange() == -1 || getEndOfRange() == -1 ) {
return -1;
}
- int diff = Math.abs(getEndOfRange() - getStartOfRange());
+ int diff = Math.abs( getEndOfRange() - getStartOfRange() );
return diff;
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Method for reading MetaData, like TOKEN and FileRange.
* Split incoming bytes after first '=' and store value to specific
* variable.
- * @throws IOException
+ *
*/
- public Boolean readMetaData() {
+ public Boolean readMetaData()
+ {
try {
- while (true) {
- byte[] incoming = new byte[255];
-
+ while ( true ) {
+ byte[] incoming = new byte[ 255 ];
+
// First get length.
- dataFromServer.read(incoming, 0, 1);
+ dataFromServer.read( incoming, 0, 1 );
int length = incoming[0];
// System.out.println("length: " + length);
-
- if (length == 0) // Stop if 0 was read.
+
+ if ( length == 0 ) // Stop if 0 was read.
break;
-
+
/**
- * Read the next available bytes and split by '=' for
- * getting TOKEN or RANGE.
+ * Read the next available bytes and split by '=' for
+ * getting TOKEN or RANGE.
*/
int hasRead = 0;
- while (hasRead < length) {
- int ret = dataFromServer.read(incoming, hasRead, length - hasRead);
- if (ret == -1) {
- System.out.println("Error in reading Metadata occured!");
+ while ( hasRead < length ) {
+ int ret = dataFromServer.read( incoming, hasRead, length - hasRead );
+ if ( ret == -1 ) {
+ System.out.println( "Error in reading Metadata occured!" );
return false;
}
hasRead += ret;
}
- String data = new String(incoming, "UTF-8");
+ String data = new String( incoming, "UTF-8" );
// System.out.println(data);
-
- String[] splitted = data.split("=");
+
+ String[] splitted = data.split( "=" );
// System.out.println("splitted[0]: " + splitted[0]);
// System.out.println("splitted[1]: " + splitted[1]);
- if (splitted[0] != null && splitted[0].equals("TOKEN")) {
- if (splitted[1] != null)
+ if ( splitted[0] != null && splitted[0].equals( "TOKEN" ) ) {
+ if ( splitted[1] != null )
TOKEN = splitted[1];
- System.out.println("TOKEN: " + TOKEN);
+ System.out.println( "TOKEN: " + TOKEN );
}
- else if (splitted[0].equals("RANGE")) {
- if (splitted[1] != null)
+ else if ( splitted[0].equals( "RANGE" ) ) {
+ if ( splitted[1] != null )
RANGE = splitted[1];
- System.out.println("RANGE: " + RANGE);
+ System.out.println( "RANGE: " + RANGE );
}
- else if (splitted[0].equals("ERROR")) {
- if (splitted[1] != null)
+ else if ( splitted[0].equals( "ERROR" ) ) {
+ if ( splitted[1] != null )
ERROR = splitted[1];
- System.err.println("ERROR: " + ERROR);
+ System.err.println( "ERROR: " + ERROR );
this.close();
return false;
}
}
- } catch (IOException e) {
+ } catch ( IOException e ) {
e.printStackTrace();
return false;
}
return true;
}
- /***********************************************************************//**
+ /***********************************************************************/
+ /**
* Method for sending File with filename.
+ *
* @param filename
- * @throws IOException
*/
- public Boolean sendFile(String filename) {
+ public Boolean sendFile( String filename )
+ {
try {
- RandomAccessFile file = new RandomAccessFile(new File(filename), "r");
-
- if (getStartOfRange() == -1) {
+ RandomAccessFile file = new RandomAccessFile( new File( filename ), "r" );
+
+ if ( getStartOfRange() == -1 ) {
file.close();
return false;
}
- file.seek(getStartOfRange());
-
- byte[] data = new byte[255];
+ file.seek( getStartOfRange() );
+
+ byte[] data = new byte[ 255 ];
int hasRead = 0;
int length = getDiffOfRange();
- System.out.println("diff of Range: " + length);
- while (hasRead < length) {
- int ret = file.read(data, hasRead, length - hasRead);
- if (ret == -1) {
- System.out.println("Error occured in Uploader.sendFile(),"
- + " while reading from File to send.");
+ System.out.println( "diff of Range: " + length );
+ while ( hasRead < length ) {
+ int ret = file.read( data, hasRead, length - hasRead );
+ if ( ret == -1 ) {
+ System.out.println( "Error occured in Uploader.sendFile(),"
+ + " while reading from File to send." );
file.close();
return false;
}
hasRead += ret;
}
file.close();
-
- dataToServer.write(data, 0, length);
- } catch (Exception e) {
+
+ dataToServer.write( data, 0, length );
+ } catch ( Exception e ) {
e.printStackTrace();
return false;
}
return true;
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Method for sending error Code to server. For example in case of wrong
* token, send code for wrong token.
- * @throws IOException
+ *
*/
- public void sendErrorCode(String errString) throws IOException {
- String sendError = "ERROR=" + errString;
- byte[] data = sendError.getBytes(StandardCharsets.UTF_8);
- dataToServer.writeByte(data.length);
- dataToServer.write(data);
+ public Boolean sendErrorCode( String errString )
+ {
+ try {
+ String sendError = "ERROR=" + errString;
+ byte[] data = sendError.getBytes( StandardCharsets.UTF_8 );
+ dataToServer.writeByte( data.length );
+ dataToServer.write( data );
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
}
-
- /***********************************************************************//**
+
+ /***********************************************************************/
+ /**
* Method for closing connection, if download has finished.
- * @throws IOException
+ *
*/
- public void close() throws IOException {
- this.satelliteSocket.close();
+ public void close()
+ {
+ try {
+ this.satelliteSocket.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
}
}
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-27 19:53:46 +0100