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

close i2p socket when closing connections

pull/4/head
Zlatin Balevsky 2019-05-26 13:09:46 +01:00
parent d3538bde39
commit ef39ca3943
9 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,8 @@ abstract class Connection implements Closeable {
log.log(Level.WARNING, "$name already closed", new Exception() )
return
}
log.info("closing $name")
endpoint.close()
reader.interrupt()
writer.interrupt()
eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))

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

@ -142,7 +142,7 @@ class ConnectionAcceptor {
log.info("accepting connection, leaf:$leaf")
e.outputStream.write("OK".bytes)
e.outputStream.flush()
def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true))
def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.SUCCESSFUL))
} else {
log.info("rejecting connection, leaf:$leaf")

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

@ -110,7 +110,7 @@ class ConnectionEstablisher {
}
} catch (Exception e) {
log.log(Level.WARNING, "Couldn't connect to ${toTry.toBase32()}", e)
def endpoint = new Endpoint(toTry, null, null)
def endpoint = new Endpoint(toTry, null, null, null)
fail(endpoint)
} finally {
inProgress.remove(toTry)
@ -133,7 +133,7 @@ class ConnectionEstablisher {
log.info("connection to ${e.destination.toBase32()} established")
// wrap into deflater / inflater streams and publish
def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true))
def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: false, leaf: false, status: ConnectionAttemptStatus.SUCCESSFUL))
}

7
core/src/main/groovy/com/muwire/core/connection/Endpoint.groovy
View File

@ -10,13 +10,15 @@ class Endpoint implements Closeable {
final Destination destination
final InputStream inputStream
final OutputStream outputStream
final def toClose
private final AtomicBoolean closed = new AtomicBoolean()
Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream) {
Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream, def toClose) {
this.destination = destination
this.inputStream = inputStream
this.outputStream = outputStream
this.toClose = toClose
}
@Override
@ -31,6 +33,9 @@ class Endpoint implements Closeable {
if (outputStream != null) {
try {outputStream.close()} catch (Exception ignore) {}
}
if (toClose != null) {
try {toClose.close()} catch (Exception ignore) {}
}
}
@Override

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

@ -17,6 +17,6 @@ class I2PAcceptor {
Endpoint accept() {
def socket = serverSocket.accept()
new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream())
new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream(), socket)
}
}

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

@ -15,7 +15,7 @@ class I2PConnector {
Endpoint connect(Destination dest) {
def socket = socketManager.connect(dest)
new Endpoint(dest, socket.getInputStream(), socket.getOutputStream())
new Endpoint(dest, socket.getInputStream(), socket.getOutputStream(), socket)
}
}

14
core/src/test/groovy/com/muwire/core/connection/ConnectionAcceptorTest.groovy
View File

