AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize uniqueId lazily to avoid wasting entropy for messages where it isn't used

Browse Source
This commit is contained in:
dev
2015-04-03 23:01:16 +00:00
parent b7b5512e7a
commit cf0453cee0
1 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
router/java/src/net/i2p/data/i2np/I2NPMessageImpl.java
View File

@@ -31,11 +31,11 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
protected final Log _log;
protected final I2PAppContext _context;
protected long _expiration;
protected long _uniqueId;
protected long _uniqueId = -1;
public final static long DEFAULT_EXPIRATION_MS = 1*60*1000; // 1 minute by default
public final static int CHECKSUM_LENGTH = 1; //Hash.HASH_LENGTH;
/** 16 */
public static final int HEADER_LENGTH = 1 // type
+ 4 // uniqueId
@@ -46,7 +46,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
// Whether SSU used the full header or a truncated header.
// We are stuck with the short header, can't change it now.
//private static final boolean RAW_FULL_SIZE = false;
/** unused */
private static final Map<Integer, Builder> _builders = new ConcurrentHashMap<Integer, Builder>(1);
@@ -58,17 +58,15 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
/** instantiate a new I2NPMessage to be populated shortly */
public I2NPMessage build(I2PAppContext ctx);
}
public I2NPMessageImpl(I2PAppContext context) {
_context = context;
_log = context.logManager().getLog(I2NPMessageImpl.class);
_expiration = _context.clock().now() + DEFAULT_EXPIRATION_MS;
// FIXME/TODO set only for outbound, or only on write, or something, to not waste entropy
_uniqueId = _context.random().nextLong(MAX_ID_VALUE);
//_context.statManager().createRateStat("i2np.writeTime", "How long it takes to write an I2NP message", "I2NP", new long[] { 10*60*1000, 60*60*1000 });
//_context.statManager().createRateStat("i2np.readTime", "How long it takes to read an I2NP message", "I2NP", new long[] { 10*60*1000, 60*60*1000 });
}
/**
* Read the whole message but only if it's exactly 1024 bytes.
* Unused - All transports provide encapsulation and so we have byte arrays available.
@@ -124,7 +122,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
if (size > MAX_SIZE) throw new I2NPMessageException("size=" + size);
buffer = new byte[size];
}
int cur = 0;
while (cur < size) {
int numRead = in.read(buffer, cur, size- cur);
@@ -133,7 +131,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
}
cur += numRead;
}
byte[] calc = SimpleByteCache.acquire(Hash.HASH_LENGTH);
_context.sha().calculateHash(buffer, 0, size, calc, 0);
//boolean eq = calc.equals(h);
@@ -233,7 +231,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
// _context.statManager().addRateData("i2np.readTime", time, time);
return cur - offset;
}
/**
* Don't do this if you need a byte array - use toByteArray()
*
@@ -247,17 +245,23 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
if (read < 0) throw new DataFormatException("Unable to build the message");
out.write(buf, 0, read);
}
/**
* Replay resistant message Id
*/
public long getUniqueId() { return _uniqueId; }
public long getUniqueId() {
// Lazy initialization of value
if (_uniqueId < 0) {
_uniqueId = _context.random().nextLong(MAX_ID_VALUE);
}
return _uniqueId;
}
/**
* The ID is set to a random value in the constructor but it can be overridden here.
*/
public void setUniqueId(long id) { _uniqueId = id; }
/**
* Date after which the message should be dropped (and the associated uniqueId forgotten)
*
@@ -268,8 +272,8 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
* The expiration is set to one minute from now in the constructor but it can be overridden here.
*/
public void setMessageExpiration(long exp) { _expiration = exp; }
public synchronized int getMessageSize() {
public synchronized int getMessageSize() {
return calculateWrittenLength() + (15 + CHECKSUM_LENGTH); // 16 bytes in the header
}
@@ -277,13 +281,13 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
* The raw header consists of a one-byte type and a 4-byte expiration in seconds only.
* Used by SSU only!
*/
public synchronized int getRawMessageSize() {
//if (RAW_FULL_SIZE)
public synchronized int getRawMessageSize() {
//if (RAW_FULL_SIZE)
// return getMessageSize();
//else
return calculateWrittenLength()+5;
}
@Override
public byte[] toByteArray() {
byte data[] = new byte[getMessageSize()];
@@ -295,7 +299,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
}
return data;
}
public int toByteArray(byte buffer[]) {
try {
int writtenLen = writeMessageBody(buffer, HEADER_LENGTH);
@@ -306,7 +310,13 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
int off = 0;
DataHelper.toLong(buffer, off, 1, getType());
off += 1;
// Lazy initialization of value
if (_uniqueId < 0) {
_uniqueId = _context.random().nextLong(MAX_ID_VALUE);
}
DataHelper.toLong(buffer, off, 4, _uniqueId);
off += 4;
DataHelper.toLong(buffer, off, DataHelper.DATE_LENGTH, _expiration);
off += DataHelper.DATE_LENGTH;
@@ -315,17 +325,17 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
System.arraycopy(h, 0, buffer, off, CHECKSUM_LENGTH);
SimpleByteCache.release(h);
return writtenLen;
return writtenLen;
} catch (I2NPMessageException ime) {
_context.logManager().getLog(getClass()).log(Log.CRIT, "Error writing", ime);
throw new IllegalStateException("Unable to serialize the message " + getClass().getSimpleName(), ime);
}
}
/** calculate the message body's length (not including the header and footer */
protected abstract int calculateWrittenLength();
/**
/**
* write the message body to the output array, starting at the given index.
* @return the index into the array after the last byte written
*/
@@ -338,19 +348,19 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
System.arraycopy(prefix[i], 0, out, curIndex, prefix[i].length);
curIndex += prefix[i].length;
}
curIndex = writeMessageBody(out, curIndex);
for (int i = 0; i < suffix.length; i++) {
System.arraycopy(suffix[i], 0, out, curIndex, suffix[i].length);
curIndex += suffix[i].length;
}
return curIndex;
}
*/
/**
* Write the message with a short 5-byte header.
* THe header consists of a one-byte type and a 4-byte expiration in seconds only.
@@ -383,7 +393,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
}
}
/*****
public static I2NPMessage fromRawByteArray(I2PAppContext ctx, byte buffer[], int offset, int len) throws I2NPMessageException {
return fromRawByteArray(ctx, buffer, offset, len, new I2NPMessageHandler(ctx));
@@ -399,7 +409,7 @@ public abstract class I2NPMessageImpl extends DataStructureImpl implements I2NPM
int type = (int)DataHelper.fromLong(buffer, offset, 1);
offset++;
I2NPMessageImpl msg = (I2NPMessageImpl)createMessage(ctx, type);
if (msg == null)
if (msg == null)
throw new I2NPMessageException("Unknown message type: " + type);
//if (RAW_FULL_SIZE) {
// try {