Add port to up- and download infos

Add function to CRCFile to create one from a list of crc sums

15 files changed, 261 insertions, 26 deletions

diff --git a/src/main/java/org/openslx/imagemaster/crcchecker/CRCFile.java b/src/main/java/org/openslx/imagemaster/crcchecker/CRCFile.java
index b557ada..74e3d84 100644
--- a/src/main/java/org/openslx/imagemaster/crcchecker/CRCFile.java
+++ b/src/main/java/org/openslx/imagemaster/crcchecker/CRCFile.java
@@ -1,8 +1,11 @@
 package org.openslx.imagemaster.crcchecker;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -18,8 +21,34 @@ public class CRCFile
 	private File file;
 	private List<Integer> crcSums = null;
 	
-	CRCFile(String filename) {
+	/**
+	 * Loads a crcFile from file
+	 * @param filename
+	 */
+	CRCFile(String filename)
+	{
+		this.file = new File( filename );
+	}
+	
+	/**
+	 * Creates a new crc file with the given sums.
+	 * The first crc sum in the list needs to be the sum over the other sums.
+	 * @param listOfCrcSums The list of the crc sums that are going into the crc file
+	 * @param filename Where to save the created crc file
+	 * @throws IOException If it's not possible to write the file
+	 */
+	CRCFile(List<Integer> listOfCrcSums, String filename) throws IOException
+	{
 		this.file = new File( filename );
+		FileOutputStream fos = new FileOutputStream( file );
+		DataOutputStream dos = new DataOutputStream( fos );
+		
+		for ( Integer sum : listOfCrcSums ) {
+			dos.writeInt( Integer.reverseBytes( sum.intValue() ) );		// save byte-reversed integers to match right order in crc file
+		}
+		
+		dos.close();
+		this.crcSums = listOfCrcSums;
 	}
 	
 	/**
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java
index 074f483..01062ea 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java
index cbc02c9..cea3a10 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java
index 261cc82..e3e5251 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java
@@ -34,11 +34,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, DownloadInfos._Fields>, java.io.Serializable, Cloneable, Comparable<DownloadInfos> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DownloadInfos");
 
   private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)2);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -47,10 +48,12 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
   }
 
   public String token; // required
+  public int port; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    TOKEN((short)1, "token");
+    TOKEN((short)1, "token"),
+    PORT((short)2, "port");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -67,6 +70,8 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
       switch(fieldId) {
         case 1: // TOKEN
           return TOKEN;
+        case 2: // PORT
+          return PORT;
         default:
           return null;
       }
@@ -107,11 +112,15 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
   }
 
   // isset id assignments
+  private static final int __PORT_ISSET_ID = 0;
+  private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DownloadInfos.class, metaDataMap);
   }
@@ -120,19 +129,24 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
   }
 
   public DownloadInfos(
-    String token)
+    String token,
+    int port)
   {
     this();
     this.token = token;
+    this.port = port;
+    setPortIsSet(true);
   }
 
   /**
    * Performs a deep copy on <i>other</i>.
    */
   public DownloadInfos(DownloadInfos other) {
+    __isset_bitfield = other.__isset_bitfield;
     if (other.isSetToken()) {
       this.token = other.token;
     }
+    this.port = other.port;
   }
 
   public DownloadInfos deepCopy() {
@@ -142,6 +156,8 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
   @Override
   public void clear() {
     this.token = null;
+    setPortIsSet(false);
+    this.port = 0;
   }
 
   public String getToken() {
@@ -168,6 +184,29 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
     }
   }
 
+  public int getPort() {
+    return this.port;
+  }
+
+  public DownloadInfos setPort(int port) {
+    this.port = port;
+    setPortIsSet(true);
+    return this;
+  }
+
+  public void unsetPort() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+  }
+
+  /** Returns true if field port is set (has been assigned a value) and false otherwise */
+  public boolean isSetPort() {
+    return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+  }
+
+  public void setPortIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TOKEN:
@@ -178,6 +217,14 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
       }
       break;
 
+    case PORT:
+      if (value == null) {
+        unsetPort();
+      } else {
+        setPort((Integer)value);
+      }
+      break;
+
     }
   }
 
@@ -186,6 +233,9 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
     case TOKEN:
       return getToken();
 
+    case PORT:
+      return Integer.valueOf(getPort());
+
     }
     throw new IllegalStateException();
   }
@@ -199,6 +249,8 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
     switch (field) {
     case TOKEN:
       return isSetToken();
+    case PORT:
+      return isSetPort();
     }
     throw new IllegalStateException();
   }
@@ -225,6 +277,15 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
         return false;
     }
 
+    boolean this_present_port = true;
+    boolean that_present_port = true;
+    if (this_present_port || that_present_port) {
+      if (!(this_present_port && that_present_port))
+        return false;
+      if (this.port != that.port)
+        return false;
+    }
+
     return true;
   }
 
@@ -237,6 +298,11 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
     if (present_token)
       list.add(token);
 
+    boolean present_port = true;
+    list.add(present_port);
+    if (present_port)
+      list.add(port);
+
     return list.hashCode();
   }
 
