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

SSU2: Further restrict states when we will be a peer test Charlie

Browse Source 
and also use those states for when to publish B cap
This commit is contained in:
zzz
2022-12-22 09:50:39 -05:00
parent 4c8e0149f3
commit ac799b7ffa
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1225,7 +1225,7 @@ class PeerTestManager {
SessionKey aliceIntroKey = null;
int rcode;
PeerState aps = _transport.getPeerState(h);
if (_transport.isSnatted()) {
if (!_transport.canTestAsCharlie(isIPv6)) {
rcode = SSU2Util.TEST_REJECT_CHARLIE_ADDRESS;
} else if (aps != null && aps.isIPv6() == isIPv6) {
rcode = SSU2Util.TEST_REJECT_CHARLIE_CONNECTED;

38
router/java/src/net/i2p/router/transport/udp/UDPTransport.java
View File

@@ -334,6 +334,29 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
Status.IPV4_SNAT_IPV6_OK,
Status.IPV4_SNAT_IPV6_UNKNOWN);
// States where we cannot be a v4 Charlie
private static final Set<Status> STATUS_IPV4_NO_TEST = EnumSet.of(Status.DIFFERENT,
Status.DISCONNECTED,
Status.HOSED,
Status.UNKNOWN,
Status.IPV4_UNKNOWN_IPV6_OK,
Status.IPV4_UNKNOWN_IPV6_FIREWALLED,
Status.IPV4_DISABLED_IPV6_OK,
Status.IPV4_DISABLED_IPV6_UNKNOWN,
Status.IPV4_DISABLED_IPV6_FIREWALLED,
Status.IPV4_SNAT_IPV6_OK,
Status.IPV4_SNAT_IPV6_UNKNOWN);
// States where we cannot be a v6 Charlie
private static final Set<Status> STATUS_IPV6_NO_TEST = EnumSet.of(Status.DIFFERENT,
Status.DISCONNECTED,
Status.HOSED,
Status.UNKNOWN,
Status.IPV4_OK_IPV6_UNKNOWN,
Status.IPV4_FIREWALLED_IPV6_UNKNOWN,
Status.IPV4_DISABLED_IPV6_UNKNOWN,
Status.IPV4_SNAT_IPV6_UNKNOWN);
/**
* @param dh non-null to enable SSU1
@@ -2980,7 +3003,8 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
// if we have explicit external addresses, they had better be reachable
String caps;
if (isSnatted()) {
if (!canTestAsCharlie(isIPv6)) {
// we could still be a Bob, but we don't have separate caps for Bob and Charlie
caps = isIPv6 ? CAP_IPV6 : CAP_IPV4;
} else if (introducersRequired || !canIntroduce(isIPv6)) {
if (!directIncluded) {
@@ -4045,6 +4069,18 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
return STATUS_IPV4_SNAT.contains(getReachabilityStatus());
}
/**
* Can we be a Charlie right now?
* @return true if we can participate
* @since 0.9.57
*/
boolean canTestAsCharlie(boolean ipv6) {
Status status = getReachabilityStatus();
if (ipv6)
return !STATUS_IPV6_NO_TEST.contains(status);
return !STATUS_IPV4_NO_TEST.contains(status);
}
/**
* @deprecated unused
*/