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

wire connector and acceptor together

pull/4/head
Zlatin Balevsky 2018-07-26 12:39:02 +01:00
parent 90a1fa6a0d
commit e62bceda29
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,11 @@
package com.muwire.core package com.muwire.core
import com.muwire.core.connection.ConnectionAcceptor
import com.muwire.core.connection.ConnectionEstablisher
import com.muwire.core.connection.ConnectionEvent import com.muwire.core.connection.ConnectionEvent
import com.muwire.core.connection.ConnectionManager import com.muwire.core.connection.ConnectionManager
import com.muwire.core.connection.I2PAcceptor
import com.muwire.core.connection.I2PConnector
import com.muwire.core.connection.LeafConnectionManager import com.muwire.core.connection.LeafConnectionManager
import com.muwire.core.connection.UltrapeerConnectionManager import com.muwire.core.connection.UltrapeerConnectionManager
import com.muwire.core.hostcache.CacheClient import com.muwire.core.hostcache.CacheClient
@ -13,6 +17,8 @@ import com.muwire.core.trust.TrustService
import groovy.util.logging.Log import groovy.util.logging.Log
import net.i2p.client.I2PClientFactory import net.i2p.client.I2PClientFactory
import net.i2p.client.I2PSession import net.i2p.client.I2PSession
import net.i2p.client.streaming.I2PSocketManager
import net.i2p.client.streaming.I2PSocketManagerFactory
@Log @Log
class Core { class Core {
@ -39,7 +45,7 @@ class Core {
log.info("initializing I2P session") log.info("initializing I2P socket manager")
def i2pClient = new I2PClientFactory().createClient() def i2pClient = new I2PClientFactory().createClient()
File keyDat = new File(home, "key.dat") File keyDat = new File(home, "key.dat")
if (!keyDat.exists()) { if (!keyDat.exists()) {
@ -50,14 +56,14 @@ class Core {
} }
def sysProps = System.getProperties().clone() def sysProps = System.getProperties().clone()
sysProps["inbound.nickname"] = "MuWire" sysProps["inbound.nickname"] = "MuWire"
I2PSession i2pSession I2PSession i2pSession
keyDat.withInputStream { I2PSocketManager socketManager
i2pSession = i2pClient.createSession(it, sysProps) keyDat.withInputStream {
socketManager = new I2PSocketManagerFactory().createManager(it, sysProps)
} }
i2pSession = socketManager.getSession()
log.info("connecting i2p session")
i2pSession.connect()
EventBus eventBus = new EventBus() EventBus eventBus = new EventBus()
@ -86,6 +92,16 @@ class Core {
CacheClient cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000) CacheClient cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)
cacheClient.start() cacheClient.start()
log.info("initializing acceptor")
I2PAcceptor i2pAcceptor = new I2PAcceptor(socketManager)
ConnectionAcceptor acceptor = new ConnectionAcceptor(eventBus, connectionManager, props, i2pAcceptor, hostCache, trustService)
acceptor.start()
log.info("initializing connector")
I2PConnector i2pConnector = new I2PConnector(socketManager)
ConnectionEstablisher connector = new ConnectionEstablisher(eventBus, i2pConnector, props, connectionManager, hostCache)
connector.start()
// ... at the end, sleep // ... at the end, sleep
log.info("initialized everything, sleeping") log.info("initialized everything, sleeping")
Thread.sleep(Integer.MAX_VALUE) Thread.sleep(Integer.MAX_VALUE)