Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-19 23:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Manfred Karrer 2014-10-21 12:59:05 +02:00
commit b67806fe31
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@ -1,11 +1,20 @@
apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'application'
version = '0.1.0-SNAPSHOT'
sourceCompatibility = 1.8
sourceSets.main.resources.srcDirs += 'src/main/java'
mainClassName = "io.bitsquare.BitSquare"
run {
if ( project.hasProperty('args') ) {
args project.args.split('\\s+')
}
}
repositories {
jcenter()
maven { url 'http://partnerdemo.artifactoryonline.com/partnerdemo/libs-snapshots-local' }

28
src/main/java/io/bitsquare/msg/actor/DHTManager.java
View File

@ -53,6 +53,7 @@ public class DHTManager extends AbstractActor {
private Peer peer;
private PeerDHT peerDHT;
private PeerNAT peerNAT;
public DHTManager() {
receive(ReceiveBuilder
@ -60,31 +61,10 @@ public class DHTManager extends AbstractActor {
log.debug("Received message: {}", ip);
try {
peer = new PeerBuilder(ip.getPeerId()).ports(ip.getPort())
.start();
peer = new PeerBuilder(ip.getPeerId()).ports(ip.getPort()).start();
// Need to add all features the clients will use (otherwise msg type is UNKNOWN_ID)
peerDHT = new PeerBuilderDHT(peer).start();
PeerNAT nodeBehindNat = new PeerBuilderNAT(peer).start();
RconRPC rconRPC = new RconRPC(peer);
new RelayRPC(peer, rconRPC);
//new PeerBuilderTracker(peer);
nodeBehindNat.startSetupRelay(new FutureRelay());
/* peer = new PeerBuilder(ip.getPeerId())
.ports(ip.getPort() != null ? ip.getPort() : new Ports().tcpPort()).start();
peerDHT = new PeerBuilderDHT(peer).start();*/
// TODO add code to discover non-local peers
// FutureDiscover futureDiscover = peer.discover().peerAddress(bootstrapPeers.).start();
// futureDiscover.awaitUninterruptibly();
/* if (ip.getBootstrapPeers() != null) {
FutureBootstrap futureBootstrap = peer.bootstrap()
.bootstrapTo(ip.getBootstrapPeers()).start();
futureBootstrap.awaitUninterruptibly(bootstrapTimeout);
}*/
peerNAT = new PeerBuilderNAT(peer).start();
sender().tell(new PeerInitialized(peer.peerID(), ip.getPort()), self());
} catch (Throwable t) {
@ -102,6 +82,8 @@ public class DHTManager extends AbstractActor {
log.debug("postStop");
if (peerDHT != null)
peerDHT.shutdown();
if (peerNAT != null)
peerNAT.natUtils().shutdown();
super.postStop();
}
}