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

Consolidate increments of offset, for efficiency

Browse Source
This commit is contained in:
zzz
2015-11-08 19:17:32 +00:00
parent e120a8a3a3
commit 1aed266f70
1 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
router/java/src/net/i2p/router/transport/udp/UDPPacketReader.java
View File

@ -539,8 +539,7 @@ class UDPPacketReader {
buf.append(" payload: ");
int off = getFragmentBegin(0); // first fragment
off += 4; // messageId
off++; // fragment info
off += 4 + 1; // messageId + fragment info
int size = ((int)DataHelper.fromLong(_message, off, 2)) & 0x3FFF;
off += 2;
buf.append(Base64.encode(_message, off, size));
@ -677,9 +676,8 @@ class UDPPacketReader {
public void readIntroKey(byte target[], int targetOffset) {
int offset = readBodyOffset() + NONCE_LENGTH;
int size = _message[offset] & 0xff;
offset++;
offset += 1 + 2; // skip the size + port
offset += size; // skip the IP
offset += 2; // skip the port
System.arraycopy(_message, offset, target, targetOffset, SessionKey.KEYSIZE_BYTES);
}
}
@ -723,8 +721,7 @@ class UDPPacketReader {
public int readChallengeSize() {
int offset = readBodyOffset() + 4;
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
int rv = _message[offset] & 0xff;
if (_log.shouldLog(Log.DEBUG))
_log.debug("read challenge size: " + rv);
@ -735,8 +732,7 @@ class UDPPacketReader {
public void readChallengeSize(byte target[], int targetOffset) {
int offset = readBodyOffset() + 4;
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
int sz = _message[offset] & 0xff;
offset++;
System.arraycopy(_message, offset, target, targetOffset, sz);
@ -746,8 +742,7 @@ class UDPPacketReader {
public void readAliceIntroKey(byte target[], int targetOffset) {
int offset = readBodyOffset() + 4;
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
int sz = _message[offset] & 0xff;
offset++;
offset += sz;
@ -759,8 +754,7 @@ class UDPPacketReader {
public long readNonce() {
int offset = readBodyOffset() + 4;
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
int sz = _message[offset] & 0xff;
offset++;
offset += sz;
@ -797,8 +791,7 @@ class UDPPacketReader {
public int readChallengeSize() {
int offset = readBodyOffset();
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
return _message[offset] & 0xff;
}
@ -806,8 +799,7 @@ class UDPPacketReader {
public void readChallengeSize(byte target[], int targetOffset) {
int offset = readBodyOffset();
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
int sz = _message[offset] & 0xff;
offset++;
System.arraycopy(_message, offset, target, targetOffset, sz);
@ -840,16 +832,14 @@ class UDPPacketReader {
public int readAliceIPSize() {
int offset = readBodyOffset();
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
return _message[offset] & 0xff;
}
/** @deprecated unused */
public void readAliceIP(byte target[], int targetOffset) {
int offset = readBodyOffset();
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
int sz = _message[offset] & 0xff;
offset++;
System.arraycopy(_message, offset, target, targetOffset, sz);
@ -858,8 +848,7 @@ class UDPPacketReader {
public int readAlicePort() {
int offset = readBodyOffset();
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
int sz = _message[offset] & 0xff;
offset++;
offset += sz;
@ -868,12 +857,10 @@ class UDPPacketReader {
public long readNonce() {
int offset = readBodyOffset();
offset += _message[offset] & 0xff;
offset++;
offset += 2;
offset += 1 + 2;
int sz = _message[offset] & 0xff;
offset++;
offset += 1 + 2; // sz + port
offset += sz;
offset += 2;
return DataHelper.fromLong(_message, offset, 4);
}
}