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

sent relay tag cleanup

Browse Source
This commit is contained in:
zzz
2011-09-01 23:59:55 +00:00
parent 1bd71abf66
commit 30702e9b23
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
router/java/src/net/i2p/router/transport/udp/EstablishmentManager.java
View File

@ -284,7 +284,8 @@ class EstablishmentManager {
// Don't offer if we are approaching max connections. While Relay Intros do not // Don't offer if we are approaching max connections. While Relay Intros do not
// count as connections, we have to keep the connection to this peer up longer if // count as connections, we have to keep the connection to this peer up longer if
// we are offering introductions. // we are offering introductions.
if ((!_context.router().isHidden()) && (!_transport.introducersRequired()) && _transport.haveCapacity()) { if ((!_context.router().isHidden()) && (!_transport.introducersRequired()) && _transport.haveCapacity() &&
!((FloodfillNetworkDatabaseFacade)_context.netDb()).floodfillEnabled()) {
// ensure > 0 // ensure > 0
long tag = 1 + _context.random().nextLong(MAX_TAG_VALUE); long tag = 1 + _context.random().nextLong(MAX_TAG_VALUE);
state.setSentRelayTag(tag); state.setSentRelayTag(tag);
@ -595,10 +596,12 @@ class EstablishmentManager {
private void sendCreated(InboundEstablishState state) { private void sendCreated(InboundEstablishState state) {
long now = _context.clock().now(); long now = _context.clock().now();
// don't offer if we are approaching max connections (see comments above) // This is usually handled in receiveSessionRequest() above, except, I guess,
// if the session isn't new and we are going through again.
// Don't offer if we are approaching max connections (see comments above)
// Also don't offer if we are floodfill, as this extends the max idle time // Also don't offer if we are floodfill, as this extends the max idle time
// and we will have lots of incoming conns // and we will have lots of incoming conns
if ((!_transport.introducersRequired()) && _transport.haveCapacity() && if ((!_context.router().isHidden()) && (!_transport.introducersRequired()) && _transport.haveCapacity() &&
!((FloodfillNetworkDatabaseFacade)_context.netDb()).floodfillEnabled()) { !((FloodfillNetworkDatabaseFacade)_context.netDb()).floodfillEnabled()) {
// offer to relay // offer to relay
// (perhaps we should check our bw usage and/or how many peers we are // (perhaps we should check our bw usage and/or how many peers we are