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

SSU2: Fix retransmission of session confirmed

Browse Source 
Was setting packet length to number of packets.
Add check and log in UDPSender
Add notes where length is checked
This commit is contained in:
zzz
2022-12-15 14:50:38 -05:00
parent 799944b23b
commit 3eb4083cb3
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
router/java/src/net/i2p/router/transport/udp/PacketHandler.java
View File

@@ -946,8 +946,7 @@ class PacketHandler {
// Session Confirmed or retransmitted Session Request or Token Request
header = SSU2Header.trialDecryptShortHeader(packet, k1, k2);
if (header == null) {
// too short, perhaps SSU 1/2 confusion?
// Java 0.9.55 short destroy bug?
// Java I2P thru 0.9.56 retransmits session confirmed with 1-2 byte packets
if (_log.shouldWarn())
_log.warn("Session Confirmed too short len: " +
+ packet.getPacket().getLength() + " on " + state);

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

@@ -407,7 +407,9 @@ public class PeerState2 extends PeerState implements SSU2Payload.PayloadCallback
try {
SSU2Header.Header header = SSU2Header.trialDecryptShortHeader(packet, _rcvHeaderEncryptKey1, _rcvHeaderEncryptKey2);
if (header == null) {
if (_log.shouldWarn())
// Java I2P thru 0.9.55 would send 35-39 byte ping packets
// Java I2P thru 0.9.56 retransmits session confirmed with 1-2 byte packets
if (len > 2 && len < 35 && _log.shouldWarn())
_log.warn("Inbound packet too short " + len + " on " + this);
return;
}
@@ -1024,7 +1026,7 @@ public class PeerState2 extends PeerState implements SSU2Payload.PayloadCallback
byte data[] = pkt.getData();
int off = pkt.getOffset();
System.arraycopy(_sessConfForReTX[i], 0, data, off, _sessConfForReTX[i].length);
pkt.setLength(_sessConfForReTX.length);
pkt.setLength(_sessConfForReTX[i].length);
pkt.setAddress(addr);
pkt.setPort(_remotePort);
packet.setMessageType(PacketBuilder2.TYPE_CONF);

2
router/java/src/net/i2p/router/transport/udp/UDPSender.java
View File

@@ -196,6 +196,8 @@ class UDPSender {
_log.error("Dropping large UDP packet " + psz + " bytes: " + packet, new Exception());
return;
}
if (psz > 0 && psz < SSU2Util.MIN_DATA_LEN && _log.shouldWarn())
_log.warn("Small UDP packet " + psz + " bytes: " + packet, new Exception());
if (_dummy) {
// testing
// back to the cache