i2p/i2p.i2p
1
0
Fork 0
mirror of https://github.com/i2p/i2p.i2p.git synced 2024-12-06 19:27:00 +01:00
Code Issues Actions 349 Packages Projects Releases Wiki Activity

SSU2: Minor updates

Browse Source 
send timeout code in termination
remove unused intro key block handling
log tweaks
This commit is contained in:
zzz
2022-04-12 09:23:48 -04:00
parent 806046df64
commit 3edc235104
7 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
+1 -1
View File
@@ -1961,7 +1961,7 @@ class EstablishmentManager {
try {
doPass();
} catch (RuntimeException re) {
_log.log(Log.CRIT, "Error in the establisher", re);
_log.error("Error in the establisher", re);
// don't loop too fast
try { Thread.sleep(1000); } catch (InterruptedException ie) {}
}
router/java/src/net/i2p/router/transport/udp/InboundEstablishState2.java
+2 -7
View File
@@ -237,7 +237,7 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
}
if (ra == null)
throw new DataFormatException("no SSU2 addr");
throw new DataFormatException("no SSU2 addr, ipv6? " + isIPv6 + ": " + ri);
String siv = ra.getOption("i");
if (siv == null)
throw new DataFormatException("no SSU2 IKey");
@@ -324,11 +324,6 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
//_bobPort = port;
}
public void gotIntroKey(byte[] key) {
if (_log.shouldDebug())
_log.debug("Got Intro key: " + Base64.encode(key));
}
public void gotRelayTagRequest() {
if (!ENABLE_RELAY)
return;
@@ -572,7 +567,7 @@ class InboundEstablishState2 extends InboundEstablishState implements SSU2Payloa
}
}
if (_log.shouldWarn())
_log.warn("Got sess conf frag " + frag + " len " + len + " on " + this);
_log.warn("Got sess conf frag " + frag + '/' + totalfrag + " len " + len + " on " + this);
byte[] fragdata;
if (frag == 0) {
// preserve header
router/java/src/net/i2p/router/transport/udp/OutboundEstablishState2.java
-5
View File
@@ -214,11 +214,6 @@ class OutboundEstablishState2 extends OutboundEstablishState implements SSU2Payl
_alicePort = port;
}
public void gotIntroKey(byte[] key) {
if (_log.shouldDebug())
_log.debug("Got Intro key: " + Base64.encode(key));
}
public void gotRelayTagRequest() {
throw new IllegalStateException("Relay tag req in Sess Created");
}
router/java/src/net/i2p/router/transport/udp/PacketBuilder2.java
+2
View File
@@ -483,6 +483,8 @@ class PacketBuilder2 {
int len;
if (numFragments > 1) {
if (numFragments > 15)
throw new IllegalArgumentException();
if (_log.shouldWarn())
_log.warn("RI size " + info.length + " requires " + numFragments + " packets");
len = max;
router/java/src/net/i2p/router/transport/udp/PeerState2.java
-3
View File
@@ -381,9 +381,6 @@ public class PeerState2 extends PeerState implements SSU2Payload.PayloadCallback
public void gotAddress(byte[] ip, int port) {
}
public void gotIntroKey(byte[] key) {
}
public void gotRelayTagRequest() {
if (!ENABLE_RELAY)
return;
router/java/src/net/i2p/router/transport/udp/SSU2Payload.java
+1 -3
View File
@@ -39,12 +39,12 @@ class SSU2Payload {
private static final int BLOCK_NEXTNONCE = 11;
private static final int BLOCK_ACK = 12;
private static final int BLOCK_ADDRESS = 13;
private static final int BLOCK_INTROKEY= 14;
private static final int BLOCK_RELAYTAGREQ = 15;
private static final int BLOCK_RELAYTAG = 16;
private static final int BLOCK_NEWTOKEN = 17;
private static final int BLOCK_PATHCHALLENGE = 18;
private static final int BLOCK_PATHRESP = 19;
private static final int BLOCK_CONGESTION = 21;
private static final int BLOCK_PADDING = 254;
/**
@@ -90,8 +90,6 @@ class SSU2Payload {
public void gotAddress(byte[] ip, int port);
public void gotIntroKey(byte[] key);
public void gotRelayTagRequest();
public void gotRelayTag(long tag);
router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+1 -2
View File
@@ -2140,8 +2140,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
return;
pkt = _packetBuilder.buildSessionDestroyPacket(peer);
} else {
// unspecified reason
pkt = _packetBuilder2.buildSessionDestroyPacket(0, (PeerState2) peer);
pkt = _packetBuilder2.buildSessionDestroyPacket(SSU2Util.REASON_TIMEOUT, (PeerState2) peer);
}
if (_log.shouldLog(Log.DEBUG))
_log.debug("Sending destroy to : " + peer);