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

SSU2: Fix swapped dest/src conn IDs for peer test

Browse Source
This commit is contained in:
zzz
2022-06-20 15:19:09 -04:00
parent 723257d6ef
commit 9aa9f7a714
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
history.txt
View File

@@ -1,3 +1,15 @@
2022-06-20 zzz
* SSU2:
- Fix overhead calculation for followon fragments
- First fragments can be 5 bytes larger than followon fragments
- Fix peer test connection ids
2022-06-19 zzz
* SSU2:
- Add delayed lookup of RI for relay and peer test
- Don't delete empty ipv6 address at startup
* Util: HostTxtParser CLI improvements
2022-06-17 zzz
* Crypto: Fix equality checking of ECParameterSpecs
* SusiDNS: Fix classloading on Java 11+

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Git";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 7;
public final static long BUILD = 8;
/** for example "-test" */
public final static String EXTRA = "";

12
router/java/src/net/i2p/router/transport/udp/PeerTestManager.java
View File

@@ -351,8 +351,8 @@ class PeerTestManager {
test.getNonce(), _transport.getIntroKey());
} else {
long nonce = test.getNonce();
long sendId = (nonce << 32) | nonce;
long rcvId = ~sendId;
long rcvId = (nonce << 32) | nonce;
long sendId = ~rcvId;
InetAddress addr = test.getAliceIP();
int alicePort = test.getAlicePort();
byte[] aliceIP = addr.getAddress();
@@ -1196,8 +1196,8 @@ class PeerTestManager {
// send msg 5
if (_log.shouldDebug())
_log.debug("Send msg 5 to " + Addresses.toString(testIP, testPort) + " on " + state);
long rcvId = (nonce << 32) | nonce;
long sendId = ~rcvId;
long sendId = (nonce << 32) | nonce;
long rcvId = ~sendId;
// send the same data we sent to Bob
packet = _packetBuilder2.buildPeerTestToAlice(aliceIP, testPort,
aliceIntroKey, true,
@@ -1393,8 +1393,8 @@ class PeerTestManager {
state.setReceiveAliceTime(now);
state.setLastSendTime(now);
// send msg 7
long rcvId = (nonce << 32) | nonce;
long sendId = ~rcvId;
long sendId = (nonce << 32) | nonce;
long rcvId = ~sendId;
InetAddress addr = state.getAliceIP();
int alicePort = state.getAlicePort();
byte[] aliceIP = addr.getAddress();