All pastes #2082256 Raw Edit

Unnamed

public text v1 · immutable
#2082256 ·published 2011-09-22 20:01 UTC
rendered paste body
Index: src/slave/src/org/drftpd/slave/Transfer.java
===================================================================
--- src/slave/src/org/drftpd/slave/Transfer.java	(revision 2509)
+++ src/slave/src/org/drftpd/slave/Transfer.java	(working copy)
@@ -177,9 +177,19 @@
 		return _direction;
 	}
 
+	private long getIP(String addr) {
+		String[] addrArray = addr.split("\\.");
+		long num = 0;
+		for (int i=0;i<addrArray.length;i++) {
+			int power = 3-i;
+			num += ((Integer.parseInt(addrArray[i])%256 * Math.pow(256,power)));
+		}
+		return num;
+	}
+	
 	public TransferStatus getTransferStatus() {
 		return new TransferStatus(getElapsed(), getTransfered(), getChecksum(),
-				isFinished(), getTransferIndex());
+				isFinished(), getTransferIndex(),getIP(_sock.getLocalAddress().getHostAddress()), getIP(_sock.getInetAddress().getHostAddress()));
 	}
 
 	public boolean isFinished() {
Index: src/slave/src/org/drftpd/slave/TransferStatus.java
===================================================================
--- src/slave/src/org/drftpd/slave/TransferStatus.java	(revision 2509)
+++ src/slave/src/org/drftpd/slave/TransferStatus.java	(working copy)
@@ -36,19 +36,25 @@
 	private long _transfered;
 
 	private TransferIndex _transferIndex;
+	
+	private long _transferAddress;
+	
+	private long _transferSlaveAddress;
 
 	public TransferStatus(long elapsed, long transfered, long checksum,
-			boolean isFinished, TransferIndex transferIndex) {
+			boolean isFinished, TransferIndex transferIndex, long transferAddress, long transferSlaveAddress) {
 		_transferIndex = transferIndex;
 		_elapsed = elapsed;
 		_transfered = transfered;
 		_checksum = checksum;
 		_isFinished = isFinished;
 		_throwable = null;
+		_transferAddress = transferAddress;
+		_transferSlaveAddress = transferSlaveAddress;
 	}
 
 	public TransferStatus(TransferIndex transferIndex, Throwable t) {
-		this(0, 0, 0, true, transferIndex);
+		this(0, 0, 0, true, transferIndex, 0 , 0);
 		_throwable = t;
 	}
 
@@ -60,6 +66,14 @@
 		return _elapsed;
 	}
 
+	public long getTransferAddress() {
+		return _transferAddress;
+	}
+	
+	public long getTransferSlaveAddress() {
+		return _transferSlaveAddress;
+	}
+	
 	public Throwable getThrowable() {
 		return _throwable;
 	}