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

SSU2: Token improvements part 2

Browse Source 
Don't send tokens in the handshake, now that we have a handler
to process tokens received in the termination ack
This commit is contained in:
zzz
2022-12-06 12:52:43 -05:00
parent 7fdd3d1711
commit 41e05c8135
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
router/java/src/net/i2p/router/transport/udp/PacketBuilder2.java
View File

@@ -434,7 +434,8 @@ class PacketBuilder2 {
pkt.setLength(LONG_HEADER_SIZE);
int port = state.getSentPort();
encryptSessionCreated(packet, state.getHandshakeState(), state.getSendHeaderEncryptKey1(),
state.getSendHeaderEncryptKey2(), state.getSentRelayTag(), state.getNextToken(),
state.getSendHeaderEncryptKey2(), state.getSentRelayTag(),
null, // state.getNextToken(), // send with termination only
sentIP, port);
pkt.setSocketAddress(state.getSentAddress());
packet.setMessageType(TYPE_CREAT);
@@ -548,7 +549,8 @@ class PacketBuilder2 {
pkt.setLength(SHORT_HEADER_SIZE);
boolean isIPv6 = state.getSentIP().length == 16;
encryptSessionConfirmed(packet, state.getHandshakeState(), state.getMTU(), 1, 0, isIPv6,
state.getSendHeaderEncryptKey1(), state.getSendHeaderEncryptKey2(), block, state.getNextToken());
state.getSendHeaderEncryptKey1(), state.getSendHeaderEncryptKey2(), block,
null); // state.getNextToken()); // send with termination only
pkt.setSocketAddress(state.getSentAddress());
packet.setMessageType(TYPE_CONF);
packet.setPriority(PRIORITY_HIGH);