@@ -258,6 +324,16 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPort()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -285,6 +361,10 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
       sb.append(this.token);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("port:");
+    sb.append(this.port);
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -304,6 +384,8 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
 
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
     try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bitfield = 0;
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
       throw new java.io.IOException(te);
@@ -336,6 +418,14 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 2: // PORT
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.port = iprot.readI32();
+              struct.setPortIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -356,6 +446,9 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
         oprot.writeString(struct.token);
         oprot.writeFieldEnd();
       }
+      oprot.writeFieldBegin(PORT_FIELD_DESC);
+      oprot.writeI32(struct.port);
+      oprot.writeFieldEnd();
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -377,20 +470,30 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
       if (struct.isSetToken()) {
         optionals.set(0);
       }
-      oprot.writeBitSet(optionals, 1);
+      if (struct.isSetPort()) {
+        optionals.set(1);
+      }
+      oprot.writeBitSet(optionals, 2);
       if (struct.isSetToken()) {
         oprot.writeString(struct.token);
       }
+      if (struct.isSetPort()) {
+        oprot.writeI32(struct.port);
+      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, DownloadInfos struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.token = iprot.readString();
         struct.setTokenIsSet(true);
       }
+      if (incoming.get(1)) {
+        struct.port = iprot.readI32();
+        struct.setPortIsSet(true);
+      }
     }
   }
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java b/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java
index 621ab4f..6faca03 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class FtpCredentials implements org.apache.thrift.TBase<FtpCredentials, FtpCredentials._Fields>, java.io.Serializable, Cloneable, Comparable<FtpCredentials> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FtpCredentials");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java
index 52bff90..486c85b 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._Fields>, java.io.Serializable, Cloneable, Comparable<ImageData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageData");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java
index fce9560..ce61bca 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class ImageDataException extends TException implements org.apache.thrift.TBase<ImageDataException, ImageDataException._Fields>, java.io.Serializable, Cloneable, Comparable<ImageDataException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageDataException");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java
index 059abf4..be8cdda 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class ImageServer {
 
   public interface Iface {
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java
index e5de3ec..a539712 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class InvalidTokenException extends TException implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidTokenException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTokenException");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java
index a2c299f..0d8ae43 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class ServerAuthenticationException extends TException implements org.apache.thrift.TBase<ServerAuthenticationException, ServerAuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<ServerAuthenticationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServerAuthenticationException");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java
index 11361ad..8457232 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionData, ServerSessionData._Fields>, java.io.Serializable, Cloneable, Comparable<ServerSessionData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServerSessionData");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java
index 27accf0..fc7d5e6 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class SessionData implements org.apache.thrift.TBase<SessionData, SessionData._Fields>, java.io.Serializable, Cloneable, Comparable<SessionData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SessionData");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
index da13023..8298f88 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class UploadException extends TException implements org.apache.thrift.TBase<UploadException, UploadException._Fields>, java.io.Serializable, Cloneable, Comparable<UploadException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadException");
 
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java
index 82a20ba..0de523d 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java
@@ -34,12 +34,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadInfos._Fields>, java.io.Serializable, Cloneable, Comparable<UploadInfos> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadInfos");
 
   private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField MISSING_BLOCKS_FIELD_DESC = new org.apache.thrift.protocol.TField("missingBlocks", org.apache.thrift.protocol.TType.LIST, (short)2);
+  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField MISSING_BLOCKS_FIELD_DESC = new org.apache.thrift.protocol.TField("missingBlocks", org.apache.thrift.protocol.TType.LIST, (short)3);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -48,12 +49,14 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
   }
 
   public String token; // required
+  public int port; // required
   public List<Integer> missingBlocks; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     TOKEN((short)1, "token"),
-    MISSING_BLOCKS((short)2, "missingBlocks");
+    PORT((short)2, "port"),
+    MISSING_BLOCKS((short)3, "missingBlocks");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -70,7 +73,9 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
       switch(fieldId) {
         case 1: // TOKEN
           return TOKEN;
-        case 2: // MISSING_BLOCKS
+        case 2: // PORT
+          return PORT;
+        case 3: // MISSING_BLOCKS
           return MISSING_BLOCKS;
         default:
           return null;
@@ -112,11 +117,15 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
   }
 
   // isset id assignments
+  private static final int __PORT_ISSET_ID = 0;
+  private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.MISSING_BLOCKS, new org.apache.thrift.meta_data.FieldMetaData("missingBlocks", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
@@ -129,10 +138,13 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
 
   public UploadInfos(
     String token,
+    int port,
     List<Integer> missingBlocks)
   {
     this();
     this.token = token;
+    this.port = port;
+    setPortIsSet(true);
     this.missingBlocks = missingBlocks;
   }
 
@@ -140,9 +152,11 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
    * Performs a deep copy on <i>other</i>.
    */
   public UploadInfos(UploadInfos other) {
+    __isset_bitfield = other.__isset_bitfield;
     if (other.isSetToken()) {
       this.token = other.token;
     }
+    this.port = other.port;
     if (other.isSetMissingBlocks()) {
       List<Integer> __this__missingBlocks = new ArrayList<Integer>(other.missingBlocks);
       this.missingBlocks = __this__missingBlocks;
@@ -156,6 +170,8 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
   @Override
   public void clear() {
     this.token = null;
+    setPortIsSet(false);
+    this.port = 0;
     this.missingBlocks = null;
   }
 
@@ -183,6 +199,29 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
     }
   }
 
+  public int getPort() {
+    return this.port;
+  }
+
+  public UploadInfos setPort(int port) {
+    this.port = port;
+    setPortIsSet(true);
+    return this;
+  }
+
+  public void unsetPort() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+  }
+
+  /** Returns true if field port is set (has been assigned a value) and false otherwise */
+  public boolean isSetPort() {
+    return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+  }
+
+  public void setPortIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+  }
+
   public int getMissingBlocksSize() {
     return (this.missingBlocks == null) ? 0 : this.missingBlocks.size();
   }
