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

SSU2: Fix packets exceeding MTU by up to 3 bytes

Browse Source
This commit is contained in:
zzz
2022-08-25 10:58:14 -04:00
parent f4875d12fa
commit b34b0cc399
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
history.txt
View File

@@ -1,6 +1,9 @@
2022-08-25 zzz 2022-08-25 zzz
* Router: Fix deadlock via rebuildRouterAddress() and UDPTransport * Router: Fix deadlock via rebuildRouterAddress() and UDPTransport
* SSU2: Implement path challenge and connection migration * SSU2:
- Implement path challenge and connection migration
- Fix packets exceeding MTU by up to 3 bytes
- Immediately fail session request containing zero token
2022-08-23 zzz 2022-08-23 zzz
* Router: Add deadlocks to event log * Router: Add deadlocks to event log

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

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

7
router/java/src/net/i2p/router/transport/udp/OutboundMessageFragments.java
View File

@@ -463,8 +463,11 @@ class OutboundMessageFragments {
if (_log.shouldDebug()) if (_log.shouldDebug())
_log.debug("Building packet for " + next + " to " + peer); _log.debug("Building packet for " + next + " to " + peer);
int curTotalDataSize = state.fragmentSize(next.num); int curTotalDataSize = state.fragmentSize(next.num);
if (next.num > 0 && peer.getVersion() > 1) if (peer.getVersion() > 1) {
curTotalDataSize += SSU2Util.DATA_FOLLOWON_EXTRA_SIZE; curTotalDataSize += SSU2Util.FIRST_FRAGMENT_HEADER_SIZE;
if (next.num > 0)
curTotalDataSize += SSU2Util.DATA_FOLLOWON_EXTRA_SIZE;
}
// now stuff in more fragments if they fit // now stuff in more fragments if they fit
if (i +1 < toSend.size()) { if (i +1 < toSend.size()) {
int maxAvail; int maxAvail;