goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

logic in connection managers to check if already connected. Prevent infinite connect loop. Fix Connction constructors

pull/4/head
Zlatin Balevsky 2018-07-26 19:03:13 +01:00
parent 7c0f5b4e88
commit b2796a3d40
8 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/groovy/com/muwire/core/Core.groovy
View File

@ -87,6 +87,7 @@ class Core {
ConnectionManager connectionManager = props.isLeaf() ?
new LeafConnectionManager(eventBus,3) : new UltrapeerConnectionManager(eventBus, 512, 512)
eventBus.register(TrustEvent.class, connectionManager)
eventBus.register(ConnectionEvent.class, connectionManager)
log.info("initializing cache client")
CacheClient cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)

2
core/src/main/groovy/com/muwire/core/connection/ConnectionEstablisher.groovy
View File

@ -78,7 +78,7 @@ class ConnectionEstablisher {
}
if (toTry == null)
return
if (inProgress.add(toTry))
if (!connectionManager.isConnected(toTry) && inProgress.add(toTry))
executor.execute({connect(toTry)} as Runnable)
}

4
core/src/main/groovy/com/muwire/core/connection/ConnectionManager.groovy
View File

@ -31,5 +31,7 @@ abstract class ConnectionManager {
return getConnections().size() < getDesiredConnections()
}
abstract boolean isConnected(Destination d);
abstract boolean isConnected(Destination d)
abstract void onConnectionEvent(ConnectionEvent e)
}

4
core/src/main/groovy/com/muwire/core/connection/LeafConnection.groovy
View File

@ -14,8 +14,8 @@ import net.i2p.data.Destination
*/
class LeafConnection extends Connection {
public LeafConnection(EventBus eventBus, InputStream inputStream, OutputStream outputStream, Destination remoteSide) {
super(eventBus, inputStream, outputStream, remoteSide, true);
public LeafConnection(EventBus eventBus, Endpoint endpoint) {
super(eventBus, endpoint, true);
}
}

20
core/src/main/groovy/com/muwire/core/connection/LeafConnectionManager.groovy
View File

@ -1,13 +1,19 @@
package com.muwire.core.connection
import java.util.concurrent.ConcurrentHashMap
import com.muwire.core.EventBus
import groovy.util.logging.Log
import net.i2p.data.Destination
@Log
class LeafConnectionManager extends ConnectionManager {
final int maxConnections
final Map<Destination, UltrapeerConnection> connections = new ConcurrentHashMap()
public LeafConnectionManager(EventBus eventBus, int maxConnections) {
super(eventBus)
this.maxConnections = maxConnections
@ -32,8 +38,18 @@ class LeafConnectionManager extends ConnectionManager {
@Override
public boolean isConnected(Destination d) {
// TODO Auto-generated method stub
return false;
connections.containsKey(d)
}
@Override
public void onConnectionEvent(ConnectionEvent e) {
if (e.incoming || e.leaf) {
log.severe("Got inconsistent event as a leaf! $e")
return
}
Connection c = new UltrapeerConnection(eventBus, e.endpoint)
// TODO: start and stuff
connections.put(e.endpoint.destination, c)
}
}

4
core/src/main/groovy/com/muwire/core/connection/PeerConnection.groovy
View File

@ -13,9 +13,9 @@ import net.i2p.data.Destination
*/
class PeerConnection extends Connection {
public PeerConnection(EventBus eventBus, InputStream inputStream, OutputStream outputStream, Destination remoteSide,
public PeerConnection(EventBus eventBus, Endpoint endpoint,
boolean incoming) {
super(eventBus, inputStream, outputStream, remoteSide, incoming)
super(eventBus, endpoint, incoming)
}
}

5
core/src/main/groovy/com/muwire/core/connection/UltrapeerConnection.groovy
View File

@ -15,9 +15,8 @@ import net.i2p.data.Destination
*/
class UltrapeerConnection extends Connection {
public UltrapeerConnection(EventBus eventBus, InputStream inputStream, OutputStream outputStream,
Destination remoteSide) {
super(eventBus, inputStream, outputStream, remoteSide, false)
public UltrapeerConnection(EventBus eventBus, Endpoint endpoint) {
super(eventBus, endpoint, false)
}
}

22
core/src/main/groovy/com/muwire/core/connection/UltrapeerConnectionManager.groovy
View File

@ -1,15 +1,21 @@
package com.muwire.core.connection
import java.util.Collection
import java.util.concurrent.ConcurrentHashMap
import com.muwire.core.EventBus
import groovy.util.logging.Log
import net.i2p.data.Destination
@Log
class UltrapeerConnectionManager extends ConnectionManager {
final int maxPeers, maxLeafs
final Map<Destination, PeerConnection> peerConnections = new ConcurrentHashMap()
final Map<Destination, LeafConnection> leafConnections = new ConcurrentHashMap()
UltrapeerConnectionManager() {}
public UltrapeerConnectionManager(EventBus eventBus, int maxPeers, int maxLeafs) {
@ -44,7 +50,19 @@ class UltrapeerConnectionManager extends ConnectionManager {
}
@Override
public boolean isConnected(Destination d) {
// TODO Auto-generated method stub
return false;
peerConnections.containsKey(d) || leafConnections.containsKey(d)
}
@Override
public void onConnectionEvent(ConnectionEvent e) {
if (!e.incoming && e.leaf) {
log.severe("Inconsistent event $e")
return
}
Connection c = e.leaf ? new LeafConnection(eventBus, e.endpoint) : new PeerConnection(eventBus, e.endpoint, e.incoming)
// TODO: start and stuff
def map = e.leaf ? leafConnections : peerConnections
map.put(e.endpoint.destination, c)
}
}