@@ -232,6 +271,14 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
       }
       break;
 
+    case PORT:
+      if (value == null) {
+        unsetPort();
+      } else {
+        setPort((Integer)value);
+      }
+      break;
+
     case MISSING_BLOCKS:
       if (value == null) {
         unsetMissingBlocks();
@@ -248,6 +295,9 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
     case TOKEN:
       return getToken();
 
+    case PORT:
+      return Integer.valueOf(getPort());
+
     case MISSING_BLOCKS:
       return getMissingBlocks();
 
@@ -264,6 +314,8 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
     switch (field) {
     case TOKEN:
       return isSetToken();
+    case PORT:
+      return isSetPort();
     case MISSING_BLOCKS:
       return isSetMissingBlocks();
     }
@@ -292,6 +344,15 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
         return false;
     }
 
+    boolean this_present_port = true;
+    boolean that_present_port = true;
+    if (this_present_port || that_present_port) {
+      if (!(this_present_port && that_present_port))
+        return false;
+      if (this.port != that.port)
+        return false;
+    }
+
     boolean this_present_missingBlocks = true && this.isSetMissingBlocks();
     boolean that_present_missingBlocks = true && that.isSetMissingBlocks();
     if (this_present_missingBlocks || that_present_missingBlocks) {
@@ -313,6 +374,11 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
     if (present_token)
       list.add(token);
 
+    boolean present_port = true;
+    list.add(present_port);
+    if (present_port)
+      list.add(port);
+
     boolean present_missingBlocks = true && (isSetMissingBlocks());
     list.add(present_missingBlocks);
     if (present_missingBlocks)
@@ -339,6 +405,16 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPort()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = Boolean.valueOf(isSetMissingBlocks()).compareTo(other.isSetMissingBlocks());
     if (lastComparison != 0) {
       return lastComparison;
@@ -377,6 +453,10 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
     }
     first = false;
     if (!first) sb.append(", ");
+    sb.append("port:");
+    sb.append(this.port);
+    first = false;
+    if (!first) sb.append(", ");
     sb.append("missingBlocks:");
     if (this.missingBlocks == null) {
       sb.append("null");
@@ -403,6 +483,8 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
 
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
     try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bitfield = 0;
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
       throw new java.io.IOException(te);
@@ -435,7 +517,15 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // MISSING_BLOCKS
+          case 2: // PORT
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.port = iprot.readI32();
+              struct.setPortIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // MISSING_BLOCKS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
@@ -473,6 +563,9 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
         oprot.writeString(struct.token);
         oprot.writeFieldEnd();
       }
+      oprot.writeFieldBegin(PORT_FIELD_DESC);
+      oprot.writeI32(struct.port);
+      oprot.writeFieldEnd();
       if (struct.missingBlocks != null) {
         oprot.writeFieldBegin(MISSING_BLOCKS_FIELD_DESC);
         {
@@ -506,13 +599,19 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
       if (struct.isSetToken()) {
         optionals.set(0);
       }
-      if (struct.isSetMissingBlocks()) {
+      if (struct.isSetPort()) {
         optionals.set(1);
       }
-      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetMissingBlocks()) {
+        optionals.set(2);
+      }
+      oprot.writeBitSet(optionals, 3);
       if (struct.isSetToken()) {
         oprot.writeString(struct.token);
       }
+      if (struct.isSetPort()) {
+        oprot.writeI32(struct.port);
+      }
       if (struct.isSetMissingBlocks()) {
         {
           oprot.writeI32(struct.missingBlocks.size());
@@ -527,12 +626,16 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UploadInfos struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.token = iprot.readString();
         struct.setTokenIsSet(true);
       }
       if (incoming.get(1)) {
+        struct.port = iprot.readI32();
+        struct.setPortIsSet(true);
+      }
+      if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
           struct.missingBlocks = new ArrayList<Integer>(_list5.size);
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java
index 0601e87..2bc6ec0 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-4")
+@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-7")
 public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fields>, java.io.Serializable, Cloneable, Comparable<UserInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserInfo");