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

I2CP: More BlindingInfo serialization fixes

Browse Source 
Shorten lookup timeout on router side so the client gets the reply before timeout
This commit is contained in:
zzz
2019-09-18 12:37:26 +00:00
parent f9a2193e2f
commit 2b6cb2099a
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/src/net/i2p/data/i2cp/BlindingInfoMessage.java
View File

@ -167,6 +167,8 @@ public class BlindingInfoMessage extends I2CPMessageImpl {
throw new IllegalArgumentException("no key required");
if (authType != BlindData.AUTH_NONE && privKey == null)
throw new IllegalArgumentException("key required");
if (privKey != null && privKey.getType() != EncType.ECIES_X25519)
throw new IllegalArgumentException("Bad privkey type");
_sessionId = id;
_authType = authType;
_blindType = blindType;
@ -336,9 +338,7 @@ public class BlindingInfoMessage extends I2CPMessageImpl {
ByteArrayOutputStream os = new ByteArrayOutputStream(512);
try {
_sessionId.writeBytes(os);
byte flags = (byte) _authType;
if (_privkey != null)
flags |= FLAG_AUTH;
byte flags = (byte) (_authType & FLAG_AUTH);
if (_secret != null)
flags |= FLAG_SECRET;
os.write(flags);
@ -356,7 +356,6 @@ public class BlindingInfoMessage extends I2CPMessageImpl {
os.write(_pubkey.getData());
}
if (_privkey != null) {
DataHelper.writeLong(os, 2, _privkey.getType().getCode());
os.write(_privkey.getData());
}
if (_secret != null)
@ -377,6 +376,7 @@ public class BlindingInfoMessage extends I2CPMessageImpl {
buf.append("[BlindingInfoMessage: ");
buf.append("\n\tSession: ").append(_sessionId);
buf.append("\n\tTimeout: ").append(_expiration);
buf.append("\n\tAuthTyp: ").append(_authType);
if (_endpointType == TYPE_HASH)
buf.append("\n\tHash: ").append(_hash.toBase32());
else if (_endpointType == TYPE_HOST)