@ -98,7 +98,7 @@ class ConnectionAcceptorTest {
outputStream = new PipedOutputStream(is)
def os = new PipedOutputStream()
inputStream = new PipedInputStream(os)
new Endpoint(destinations.dest1, is, os)
new Endpoint(destinations.dest1, is, os, null)
}
i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
connectionManagerMock.demand.hasLeafSlots() { true }
@ -136,7 +136,7 @@ class ConnectionAcceptorTest {
outputStream = new PipedOutputStream(is)
def os = new PipedOutputStream()
inputStream = new PipedInputStream(os)
new Endpoint(destinations.dest1, is, os)
new Endpoint(destinations.dest1, is, os, null)
}
i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
connectionManagerMock.demand.hasPeerSlots() { true }
@ -174,7 +174,7 @@ class ConnectionAcceptorTest {
outputStream = new PipedOutputStream(is)
def os = new PipedOutputStream()
inputStream = new PipedInputStream(os)
new Endpoint(destinations.dest1, is, os)
new Endpoint(destinations.dest1, is, os, null)
}
i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
trustServiceMock.demand.getLevel { dest ->
@ -210,7 +210,7 @@ class ConnectionAcceptorTest {
outputStream = new PipedOutputStream(is)
def os = new PipedOutputStream()
inputStream = new PipedInputStream(os)
new Endpoint(destinations.dest1, is, os)
new Endpoint(destinations.dest1, is, os, null)
}
i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
trustServiceMock.demand.getLevel { dest ->
@ -246,7 +246,7 @@ class ConnectionAcceptorTest {
outputStream = new PipedOutputStream(is)
def os = new PipedOutputStream()
inputStream = new PipedInputStream(os)
new Endpoint(destinations.dest1, is, os)
new Endpoint(destinations.dest1, is, os, null)
}
i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
connectionManagerMock.demand.hasPeerSlots() { false }
@ -288,7 +288,7 @@ class ConnectionAcceptorTest {
outputStream = new PipedOutputStream(is)
def os = new PipedOutputStream()
inputStream = new PipedInputStream(os)
new Endpoint(destinations.dest1, is, os)
new Endpoint(destinations.dest1, is, os, null)
}
i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
connectionManagerMock.demand.hasLeafSlots() { false }
@ -330,7 +330,7 @@ class ConnectionAcceptorTest {
outputStream = new PipedOutputStream(is)
def os = new PipedOutputStream()
inputStream = new PipedInputStream(os)
new Endpoint(destinations.dest1, is, os)
new Endpoint(destinations.dest1, is, os, null)
}
i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
connectionManagerMock.demand.hasPeerSlots() { false }

8
core/src/test/groovy/com/muwire/core/connection/ConnectionEstablisherTest.groovy
View File

@ -126,7 +126,7 @@ class ConnectionEstablisherTest {
inputStream = new DataInputStream(new PipedInputStream(os))
PipedInputStream is = new PipedInputStream()
outputStream = new DataOutputStream(new PipedOutputStream(is))
new Endpoint(dest, is, os)
new Endpoint(dest, is, os, null)
}
initMocks()
@ -169,7 +169,7 @@ class ConnectionEstablisherTest {
inputStream = new DataInputStream(new PipedInputStream(os))
PipedInputStream is = new PipedInputStream()
outputStream = new DataOutputStream(new PipedOutputStream(is))
new Endpoint(dest, is, os)
new Endpoint(dest, is, os, null)
}
initMocks()
@ -211,7 +211,7 @@ class ConnectionEstablisherTest {
inputStream = new DataInputStream(new PipedInputStream(os))
PipedInputStream is = new PipedInputStream()
outputStream = new DataOutputStream(new PipedOutputStream(is))
new Endpoint(dest, is, os)
new Endpoint(dest, is, os, null)
}
initMocks()
@ -254,7 +254,7 @@ class ConnectionEstablisherTest {
inputStream = new DataInputStream(new PipedInputStream(os))
PipedInputStream is = new PipedInputStream()
outputStream = new DataOutputStream(new PipedOutputStream(is))
new Endpoint(dest, is, os)
new Endpoint(dest, is, os, null)
}
initMocks()

6
core/src/test/groovy/com/muwire/core/hostcache/HostCacheTest.groovy
View File

@ -143,7 +143,7 @@ class HostCacheTest {
initMocks()
cache.onHostDiscoveredEvent(new HostDiscoveredEvent(destination: destinations.dest1))
def endpoint = new Endpoint(destinations.dest1, null, null)
def endpoint = new Endpoint(destinations.dest1, null, null, null)
cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
@ -161,7 +161,7 @@ class HostCacheTest {
initMocks()
cache.onHostDiscoveredEvent(new HostDiscoveredEvent(destination: destinations.dest1))
def endpoint = new Endpoint(destinations.dest1, null, null)
def endpoint = new Endpoint(destinations.dest1, null, null, null)
cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
@ -186,7 +186,7 @@ class HostCacheTest {
initMocks()
cache.onHostDiscoveredEvent(new HostDiscoveredEvent(destination: destinations.dest1))
def endpoint = new Endpoint(destinations.dest1, null, null)
def endpoint = new Endpoint(destinations.dest1, null, null, null)
cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.SUCCESSFUL))
def rv = cache.getHosts(5)